Gl point renderer, debugging-attempts

Author: diwi

examples/liquidfun_ParticleRenderGroups_LiquidFx/liquidfun_ParticleRenderGroups_LiquidFx.java

@@ -95,7 +95,7 @@ public void setup(){
     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(1000);
+    frameRate(120);
   }
 
 
@@ -397,8 +397,8 @@ public void initScene() {
 
     screen_x = width/4;
     screen_y = height/2;
-//    world.mouse_spawn_particles.setBoxShape(500, 20);
-//    world.mouse_spawn_particles.spawn(screen_x, screen_y);
+    world.mouse_spawn_particles.setBoxShape(500, 20);
+    world.mouse_spawn_particles.spawn(screen_x, screen_y);
 
     setParticleSpawnProperties(spawn_type_cpy);
 

examples/liquidfun_ParticleRenderGroups_LiquidFxDark/liquidfun_ParticleRenderGroups_LiquidFxDark.java

@@ -95,7 +95,7 @@ public void setup(){
     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(1000);
+    frameRate(120);
   }
 
 
@@ -127,6 +127,7 @@ public void reset(){
 
 
     // box2d/liquidfun world
+//    world.INIT_GL_PARTICLES = false;
     world = new DwWorld(this, 15);
 
     // particle render settings

src/com/thomasdiewald/liquidfun/glsl/particle_render2.frag

@@ -0,0 +1,23 @@
+/**
+ * 
+ * LiquidFunProcessing | Copyright 2017 Thomas Diewald - www.thomasdiewald.com
+ * 
+ * https://github.com/diwi/LiquidFunProcessing.git
+ * 
+ * Box2d / LiquidFun Library for Processing.
+ * MIT License: https://opensource.org/licenses/MIT
+ * 
+ */
+
+
+
+#version 150
+
+out vec4 fragColor;
+in vec4 tint;
+
+uniform sampler2D tex_sprite;
+
+void main() {
+  fragColor = texture(tex_sprite, gl_PointCoord) * tint;
+}

src/com/thomasdiewald/liquidfun/glsl/particle_render2.vert

@@ -0,0 +1,26 @@
+/**
+ * 
+ * LiquidFunProcessing | Copyright 2017 Thomas Diewald - www.thomasdiewald.com
+ * 
+ * https://github.com/diwi/LiquidFunProcessing.git
+ * 
+ * Box2d / LiquidFun Library for Processing.
+ * MIT License: https://opensource.org/licenses/MIT
+ * 
+ */
+
+
+
+#version 150
+
+uniform mat4 mat_mvp;
+
+in vec2 pos;
+in vec4 col;
+
+out vec4 tint;
+
+void main() {
+  gl_Position = mat_mvp * vec4(pos, 0, 1);
+  tint = col;
+}

src/com/thomasdiewald/liquidfun/java/DwWorld.java

@@ -70,7 +70,7 @@ public class DwWorld extends World{
   public DwViewportTransform transform;
 
   /**
-   * if true, particles is an instance of {@link DwParticleRenderGL}
+   * if true, particles is an instance of {@link DwParticleRenderGLQuads}
    * otheriwse {@link DwParticleRenderP5} is instantiated.
    */
   static public boolean INIT_GL_PARTICLES = true;

src/com/thomasdiewald/liquidfun/java/render/DwParticleRenderGL.java

@@ -19,6 +19,7 @@
 import org.jbox2d.dynamics.World;
 import com.jogamp.opengl.GL;
 import com.jogamp.opengl.GL2ES1;
+import com.jogamp.opengl.GL2ES3;
 import com.jogamp.opengl.GL3;
 import com.thomasdiewald.liquidfun.java.DwViewportTransform;
 
@@ -45,7 +46,7 @@ public class DwParticleRenderGL extends DwParticleRender{
   static public final String SHADER_DIR = "/com/thomasdiewald/liquidfun/glsl/";
 
   // GL
-  protected GL3 gl;
+  protected GL2ES3 gl;
   protected PJOGL pgl;
 
   // Shader
@@ -71,13 +72,15 @@ public class DwParticleRenderGL extends DwParticleRender{
       , "#version 150                               " + NL
       , "                                           " + NL
       , "uniform mat4 mat_mvp;                      " + NL
+      , "uniform float point_size;                  " + NL
       , "                                           " + NL
       , "in vec2 pos;                               " + NL
       , "in vec4 col;                               " + 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
       , "}                                          " + NL
     }; 
@@ -201,6 +204,8 @@ 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);
+    
     errCheck("DwParticleRenderGL.display-uniforms");
 
     // shader vertex attribute: position
@@ -238,18 +243,22 @@ public void display(PGraphics2D canvas){
     gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0);
     errCheck("DwParticleRenderGL.display-buffers");
 
-    
+
+
     // settings
-//    gl.glEnable(GL.GL_MULTISAMPLE );
+    // 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);
+    
+    // ... f***ing OpenGL mess
     gl.glEnable(GL3.GL_PROGRAM_POINT_SIZE);
-    gl.glEnable(GL3.GL_VERTEX_PROGRAM_POINT_SIZE);
     gl.glEnable(GL2ES1.GL_POINT_SPRITE);
-    gl.glPointSize(particle_rad_screen * 2);
+
     errCheck("DwParticleRenderGL.display-pointRendering");
 
 
-    
+  
     // draw particles as points (see fragment shader for details)
     if(USE_GROUPS)
     {
@@ -263,13 +272,13 @@ public void display(PGraphics2D canvas){
         }
         int off = group_offsets[id];
         int len = group_lengths[id];
-        gl.glDrawElements(GL3.GL_POINTS, len, GL.GL_UNSIGNED_INT, off * 4);
+        gl.glDrawElements(GL.GL_POINTS, len, GL.GL_UNSIGNED_INT, off * 4);
       }
       gl.glBindBuffer(GL.GL_ELEMENT_ARRAY_BUFFER, 0);
       errCheck("DwParticleRenderGL.display-glDrawElements");
     } 
     else {
-      gl.glDrawArrays(GL3.GL_POINTS, 0, particle_num);
+      gl.glDrawArrays(GL.GL_POINTS, 0, particle_num);
       errCheck("DwParticleRenderGL.display-glDrawArrays");
     }
 
@@ -292,7 +301,7 @@ public void display(PGraphics2D canvas){
   protected void beginGL(){
     if(gl == null){
       pgl = (PJOGL) papplet.beginPGL();  
-      gl = pgl.gl.getGL3();
+      gl = pgl.gl.getGL2ES3();
     }
   }