Release v0.90 (38)

diwi · diwi · commit 14590884afa5 · 2017-09-26T21:33:18.000+02:00
PJOGL.profile = 3;
hopefully fixes point sprite rendering
diff --git a/examples/FlowFieldParticles_Basic/FlowFieldParticles_Basic.java b/examples/FlowFieldParticles_Basic/FlowFieldParticles_Basic.java
@@ -23,6 +23,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 
@@ -59,6 +60,7 @@ public void settings() {
     viewport_h = (int) min(viewport_h, displayHeight * 0.9f);
     size(viewport_w, viewport_h, P2D);
     smooth(0);
+    PJOGL.profile = 3;
   }
   
   
diff --git a/examples/FlowFieldParticles_Cohesion/FlowFieldParticles_Cohesion.java b/examples/FlowFieldParticles_Cohesion/FlowFieldParticles_Cohesion.java
@@ -25,6 +25,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 
@@ -65,6 +66,7 @@ public void settings() {
     viewport_h = (int) min(viewport_h, displayHeight * 0.9f);
     size(viewport_w, viewport_h, P2D);
     smooth(0);
+    PJOGL.profile = 3;
   }
   
 
diff --git a/examples/FlowFieldParticles_DevDemo/FlowFieldParticles_DevDemo.java b/examples/FlowFieldParticles_DevDemo/FlowFieldParticles_DevDemo.java
@@ -37,6 +37,7 @@
 import processing.core.*;
 import processing.opengl.PGraphics2D;
 import processing.opengl.PGraphicsOpenGL;
