Point Sprite rendering fix, raycast example

diwi · diwi · commit 9f6560320f26 · 2017-10-12T17:53:33.000+02:00
diff --git a/examples/Basic_Tutorial/Basic_Tutorial.java b/examples/Basic_Tutorial/Basic_Tutorial.java
@@ -28,7 +28,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class Basic_Tutorial extends PApplet {
@@ -99,7 +98,6 @@ public void settings(){
     size(viewport_w, viewport_h, P2D);
     // some MSAA antialiasing
     smooth(8); 
-    PJOGL.profile = 3;
   }
   
   
diff --git a/examples/box2d_RayCastEdgeShapes/box2d_RayCastEdgeShapes.java b/examples/box2d_RayCastEdgeShapes/box2d_RayCastEdgeShapes.java
@@ -11,7 +11,7 @@
 
 
 
-package box2d_EdgeShapes;
+package box2d_RayCastEdgeShapes;
 
 
 import com.thomasdiewald.liquidfun.java.DwWorld;
@@ -32,7 +32,7 @@
 import processing.opengl.PGraphics2D;
 
 
-public class box2d_EdgeShapes extends PApplet {
+public class box2d_RayCastEdgeShapes extends PApplet {
 
   // Example to demonstrate how to use the RayCastCallback
   
@@ -302,7 +302,7 @@ public float reportFixture(Fixture fixture, final Vec2 point, final Vec2 normal,
 
 
   public static void main(String args[]) {
-    PApplet.main(new String[] { box2d_EdgeShapes.class.getName() });
+    PApplet.main(new String[] { box2d_RayCastEdgeShapes.class.getName() });
   }
   
 }
diff --git a/examples/liquidfun_DamBreak/liquidfun_DamBreak.java b/examples/liquidfun_DamBreak/liquidfun_DamBreak.java
@@ -26,7 +26,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_DamBreak extends PApplet {
@@ -63,7 +62,7 @@ public class liquidfun_DamBreak extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
-    PJOGL.profile = 3;
+    //PJOGL.profile = 3;
   }
   
   
diff --git a/examples/liquidfun_DamBreak_LiquidFx/liquidfun_DamBreak_LiquidFx.java b/examples/liquidfun_DamBreak_LiquidFx/liquidfun_DamBreak_LiquidFx.java
@@ -29,7 +29,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_DamBreak_LiquidFx extends PApplet {
@@ -74,7 +73,6 @@ 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,7 +29,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
+
 
 
 public class liquidfun_DrawingParticles extends PApplet {
@@ -68,7 +68,6 @@ 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,7 +32,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_DrawingParticles_LiquidFx extends PApplet {
@@ -81,7 +80,6 @@ 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,7 +27,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_LiquidTimer extends PApplet {
@@ -64,7 +63,6 @@ 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,7 +30,6 @@
 
 import processing.core.PApplet;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleColors_LiquidFx extends PApplet {
@@ -78,7 +77,6 @@ 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,7 +30,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleEmitter_LiquidFx extends PApplet {
@@ -76,7 +75,6 @@ public class liquidfun_ParticleEmitter_LiquidFx extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
-    PJOGL.profile = 3;
   }
   
   
diff --git a/examples/liquidfun_ParticleRenderGroups_LiquidFx/liquidfun_ParticleRenderGroups_LiquidFx.java b/examples/liquidfun_ParticleRenderGroups_LiquidFx/liquidfun_ParticleRenderGroups_LiquidFx.java
@@ -34,7 +34,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleRenderGroups_LiquidFx extends PApplet {
@@ -89,7 +88,6 @@ 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/examples/liquidfun_ParticleRenderGroups_LiquidFxDark/liquidfun_ParticleRenderGroups_LiquidFxDark.java b/examples/liquidfun_ParticleRenderGroups_LiquidFxDark/liquidfun_ParticleRenderGroups_LiquidFxDark.java
@@ -34,7 +34,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleRenderGroups_LiquidFxDark extends PApplet {
@@ -89,15 +88,14 @@ public class liquidfun_ParticleRenderGroups_LiquidFxDark extends PApplet {
   public void settings(){
     size(viewport_w, viewport_h, P2D);
     smooth(8);
-    PJOGL.profile = 3;
   }
   
   public void setup(){ 
     surface.setLocation(viewport_x, viewport_y);
     pg_checkerboard = DwUtils.createCheckerBoard(this, width, height, 100, color(32, 0), color(48,0));
 //    pg_checkerboard = DwUtils.createCheckerBoard(this, width, height, 100, color(200, 0), color(255,0));
     reset();
-    frameRate(120);
+    frameRate(520);
   }
   
   
diff --git a/examples/liquidfun_ParticleTypes/liquidfun_ParticleTypes.java b/examples/liquidfun_ParticleTypes/liquidfun_ParticleTypes.java
@@ -27,7 +27,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_ParticleTypes extends PApplet {
@@ -67,7 +66,6 @@ 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,7 +30,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
+
 
 
 public class liquidfun_ParticleTypes_LiquidFx extends PApplet {
@@ -78,7 +78,6 @@ 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,7 +29,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_WaveMachine extends PApplet {
@@ -64,7 +63,6 @@ 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,7 +32,6 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
-import processing.opengl.PJOGL;
 
 
 public class liquidfun_WaveMachine_LiquidFx extends PApplet {
@@ -77,7 +76,6 @@ 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,6 @@
 
 import org.jbox2d.dynamics.World;
 import com.jogamp.opengl.GL;
-import com.jogamp.opengl.GL2;
 import com.jogamp.opengl.GL2ES3;
 import com.jogamp.opengl.GL3;
 import com.thomasdiewald.liquidfun.java.DwViewportTransform;
@@ -76,12 +75,14 @@ public class DwParticleRenderGL extends DwParticleRender{
       , "                                           " + NL
       , "in vec2 pos;                               " + NL
       , "in vec4 col;                               " + NL
+      , "out vec2 posn;                             " + NL
       , "out vec4 tint;                             " + NL
       , "                                           " + NL
       , "void main() {                              " + NL
       , "  gl_Position = mat_mvp * vec4(pos, 0, 1); " + NL
       , "  gl_PointSize = point_size;               " + NL
       , "  tint = col;                              " + NL
+      , "  posn = gl_Position.xy * 0.5 + 0.5;       " + NL
       , "}                                          " + NL
     }; 
   
@@ -92,11 +93,15 @@ public class DwParticleRenderGL extends DwParticleRender{
       , "                                                         "+NL
       , "out vec4 fragColor;                                      "+NL
       , "in vec4 tint;                                            "+NL
+      , "in vec2 posn;                                            "+NL
       , "                                                         "+NL
+      , "uniform float point_size;                                "+NL
+      , "uniform vec2 wh_viewport;                                "+NL
       , "uniform sampler2D tex_sprite;                            "+NL
       , "                                                         "+NL
       , "void main() {                                            "+NL
-      , "  fragColor = texture(tex_sprite, gl_PointCoord) * tint; "+NL
+      , "  vec2 my_PointCoord = ((posn * wh_viewport) - gl_FragCoord.xy) / point_size + 0.5; // [0, 1]"+NL
+      , "  fragColor = texture(tex_sprite, my_PointCoord) * tint; "+NL
       , "}                                                        "+NL
     }; 
   
@@ -205,6 +210,7 @@ public void display(PGraphics2D canvas){
     shader.set("mat_mvp", mat_mvp);
     shader.set("tex_sprite", param.tex_sprite);
     shader.set("point_size", particle_rad_screen * 2);
+    shader.set("wh_viewport", (float)canvas.width, (float) canvas.height);
     
     errCheck("DwParticleRenderGL.display-uniforms");
     
@@ -248,13 +254,13 @@ 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.glPointSize(particle_rad_screen * 2);
+    //  gl.glEnable(GL2.GL_POINT_SMOOTH);
+    // 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(GL2.GL_POINT_SPRITE);
+    // gl.glEnable(GL2.GL_POINT_SPRITE); // causes gl error
 
     errCheck("DwParticleRenderGL.display-pointRendering");
   

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`
`13`	`13`
`14`		`-package box2d_EdgeShapes;`
	`14`	`+package box2d_RayCastEdgeShapes;`
`15`	`15`
`16`	`16`
`17`	`17`	`import com.thomasdiewald.liquidfun.java.DwWorld;`
`@@ -32,7 +32,7 @@`
`32`	`32`	`import processing.opengl.PGraphics2D;`
`33`	`33`
`34`	`34`
`35`		`-public class box2d_EdgeShapes extends PApplet {`
	`35`	`+public class box2d_RayCastEdgeShapes extends PApplet {`
`36`	`36`
`37`	`37`	`// Example to demonstrate how to use the RayCastCallback`
`38`	`38`
`@@ -302,7 +302,7 @@ public float reportFixture(Fixture fixture, final Vec2 point, final Vec2 normal,`
`302`	`302`
`303`	`303`
`304`	`304`	`public static void main(String args[]) {`
`305`		`- PApplet.main(new String[] { box2d_EdgeShapes.class.getName() });`
	`305`	`+ PApplet.main(new String[] { box2d_RayCastEdgeShapes.class.getName() });`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`}`