Release v1.04 (44)

Author: diwi

examples/FlowFieldParticles_Basic/FlowFieldParticles_Basic.java

@@ -196,10 +196,11 @@ public void spawnParticles(){
     sr.vel(vx, vy);
     particles.spawn(vw, vh, sr);
 
-    if(mousePressed){     
+    if(mousePressed){
+      float pr = particles.getCollisionSize() * 0.5f;
       count = ceil(particles.getCount() * 0.01f);
-      count = min(max(count, 1), 10000);  
-      radius = ceil(sqrt(count));
+      count = min(max(count, 1), 4000);  
+      radius = ceil(sqrt(count * pr * pr));
       px = mouseX;
       py = mouseY;
       vx = (mouseX - pmouseX) * +5;

examples/FlowFieldParticles_DevDemo/FlowFieldParticles_DevDemo.java

@@ -524,8 +524,8 @@ void updateScene(){
     if(APPLY_OBSTACLES)
     {  
       if(UPDATE_SCENE){
-        rot   += particles.param.timestep * 0.8f;
-        slide += particles.param.timestep * 0.4f;
+        rot   += particles.getTimestep() * 0.008f;
+        slide += particles.getTimestep() * 0.004f;
       }
 
       pg_obstacles.rectMode(CENTER);

examples/Shadertoy_PlasmaGlobe/Shadertoy_PlasmaGlobe.java

@@ -64,6 +64,8 @@ public void setup() {
     }
 
     tex_noise.resize(context, GL2.GL_RGBA8, wh, wh, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, GL2.GL_LINEAR, GL2.GL_MIRRORED_REPEAT, 4, 1, bbuffer);
+    tex_noise.generateMipMap();
+    
     frameRate(60);
   }
 
@@ -73,7 +75,7 @@ public void draw() {
       toy.set_iMouse(mouseX, height-1-mouseY, mouseX, height-1-mouseY);
     }
     toy.set_iChannel(0, tex_noise);
-    toy.apply(this.g);
+    toy.apply(g);
 
     String txt_fps = String.format(getClass().getSimpleName()+ "   [size %d/%d]   [frame %d]   [fps %6.2f]", width, height, frameCount, frameRate);
     surface.setTitle(txt_fps);

examples/Shadertoy_WetStone/Shadertoy_WetStone.java

@@ -37,11 +37,11 @@ public void settings() {
 
   public void setup() {
     surface.setResizable(true);
-    
+
     context = new DwPixelFlow(this);
     context.print();
     context.printGL();
-    
+
     toy = new DwShadertoy(context, "data/WetStone.frag");
 
     frameRate(60);
@@ -52,7 +52,8 @@ public void draw() {
     if(mousePressed){
       toy.set_iMouse(mouseX, height-1-mouseY, mouseX, height-1-mouseY);
     }
-    toy.apply(this.g);
+
+    toy.apply(g);
 
     String txt_fps = String.format(getClass().getSimpleName()+ "   [size %d/%d]   [frame %d]   [fps %6.2f]", width, height, frameCount, frameRate);
     surface.setTitle(txt_fps);

src/com/thomasdiewald/pixelflow/java/DwPixelFlow.java

@@ -38,7 +38,7 @@ public class DwPixelFlow{
 
   static public class PixelFlowInfo{
 
-    static public final String version = "1.03";
+    static public final String version = "1.04";
     static public final String name    = "PixelFlow";
     static public final String author  = "Thomas Diewald";
     static public final String web     = "http://www.thomasdiewald.com";

src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTexture.java

@@ -295,9 +295,10 @@ public void setParam_Filter(int minfilter, int magfilter){
   public void generateMipMap(){
     gl.glBindTexture   (target, HANDLE[0]);
     gl.glTexParameteri (target, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR_MIPMAP_LINEAR);
-    gl.glTexParameteri (target, GL2.GL_GENERATE_MIPMAP, GL.GL_TRUE);
+//    gl.glTexParameteri (target, GL2.GL_GENERATE_MIPMAP, GL.GL_TRUE);
     gl.glGenerateMipmap(target);
     gl.glBindTexture   (target, 0);
+    DwGLError.debug(gl, "DwGLTexture.generateMipMap");
   }
 
   public void setParam_Border(float[] border){

src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTextureCube.java

@@ -1,14 +1,13 @@
 package com.thomasdiewald.pixelflow.java.dwgl;
 
-import com.jogamp.opengl.GL2ES2;
 import com.thomasdiewald.pixelflow.java.DwPixelFlow;
 
 public class DwGLTextureCube {
 
-  static private int TEX_COUNT = 0;
+//  static private int TEX_COUNT = 0;
 
   public DwPixelFlow context;
-  private GL2ES2 gl;
+//  private GL2ES2 gl;
 
   public int[] HANDLE = null;
 

src/com/thomasdiewald/pixelflow/java/dwgl/DwGLTextureUtils.java

@@ -9,9 +9,7 @@
 package com.thomasdiewald.pixelflow.java.dwgl;
 
 import com.jogamp.opengl.GL;
-import com.jogamp.opengl.GL2;
 import com.jogamp.opengl.GL2ES2;
-import com.thomasdiewald.pixelflow.java.DwPixelFlow;
 
 import processing.core.PGraphics;
 import processing.core.PVector;
@@ -129,7 +127,7 @@ static public void generateMipMaps(PGraphicsOpenGL pg){
     PGL pgl = pg.beginPGL();
     pgl.bindTexture   (tex.glTarget, tex.glName);
     pgl.texParameteri (tex.glTarget, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR_MIPMAP_LINEAR);
-    pgl.texParameteri (tex.glTarget, GL2.GL_GENERATE_MIPMAP, GL.GL_TRUE);
+//    pgl.texParameteri (tex.glTarget, GL2.GL_GENERATE_MIPMAP, GL.GL_TRUE);
     pgl.generateMipmap(tex.glTarget);
     pgl.bindTexture   (tex.glTarget, 0);
     pg.endPGL();

src/com/thomasdiewald/pixelflow/java/imageprocessing/DwShadertoy.java

@@ -107,14 +107,14 @@ public void dispose(){
 
   public void release(){
     tex.release();
-    reset();
   }
 
 
   public boolean resize(int w, int h){
     boolean resized = tex.resize(context, GL2.GL_RGBA32F, w, h, GL2.GL_RGBA, GL2.GL_FLOAT, GL2.GL_LINEAR, GL2.GL_CLAMP_TO_EDGE, 4, 4);
     if(resized && auto_reset_on_resize){
       reset();
+      tex.clear(0.0f);
     }
     return resized;
   }