Skip to content

Commit 5aabbb7

Browse files
committed
new release
1 parent e3ee534 commit 5aabbb7

3 files changed

Lines changed: 35 additions & 22 deletions

File tree

examples/liquidfun_DamBreak_PShapeParticles/liquidfun_DamBreak_PShapeParticles.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ public void reset(){
8989
world = new DwWorld(this, 18);
9090

9191

92-
// this replaces the default particle renderer (OpenGL) by a alternative
93-
// renderer, where particles are rendered s PShape Quads.
92+
// this replaces the default particle renderer (OpenGL) with an alternative
93+
// renderer where particles are rendered as PShape-Quads.
9494
// It renders a bit slower then the OpenGL version and grouped rendering
95-
// is not possible.
95+
// is also not possible.
9696
world.setParticleRender(new DwParticleRenderP5(this, world, world.transform));
9797

9898
// create scene: rigid bodies, particles, etc ...

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

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,7 @@ public DwWorld(PApplet papplet, float scale){
136136
}
137137

138138

139-
public void setParticleRender(DwParticleRender particle_render){
140-
if(particle_render == null){
141-
return;
142-
}
143-
if(particles != null){
144-
particles.release();
145-
}
146-
particles = particle_render;
147-
}
148139

149-
public void setBodyRender(DwBodyGroup body_render){
150-
if(body_render == null){
151-
return;
152-
}
153-
if(bodies != null){
154-
bodies.release();
155-
}
156-
bodies = body_render;
157-
}
158140

159141
/**
160142
* called by processing
@@ -517,7 +499,39 @@ public List<DwInteractionEvent> getMouseActions(){
517499

518500

519501

502+
503+
504+
505+
506+
507+
508+
/**
509+
* replace the default particle renderer.
510+
* @param particle_render
511+
*/
512+
public void setParticleRender(DwParticleRender particle_render){
513+
if(particle_render == null){
514+
return;
515+
}
516+
if(particles != null){
517+
particles.release();
518+
}
519+
particles = particle_render;
520+
}
520521

522+
/**
523+
* replace the default body renderer.
524+
* @param particle_render
525+
*/
526+
public void setBodyRender(DwBodyGroup body_render){
527+
if(body_render == null){
528+
return;
529+
}
530+
if(bodies != null){
531+
bodies.release();
532+
}
533+
bodies = body_render;
534+
}
521535

522536

523537

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import processing.core.PApplet;
2727
import processing.core.PImage;
2828
import processing.opengl.PGraphics2D;
29-
import processing.opengl.PGraphicsOpenGL;
3029

3130

3231
/**

0 commit comments

Comments
 (0)