.

Author: diwi

…mples/testbed/box2d_CantileverJoint.java …/testbed/box2d_Cantilever_WeldJoint.javaexamples/testbed/box2d_CantileverJoint.java renamed to examples/testbed/box2d_Cantilever_WeldJoint.java examples/testbed/box2d_CantileverJoint.java renamed to examples/testbed/box2d_Cantilever_WeldJoint.java

@@ -16,6 +16,8 @@
 
 import com.thomasdiewald.liquidfun.java.DwWorld;
 
+import java.util.Objects;
+
 import org.jbox2d.collision.shapes.CircleShape;
 import org.jbox2d.collision.shapes.EdgeShape;
 import org.jbox2d.collision.shapes.PolygonShape;
@@ -30,7 +32,7 @@
 import processing.opengl.PGraphics2D;
 
 
-public class box2d_CantileverJoint extends PApplet {
+public class box2d_Cantilever_WeldJoint extends PApplet {
 
   int viewport_w = 1280;
   int viewport_h = 720;
@@ -151,6 +153,7 @@ public void initScene() {
         Vec2 anchor = new Vec2(-15.0f + 1.0f * i, 5.0f);
         jd.initialize(prevBody, body, anchor);
         world.createJoint(jd);
+        
 
         prevBody = body;
       }
@@ -276,13 +279,15 @@ public void initScene() {
       Body body = world.createBody(bd);
       body.createFixture(fd);
     }
+    
+    
     world.bodies.addAll();
   }
 
 
 
   public static void main(String args[]) {
-    PApplet.main(new String[] { box2d_CantileverJoint.class.getName() });
+    PApplet.main(new String[] { box2d_Cantilever_WeldJoint.class.getName() });
   }
 
 }

examples/testbed/box2d_Chain.java …s/testbed/box2d_Chain_RevoluteJoint.javaexamples/testbed/box2d_Chain.java renamed to examples/testbed/box2d_Chain_RevoluteJoint.java examples/testbed/box2d_Chain.java renamed to examples/testbed/box2d_Chain_RevoluteJoint.java

@@ -29,7 +29,7 @@
 import processing.opengl.PGraphics2D;
 
 