+import processing.opengl.PJOGL;
 
 
 public class FlowFieldParticles_DevDemo extends PApplet {
@@ -145,14 +146,14 @@ public void settings() {
       viewport_h = (int) min(viewport_h, displayHeight * 0.9f);
       size(viewport_w, viewport_h, P2D);
     }
+    PJOGL.profile = 3;
     smooth(0);
   }
   
 
   public void setup(){
     surface.setLocation(viewport_x, viewport_y);
     surface.setResizable(true);
-
     randomSeed(2);
     for(int i = 0; i < mobs.length; i++){
       float r = random(50,120);
@@ -170,6 +171,7 @@ public void setup(){
     particles = new DwFlowFieldParticles(context, 1024 * 1024 * 4);
     particles.param.size_display   = 10;
     particles.param.size_collision = particles.param.size_display;
+    particles.param.size_cohesion  = 5;
     particles.param.velocity_damping  = 0.99f;
     
     ff_acc = new DwFlowField(context);
@@ -416,7 +418,7 @@ void info(){
 
     fill(col_fg);
     noStroke();
-    rect(0, height, 600, - 20);
+    rect(0, height, 650, - 20);
     fill(255,128,0);
     text(txt_fps, 10, height-6);
     
diff --git a/examples/FlowFieldParticles_Impulse/FlowFieldParticles_Impulse.java b/examples/FlowFieldParticles_Impulse/FlowFieldParticles_Impulse.java
@@ -23,6 +23,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 
@@ -69,6 +70,7 @@ public void settings() {
     viewport_h = (int) min(viewport_h, displayHeight * 0.9f);
     size(viewport_w, viewport_h, P2D);
     smooth(0);
+    PJOGL.profile = 3;
   }
   
 
diff --git a/examples/FlowFieldParticles_MouseImpulse/FlowFieldParticles_MouseImpulse.java b/examples/FlowFieldParticles_MouseImpulse/FlowFieldParticles_MouseImpulse.java
@@ -23,6 +23,7 @@
 
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 
 
@@ -64,6 +65,7 @@ public void settings() {
     viewport_h = (int) min(viewport_h, displayHeight * 0.9f);
     size(viewport_w, viewport_h, P2D);
     smooth(0);
+    PJOGL.profile = 3;
   }
   
 
diff --git a/examples/FlowFieldParticles_OpticalFlowCapture/FlowFieldParticles_OpticalFlowCapture.java b/examples/FlowFieldParticles_OpticalFlowCapture/FlowFieldParticles_OpticalFlowCapture.java
@@ -21,6 +21,7 @@
 import com.thomasdiewald.pixelflow.java.imageprocessing.filter.DwFilter;
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 import processing.video.Capture;
 
 
@@ -50,6 +51,7 @@ public class FlowFieldParticles_OpticalFlowCapture extends PApplet {
   public void settings() {
     size(cam_w * 2, cam_h * 2, P2D);
     smooth(0);
+    PJOGL.profile = 3;
   }
   
   public void setup(){
diff --git a/examples/Fluid_CustomParticles/Fluid_CustomParticles.java b/examples/Fluid_CustomParticles/Fluid_CustomParticles.java
@@ -23,6 +23,7 @@
 import controlP5.Toggle;
 import processing.core.*;
 import processing.opengl.PGraphics2D;
+import processing.opengl.PJOGL;
 
 public class Fluid_CustomParticles extends PApplet {
   
@@ -134,6 +135,7 @@ public void update(DwFluid2D fluid) {
   public void settings() {
     size(viewport_w, viewport_h, P2D);
     smooth(4);
+    PJOGL.profile = 3;
   }
   
 
diff --git a/examples/ReactionDiffusion/ReactionDiffusion.java b/examples/ReactionDiffusion/ReactionDiffusion.java
@@ -54,6 +54,8 @@ public void setup() {
     
     // pixelflow context
     context = new DwPixelFlow(this);
+    context.print();
+    context.printGL();
 
     // 1) 32 bit per channel
     tex_grayscott.resize(context, GL2.GL_RG32F, width, height, GL2.GL_RG, GL2.GL_FLOAT, GL2.GL_NEAREST, 2, 4);
diff --git a/src/com/thomasdiewald/pixelflow/java/DwPixelFlow.java b/src/com/thomasdiewald/pixelflow/java/DwPixelFlow.java
@@ -38,7 +38,7 @@ public class DwPixelFlow{
                                      
   static public class PixelFlowInfo{
     
-    static public final String version = "0.89";
+    static public final String version = "0.90";
     static public final String name    = "PixelFlow";
     static public final String author  = "Thomas Diewald";
     static public final String web     = "http://www.thomasdiewald.com";
@@ -51,41 +51,38 @@ public String toString(){
 
   static public final PixelFlowInfo INFO;
   
-  static{
+  static {
     INFO = new PixelFlowInfo();
   }
   
   
-  public static final String SHADER_DIR = "/com/thomasdiewald/pixelflow/glsl/";
-//  public static final String SHADER_DIR = "D:/data/__Eclipse/workspace/WORKSPACE_FLUID/PixelFlow/src/com/thomasdiewald/pixelflow/glsl/";
+//  public static final String SHADER_DIR = "/com/thomasdiewald/pixelflow/glsl/";
+  public static final String SHADER_DIR = "D:/data/__Eclipse/workspace/WORKSPACE_FLUID/PixelFlow/src/com/thomasdiewald/pixelflow/glsl/";
   
   public PApplet papplet;
   public PJOGL   pjogl;
   public GL2ES2  gl;
   
-  public final DwUtils utils;
+  public final DwUtils utils = new DwUtils(this);
   
   private int scope_depth = 0;
   
-  public DwGLFrameBuffer framebuffer;
+  public final DwGLFrameBuffer framebuffer = new DwGLFrameBuffer();
   
   
   private HashMap<String, DwGLSLProgram> shader_cache = new HashMap<String, DwGLSLProgram>();
   
+  
   public DwPixelFlow(PApplet papplet){
     this.papplet = papplet;
-
-    this.gl = begin(); end();
+    this.papplet.registerMethod("dispose", this);
     
+    begin(); 
     pjogl.enableFBOLayer();
-
-    papplet.registerMethod("dispose", this);
-    
-    utils = new DwUtils(this);
-   
-    framebuffer = new DwGLFrameBuffer(gl);
+    end();
   }
   
+
   public void dispose(){
     release();
   }
@@ -103,10 +100,8 @@ public void release(){
     }
     shader_cache.clear();
         
-    if(framebuffer != null){
-      framebuffer.release();
-      framebuffer = null;
-    }
+    framebuffer.release();
+
   }
   
   
@@ -131,9 +126,10 @@ public void release(){
 
   public GL2ES2 begin(){
 //    System.out.printf("%"+(scope_depth*2+1)+"s GLScope.begin %d\n", " ", scope_depth);
-    if( scope_depth == 0){
+    if(scope_depth == 0){
       pjogl = (PJOGL) papplet.beginPGL(); 
-      gl    = pjogl.gl.getGL2ES2();
+      gl = pjogl.gl.getGL2ES2();
+      framebuffer.allocate(gl);
     }
 
     scope_depth++;
diff --git a/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLFrameBuffer.java b/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLFrameBuffer.java
@@ -27,10 +27,14 @@ public class DwGLFrameBuffer {
   public int max_color_attachments;
   public int max_draw_buffers;
   public int max_bind;
-  public DwGLFrameBuffer(GL2ES2 gl){
-    allocate(gl);
+  
+  public DwGLFrameBuffer(){
   }
   
+//  public DwGLFrameBuffer(GL2ES2 gl){
+//    allocate(gl);
+//  }
+  
   public void release(){
     if(gl != null){
       if(HANDLE_fbo != null) gl.glDeleteFramebuffers(1, HANDLE_fbo, 0); 
diff --git a/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLSLProgram.java b/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLSLProgram.java
@@ -348,18 +348,18 @@ public void drawFullScreenPoints(int x, int y, int w, int h, int num_points){
   public void drawFullScreenPoints(int x, int y, int w, int h, int num_points, boolean smooth){
     gl.glViewport(x, y, w, h);
 
+    gl.glEnable(GL2.GL_VERTEX_PROGRAM_POINT_SIZE);
+    gl.glEnable(GL2.GL_POINT_SPRITE);
+    gl.glEnable(GL3.GL_PROGRAM_POINT_SIZE);
+    
     if(smooth){
       gl.glEnable(GL2.GL_POINT_SMOOTH);
       gl.glHint(GL2.GL_POINT_SMOOTH_HINT, GL2.GL_FASTEST);
     } else {
       gl.glDisable(GL2.GL_POINT_SMOOTH);
     }
-    
-//    gl.glEnable(GL3.GL_VERTEX_PROGRAM_POINT_SIZE);
-    gl.glEnable(GL3.GL_PROGRAM_POINT_SIZE);
-    gl.glEnable(GL2ES1.GL_POINT_SPRITE);
-    
-    gl.glDrawArrays(GL2ES2.GL_POINTS, 0, num_points);
+    DwGLError.debug(gl, "DwGLSLProgram.drawFullScreenPoints");
+    gl.glDrawArrays(GL2.GL_POINTS, 0, num_points);
   }
   
   
diff --git a/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTexture.java b/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTexture.java
@@ -212,7 +212,9 @@ public boolean resize(DwPixelFlow context, int internalFormat, int w, int h, int
     gl.glBindTexture  (target, 0);   
     DwGLError.debug(gl, "DwGLTexture.resize tex");
     
-    framebuffer = new DwGLFrameBuffer(gl);
+    framebuffer = new DwGLFrameBuffer();
+    framebuffer.allocate(gl);
+    
     DwGLError.debug(gl, "DwGLTexture.resize fbo");
     
     // TODO: create a shared pbo
diff --git a/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTexture3D.java b/src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTexture3D.java
@@ -217,7 +217,9 @@ public boolean resize(DwPixelFlow context, int internalFormat, int w, int h, int
     DwGLError.debug(gl, "DwGLTexture.resize tex");
     
     
-    framebuffer = new DwGLFrameBuffer(gl);
+    framebuffer = new DwGLFrameBuffer();
+    framebuffer.allocate(gl);
+    
     DwGLError.debug(gl, "DwGLTexture.resize fbo");
     
     // TODO: create a shared pbo
diff --git a/src/com/thomasdiewald/pixelflow/java/flowfieldparticles/DwFlowFieldParticles.java b/src/com/thomasdiewald/pixelflow/java/flowfieldparticles/DwFlowFieldParticles.java
@@ -71,7 +71,7 @@ public static class Param {
     // particle size rendering/collision
     public float   size_display   = 10f;
     public float   size_collision = 10f;
-    public float   size_cohesion  = 10f;
+    public float   size_cohesion  =  5f;
     
     // buffer size scaling
     public float wh_scale_obs = 2f;
@@ -199,7 +199,7 @@ public DwFlowFieldParticles(DwPixelFlow context, int num_particles){
 
     ff_col = new DwFlowField(context);
     ff_col.param.blur_iterations = 1;
-    ff_col.param.blur_radius     = 1;
+    ff_col.param.blur_radius     = 2;
     
     ff_obs = new DwFlowField(context);
     ff_obs.param.blur_iterations = 0;
@@ -525,7 +525,7 @@ public void displayTrail(PGraphicsOpenGL canvas){
     shader_display_trails.drawFullScreenLines(0, 0, w, h, spawn_num, lwidth, lsmooth);
     shader_display_trails.end();
     context.endDraw();
-    context.end("DwFlowFieldParticles.display");
+    context.end("DwFlowFieldParticles.displayTrail");
   }
   
 
@@ -557,7 +557,7 @@ public void createCollisionFlowField(){
     shader_col_dist.uniformTexture("tex_position", tex_particle.src);
     shader_col_dist.drawFullScreenPoints(0, 0, w, h, spawn_num, false);
     shader_col_dist.end();
-    context.endDraw();
+    context.endDraw("DwFlowFieldParticles.createCollisionFlowField shader_col_dist");
     
     ff_col.create(tex_col_dist);
     
@@ -574,7 +574,7 @@ public void createCohesionFlowField(){
     int h_particle = tex_particle.src.h;
 
     context.begin();
-    
+
     context.beginDraw(tex_coh_dist);
     
     context.gl.glColorMask(true, false, false, false);
@@ -591,11 +591,11 @@ public void createCohesionFlowField(){
     shader_coh_dist.uniformTexture("tex_position", tex_particle.src);
     shader_coh_dist.drawFullScreenPoints(0, 0, w, h, spawn_num, false);
     shader_coh_dist.end();
-    context.endDraw();
+    context.endDraw("DwFlowFieldParticles.createCohesionFlowField shader_coh_dist");
      
     ff_coh.create(tex_coh_dist);
     
-    context.end("DwFlowFieldParticles.createCoherenceFlowField");
+    context.end("DwFlowFieldParticles.createCohesionFlowField");
   }
   
   
diff --git a/src/com/thomasdiewald/pixelflow/java/imageprocessing/DwFlowField.java b/src/com/thomasdiewald/pixelflow/java/imageprocessing/DwFlowField.java
@@ -16,7 +16,6 @@
 
 import com.jogamp.opengl.GL;
 import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.GL2ES2;
 import com.thomasdiewald.pixelflow.java.DwPixelFlow;
 import com.thomasdiewald.pixelflow.java.dwgl.DwGLSLProgram;
 import com.thomasdiewald.pixelflow.java.dwgl.DwGLTexture;
@@ -111,12 +110,12 @@ public void create(DwGLTexture tex_src){
   
   public void create(int tex_src, int w_src, int h_src){
     context.begin();
-    
+
     resize(w_src, h_src);
     
     int w_dst = tex_vel.w;
     int h_dst = tex_vel.h;
-
+    
     context.beginDraw(tex_vel);
     shader_create.begin();
     shader_create.uniform2f     ("wh_rcp" , 1f/w_dst, 1f/h_dst);

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`
`24`	`24`	`import processing.core.*;`
`25`	`25`	`import processing.opengl.PGraphics2D;`
	`26`	`+import processing.opengl.PJOGL;`
`26`	`27`
`27`	`28`
`28`	`29`
`@@ -59,6 +60,7 @@ public void settings() {`
`59`	`60`	`viewport_h = (int) min(viewport_h, displayHeight * 0.9f);`
`60`	`61`	`size(viewport_w, viewport_h, P2D);`
`61`	`62`	`smooth(0);`
	`63`	`+ PJOGL.profile = 3;`
`62`	`64`	`}`
`63`	`65`
`64`	`66`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`
`26`	`26`	`import processing.core.*;`
`27`	`27`	`import processing.opengl.PGraphics2D;`
	`28`	`+import processing.opengl.PJOGL;`
`28`	`29`
`29`	`30`
`30`	`31`
`@@ -65,6 +66,7 @@ public void settings() {`
`65`	`66`	`viewport_h = (int) min(viewport_h, displayHeight * 0.9f);`
`66`	`67`	`size(viewport_w, viewport_h, P2D);`
`67`	`68`	`smooth(0);`
	`69`	`+ PJOGL.profile = 3;`
`68`	`70`	`}`
`69`	`71`
`70`	`72`