PJOGL.profile = 3;

hopefully fixes point sprite rendering
diwi · Sep 26, 2017 · de5620f · de5620f
1 parent 1a125d1
commit de5620f
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 3 deletions.
diff --git a/examples/Basic_Tutorial/Basic_Tutorial.java b/examples/Basic_Tutorial/Basic_Tutorial.java
@@ -28,6 +28,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class Basic_Tutorial extends PApplet {
@@ -98,6 +99,7 @@ public void settings(){
     size(viewport_w, viewport_h, P2D);
     // some MSAA antialiasing
     smooth(8); 
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_DamBreak/liquidfun_DamBreak.java b/examples/liquidfun_DamBreak/liquidfun_DamBreak.java
@@ -26,6 +26,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_DamBreak extends PApplet {
@@ -62,6 +63,7 @@ public class liquidfun_DamBreak extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_DamBreak_LiquidFx/liquidfun_DamBreak_LiquidFx.java b/examples/liquidfun_DamBreak_LiquidFx/liquidfun_DamBreak_LiquidFx.java
@@ -29,6 +29,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_DamBreak_LiquidFx extends PApplet {
@@ -73,6 +74,7 @@ public class liquidfun_DamBreak_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_DrawingParticles/liquidfun_DrawingParticles.java b/examples/liquidfun_DrawingParticles/liquidfun_DrawingParticles.java
@@ -29,6 +29,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_DrawingParticles extends PApplet {
@@ -67,6 +68,7 @@ public class liquidfun_DrawingParticles extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_DrawingParticles_LiquidFx/liquidfun_DrawingParticles_LiquidFx.java b/examples/liquidfun_DrawingParticles_LiquidFx/liquidfun_DrawingParticles_LiquidFx.java
@@ -32,6 +32,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_DrawingParticles_LiquidFx extends PApplet {
@@ -80,6 +81,7 @@ public class liquidfun_DrawingParticles_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_LiquidTimer/liquidfun_LiquidTimer.java b/examples/liquidfun_LiquidTimer/liquidfun_LiquidTimer.java
@@ -27,6 +27,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_LiquidTimer extends PApplet {
@@ -63,6 +64,7 @@ public class liquidfun_LiquidTimer extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_ParticleColors_LiquidFx/liquidfun_ParticleColors_LiquidFx.java b/examples/liquidfun_ParticleColors_LiquidFx/liquidfun_ParticleColors_LiquidFx.java
@@ -30,6 +30,7 @@
 
 import processing.core.PApplet;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleColors_LiquidFx extends PApplet {
@@ -77,6 +78,7 @@ public class liquidfun_ParticleColors_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_ParticleEmitter_LiquidFx/liquidfun_ParticleEmitter_LiquidFx.java b/examples/liquidfun_ParticleEmitter_LiquidFx/liquidfun_ParticleEmitter_LiquidFx.java
@@ -30,6 +30,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleEmitter_LiquidFx extends PApplet {
@@ -75,6 +76,7 @@ public class liquidfun_ParticleEmitter_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/...ples/liquidfun_ParticleRenderGroups_LiquidFx/liquidfun_ParticleRenderGroups_LiquidFx.java b/...ples/liquidfun_ParticleRenderGroups_LiquidFx/liquidfun_ParticleRenderGroups_LiquidFx.java
@@ -34,6 +34,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleRenderGroups_LiquidFx extends PApplet {
@@ -88,6 +89,7 @@ public class liquidfun_ParticleRenderGroups_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
   public void setup(){ 

diff --git a/...uidfun_ParticleRenderGroups_LiquidFxDark/liquidfun_ParticleRenderGroups_LiquidFxDark.java b/...uidfun_ParticleRenderGroups_LiquidFxDark/liquidfun_ParticleRenderGroups_LiquidFxDark.java
@@ -34,6 +34,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleRenderGroups_LiquidFxDark extends PApplet {
@@ -88,6 +89,7 @@ public class liquidfun_ParticleRenderGroups_LiquidFxDark extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
   public void setup(){ 

diff --git a/examples/liquidfun_ParticleTypes/liquidfun_ParticleTypes.java b/examples/liquidfun_ParticleTypes/liquidfun_ParticleTypes.java
@@ -27,6 +27,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleTypes extends PApplet {
@@ -66,6 +67,7 @@ public class liquidfun_ParticleTypes extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_ParticleTypes_LiquidFx/liquidfun_ParticleTypes_LiquidFx.java b/examples/liquidfun_ParticleTypes_LiquidFx/liquidfun_ParticleTypes_LiquidFx.java
@@ -30,6 +30,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleTypes_LiquidFx extends PApplet {
@@ -77,6 +78,7 @@ public class liquidfun_ParticleTypes_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_WaveMachine/liquidfun_WaveMachine.java b/examples/liquidfun_WaveMachine/liquidfun_WaveMachine.java
@@ -29,6 +29,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_WaveMachine extends PApplet {
@@ -63,6 +64,7 @@ public class liquidfun_WaveMachine extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/examples/liquidfun_WaveMachine_LiquidFx/liquidfun_WaveMachine_LiquidFx.java b/examples/liquidfun_WaveMachine_LiquidFx/liquidfun_WaveMachine_LiquidFx.java
@@ -32,6 +32,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 public class liquidfun_WaveMachine_LiquidFx extends PApplet {
@@ -76,6 +77,7 @@ public class liquidfun_WaveMachine_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
+    PJOGL.profile = 3;
   }
 
 

diff --git a/src/com/thomasdiewald/liquidfun/java/render/DwParticleRenderGL.java b/src/com/thomasdiewald/liquidfun/java/render/DwParticleRenderGL.java
@@ -18,7 +18,7 @@
 
 import org.jbox2d.dynamics.World;
 import com.jogamp.opengl.GL;
-import com.jogamp.opengl.GL2ES1;
+import com.jogamp.opengl.GL2;
 import com.jogamp.opengl.GL2ES3;
 import com.jogamp.opengl.GL3;
 import com.thomasdiewald.liquidfun.java.DwViewportTransform;
@@ -246,14 +246,15 @@ public void display(PGraphics2D canvas){
 
 
     // settings
+    // fix: PJOGL.profile = 3; in settings()
     // https://github.com/diwi/LiquidFunProcessing/issues/2
 //    gl.glEnable(GL2.GL_POINT_SMOOTH);
-//    gl.glEnable(GL3.GL_VERTEX_PROGRAM_POINT_SIZE);
+    gl.glEnable(GL3.GL_VERTEX_PROGRAM_POINT_SIZE);
 //    gl.glPointSize(particle_rad_screen * 2);
 
     // ... f***ing OpenGL mess
     gl.glEnable(GL3.GL_PROGRAM_POINT_SIZE);
-    gl.glEnable(GL2ES1.GL_POINT_SPRITE);
+    gl.glEnable(GL2.GL_POINT_SPRITE);
 
     errCheck("DwParticleRenderGL.display-pointRendering");