-public class box2d_Chain extends PApplet {
+public class box2d_Chain_RevoluteJoint extends PApplet {
 
   int viewport_w = 1280;
   int viewport_h = 720;
@@ -171,7 +171,7 @@ public void initScene() {
 
 
   public static void main(String args[]) {
-    PApplet.main(new String[] { box2d_Chain.class.getName() });
+    PApplet.main(new String[] { box2d_Chain_RevoluteJoint.class.getName() });
   }
 
 }

examples/testbed/liquidfun_ParticleRenderGroups_LiquidFx.java

@@ -337,7 +337,23 @@ public void initScene() {
     world.mouse_spawn_particles.setBoxShape(size_x, size_y);
     world.mouse_spawn_particles.spawn(screen_x, screen_y);
 
-    setParticleSpawnProperties(spawn_type);
+    
+    
+    
+    // add some rigid particles.
+    // those will be rendered with another render-group into another render-target.
+    // This makes it possible to apply different post-processing effects on
+    // different particle render-groups.
+    int spawn_type_cpy = spawn_type;
+
+    setParticleSpawnProperties(4);
+    
+    screen_x = width/4;
+    screen_y = height/2;
+    world.mouse_spawn_particles.setBoxShape(500, 20);
+    world.mouse_spawn_particles.spawn(screen_x, screen_y);
+    
+    setParticleSpawnProperties(spawn_type_cpy);
 
   }
 
@@ -363,7 +379,7 @@ public void createWall(int numx, int numy, float dimx, float dimy, float tx, flo
     fixture_def.shape = brick_shape;
     fixture_def.density = 30;
     fixture_def.friction = 0.50f;
-    fixture_def.restitution = 0.5f;
+    fixture_def.restitution = 0.2f;
 
     BodyDef body_def = new BodyDef();
     body_def.type = BodyType.DYNAMIC;

examples/testbed/liquidfun_Scene.java

@@ -17,6 +17,9 @@
 import com.thomasdiewald.liquidfun.java.DwWorld;
 import com.thomasdiewald.pixelflow.java.DwPixelFlow;
 import com.thomasdiewald.pixelflow.java.imageprocessing.filter.DwLiquidFX;
+import com.thomasdiewald.pixelflow.java.sampling.DwSampling;
+
+import java.util.Random;
 
 import org.jbox2d.collision.AABB;
 import org.jbox2d.collision.shapes.CircleShape;
@@ -77,6 +80,7 @@ public void setup(){
 
 
     reset();
+//    frameRate(1000);
     frameRate(120);
   }
 
@@ -98,7 +102,7 @@ public void reset(){
 
     world.particles.param.falloff_exp1 = 1;
     world.particles.param.falloff_exp2 = 2;
-    world.particles.param.radius_scale = 3;
+    world.particles.param.radius_scale = 4;
 
     // create scene: rigid bodies, particles, etc ...
     initScene();
@@ -182,6 +186,12 @@ public void keyReleased(){
     if(key == 'g') APPLY_LIQUID_FX = !APPLY_LIQUID_FX;
   }
 
+  
+  public void mouseReleased(){
+    Vec2 mworld = new Vec2();
+    world.transform.getScreen2box(mouseX, mouseY, mworld);
+    System.out.println("mouse: "+mouseX+", "+mouseY+", "+mworld);
+  }
 
 
   //////////////////////////////////////////////////////////////////////////////
@@ -234,14 +244,14 @@ public void initScene() {
       ground.createFixture(shape, 0);
 
 
-      world.bodies.add(ground, true, color(220), !true, color(0), 1f);
+      world.bodies.add(ground, true, color(160), true, color(0), 1f);
     }
 
 
     {
       BodyDef bd = new BodyDef();
       bd.type = BodyType.DYNAMIC;
-      bd.position.set(-15, 20);
+      bd.position.set(-14, 24);
       Body body = world.createBody(bd);
 
       PolygonShape shape = new PolygonShape();
@@ -251,7 +261,7 @@ public void initScene() {
       shape.setAsBox(5, 0.5f);
       body.createFixture(shape, 0.5f);
 
-      world.bodies.add(body, true, color(220), !true, color(0), 1f);
+      world.bodies.add(body, true, color(220), true, color(0), 1f);
 
       RevoluteJointDef jd = new RevoluteJointDef();
       jd.bodyA = ground;
@@ -270,7 +280,7 @@ public void initScene() {
     {
       BodyDef bd = new BodyDef();
       bd.type = BodyType.DYNAMIC;
-      bd.position.set(-6, 22);
+      bd.position.set(-4, 22);
       Body body = world.createBody(bd);
 
       PolygonShape shape = new PolygonShape();
@@ -280,7 +290,7 @@ public void initScene() {
       shape.setAsBox(5, 0.5f);
       body.createFixture(shape, 0.5f);
 
-      world.bodies.add(body, true, color(220), !true, color(0), 1f);
+      world.bodies.add(body, true, color(220), true, color(0), 1f);
 
       RevoluteJointDef jd = new RevoluteJointDef();
       jd.bodyA = ground;
@@ -299,7 +309,32 @@ public void initScene() {
 
 
 
+    {
+      BodyDef bd = new BodyDef();
+      bd.type = BodyType.DYNAMIC;
+      bd.position.set(-2,3);
+      Body body = world.createBody(bd);
 
+      PolygonShape shape = new PolygonShape();
+      shape.setAsBox(0.5f, 8.0f);
+      body.createFixture(shape, 1);
+      
+      shape.setAsBox(8, 0.5f);
+      body.createFixture(shape, 0.5f);
+      
+      world.bodies.add(body, true, color(220), true, color(0), 1f);
+      
+      RevoluteJointDef jd = new RevoluteJointDef();
+      jd.bodyA = ground;
+      jd.bodyB = body;
+      jd.localAnchorA.set(bd.position);
+      jd.localAnchorB.set(0.0f, 0.0f);
+      jd.referenceAngle = 0.0f;
+      jd.motorSpeed = -0.2f * MathUtils.PI;
+      jd.maxMotorTorque = 100000;
+      jd.enableMotor = true;
+      m_joint = (RevoluteJoint) world.createJoint(jd);
+    }
 
 
 
@@ -309,6 +344,7 @@ public void initScene() {
     world.setParticleDamping(0.6f);
 
     {
+      ParticleGroupDef pgroup_def = new ParticleGroupDef();
       pgroup_def.flags = ParticleType.b2_waterParticle | ParticleType.b2_viscousParticle;
       pgroup_def.setColor(new Color3f(1, 0.15f, 0.05f));
       pgroup_def.linearVelocity.set(0,0);
@@ -322,69 +358,124 @@ public void initScene() {
     }
 
     m_time = 0;
-
+    
+    int flags = 0;
+    flags |= ParticleType.b2_waterParticle;
+    flags |= ParticleType.b2_viscousParticle;
+//    flags |= ParticleType.b2_colorMixingParticle;
+    
+    emitter0 = new ParticleEmitter(world, 800, 100);
+    emitter0.emit_angle = -170 * TO_RAD;
+    emitter0.emit_velocity = 15;
+    emitter0.pdef.color.set(color(32,255,0));
+    emitter0.pdef.flags = flags;
+    
+    emitter1 = new ParticleEmitter(world, 100, 100);
+    emitter1.emit_angle = 0;
+    emitter1.emit_velocity = 10;
+    emitter1.pdef.color.set(color(255,16,0));
+    emitter1.pdef.flags = flags;
+    
+    emitter2 = new ParticleEmitter(world, 131, 315);
+    emitter2.emit_angle = +40 * TO_RAD;
+    emitter2.emit_velocity = 15;
+    emitter2.pdef.color.set(color(255,64,0));
+    emitter2.pdef.flags = flags;
   }
 
 
-  ParticleGroupDef pgroup_def = new ParticleGroupDef();
-
+  ParticleEmitter emitter0;
+  ParticleEmitter emitter1;
+  ParticleEmitter emitter2;
 
   int counter = 0;
   public void addParticles(){
+    if(counter % 2 == 0){
+      emitter0.emitParticles(1);
+      emitter1.emitParticles(1);
+      emitter2.emitParticles(1);
+    }
+    counter++;
+  }
+
+  
+  static final float TO_RAD = (float) (Math.PI / 180.0);
+  
+  
+  
+  
+  static class ParticleEmitter {
+    public PApplet papplet;
+    public DwWorld world;
+
+    public ParticleDef pdef = new ParticleDef();
 
-    float screen_scale = world.transform.screen_scale;
-    
-    
-    float srandnoise = noise(counter / 100f) * 2 - 1;
-    
-    float rot_angle = 0 + srandnoise * 0.1f;
-    float vel_mag   = 10 + srandnoise * 5f;
-    
-    float velx = (float) (Math.cos(rot_angle) * vel_mag);
-    float vely = (float) (Math.sin(rot_angle) * vel_mag);
-    
-    Vec2 vel = new Vec2();
-    vel.x = (float) (Math.cos(rot_angle) * vel_mag);
-    vel.y = (float) (Math.sin(rot_angle) * vel_mag);
-    
-    Vec2 pos = new Vec2();
-    world.transform.getScreen2box(200, 200, pos);
-    pos.x += random(-1,1) * 1f;
-    pos.y += random(-1,1) * 1f;
+    public float emit_angle = (float) (Math.PI * 0.5f);
+    public float emit_velocity = 20;
 
+    public float mult_jitter_radius = 1.0f; // radius, world-space
+    public float mult_jitter_velmag = 0.5f; // noise mult
+    public float mult_jitter_velrot = 0.2f; // [0, PI*2]
+
+
+    protected Random rand = new Random();
+    protected int counter = 0;
 
-//    CircleShape shape = new CircleShape();
-//    world.transform.getScreen2box(200, 200, shape.m_p);
-//    shape.m_radius = 30 / screen_scale;
+    protected Vec2 emit_pos_screen = new Vec2();
+    protected Vec2 emit_pos_world = new Vec2();
 
 
+    public ParticleEmitter(DwWorld world, float screen_x, float screen_y){
+      this.papplet = world.papplet;
+      this.world = world;
+      
+      pdef.flags = ParticleType.b2_waterParticle | ParticleType.b2_viscousParticle;
+      pdef.setColor(new Color3f(1, 0.15f, 0.05f));
+      
+      setPosition(screen_x, screen_y);
+    }
 
-//    PolygonShape shape = new PolygonShape();
-//    shape.setAsBox(10 / screen_scale, 2, pos, rot);
-//    
-//    world.mouse_destroy_particles.destroyParticles(shape);
-    
-//    pgroup_def.shape = shape;
-    pgroup_def.angularVelocity = rot_angle;
-    pgroup_def.linearVelocity.set(vel);
-//    world.createParticleGroup(pgroup_def);
-    
 
+    public void emitParticles(int count){
+      for(int i = 0; i < count; i++){
+        emitSingleParticle(i);
+      }
+    }
 
-    ParticleDef pdef = new ParticleDef();
-    pdef.position.set(pos);
-    pdef.velocity.set(vel);
-    pdef.color = pgroup_def.color;
-    pdef.flags = pgroup_def.flags;
+    public void setPosition(float screen_x, float screen_y){
+      world.transform.getScreen2box(screen_x, screen_y, emit_pos_world);
+    }
 
-    world.createParticle(pdef);
+    protected void emitSingleParticle(int idx){
+
+      // velocity (noise)
+      float srandnoise = papplet.noise(counter / 100f) * 2 - 1;
+      
+      float rot_angle = emit_angle     + srandnoise * mult_jitter_velrot;
+      float vel_mag   = emit_velocity  + srandnoise * mult_jitter_velmag;
+      
+      float vel_x = (float) (Math.cos(rot_angle) * vel_mag);
+      float vel_y = (float) (Math.sin(rot_angle) * vel_mag);
+      
+      // position
+      float[] jitter = DwSampling.sampleDisk_Halton(counter, 0.5f);
+
+      float pos_x = emit_pos_world.x + jitter[0] * mult_jitter_radius;
+      float pos_y = emit_pos_world.y + jitter[1] * mult_jitter_radius;
+
+
+      // create Particle
+      pdef.position.set(pos_x, pos_y);
+      pdef.velocity.set(vel_x, vel_y);
+      world.createParticle(pdef);
+      
+      counter++;
+    }
 
 
-    counter++;
   }
 
 
-
 
 
   public static void main(String args[]) {