Skip to content

Commit 707a972

Browse files
diwidiwi
committed
.
1 parent 8b15897 commit 707a972

12 files changed

Lines changed: 51 additions & 40 deletions

File tree

‎examples/box2d_Car/box2d_Car.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public class box2d_Car extends PApplet {
4949
// 'r' ... reset
5050
// 't' ... update/pause physics
5151
// 'f' ... toggle debug draw
52-
// 'a' ... move backwards
52+
// 'a' ... move backward
5353
// 's' ... stop
54-
// 'd' ... move forwards
54+
// 'd' ... move forward
5555
// 'q' ... dec damping
5656
// 'e' ... inc damping
5757

@@ -75,7 +75,7 @@ public void settings(){
7575

7676
public void setup(){
7777
surface.setLocation(viewport_x, viewport_y);
78-
font = createFont("SourceCodePro-Regular.ttf", 12);
78+
font = createFont("../data/SourceCodePro-Regular.ttf", 12);
7979
reset();
8080
frameRate(120);
8181
}
@@ -128,14 +128,14 @@ public void draw(){
128128
int gy = 14;
129129
textFont(font);
130130
fill(0);
131-
text("'a' move backwards", tx, ty+=gy);
132-
text("'s' stop" , tx, ty+=gy);
133-
text("'d' move forwards" , tx, ty+=gy);
134-
text("'q' dec damping" , tx, ty+=gy);
135-
text("'e' inc damping" , tx, ty+=gy);
136-
text("'r' reset" , tx, ty+=gy);
137-
text("'t' pause" , tx, ty+=gy);
138-
text("'f' debugdraw" , tx, ty+=gy);
131+
text("'a' move backward", tx, ty+=gy);
132+
text("'s' stop" , tx, ty+=gy);
133+
text("'d' move forward" , tx, ty+=gy);
134+
text("'q' dec damping" , tx, ty+=gy);
135+
text("'e' inc damping" , tx, ty+=gy);
136+
text("'r' reset" , tx, ty+=gy);
137+
text("'t' pause" , tx, ty+=gy);
138+
text("'f' debugdraw" , tx, ty+=gy);
139139

140140
// info
141141
int num_bodies = world.getBodyCount();

‎examples/box2d_CircleStressTest/box2d_CircleStressTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void settings(){
7070

7171
public void setup(){
7272
surface.setLocation(viewport_x, viewport_y);
73-
font = createFont("SourceCodePro-Regular.ttf", 12);
73+
font = createFont("../data/SourceCodePro-Regular.ttf", 12);
7474
reset();
7575
frameRate(120);
7676
}

‎examples/box2d_RopeJoint/box2d_RopeJoint.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public class box2d_RopeJoint extends PApplet {
4444
// 'r' ... reset
4545
// 't' ... update/pause physics
4646
// 'f' ... toggle debug draw
47+
// 'j' ... toggle joint
4748
//
4849

4950
int viewport_w = 1280;

‎examples/box2d_TheoJansenWalker/box2d_TheoJansenWalker.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ public class box2d_TheoJansenWalker extends PApplet {
4747
// 'r' ... reset
4848
// 't' ... update/pause physics
4949
// 'f' ... toggle debug draw
50+
// 'a' ... move backward
51+
// 's' ... stop
52+
// 'd' ... move forward
53+
// 'm' ... toggle motor
5054
//
5155

5256
int viewport_w = 1280;
@@ -68,7 +72,7 @@ public void settings(){
6872

6973
public void setup(){
7074
surface.setLocation(viewport_x, viewport_y);
71-
font = createFont("SourceCodePro-Regular.ttf", 12);
75+
font = createFont("../data/SourceCodePro-Regular.ttf", 12);
7276
reset();
7377
frameRate(120);
7478
}
@@ -121,13 +125,13 @@ public void draw(){
121125
int gy = 14;
122126
textFont(font);
123127
fill(0);
124-
text("'a' move backwards", tx, ty+=gy);
125-
text("'s' stop" , tx, ty+=gy);
126-
text("'d' move forwards" , tx, ty+=gy);
127-
text("'m' toggle motor" , tx, ty+=gy);
128-
text("'r' reset" , tx, ty+=gy);
129-
text("'t' pause" , tx, ty+=gy);
130-
text("'f' debugdraw" , tx, ty+=gy);
128+
text("'a' move backward", tx, ty+=gy);
129+
text("'s' stop" , tx, ty+=gy);
130+
text("'d' move forward" , tx, ty+=gy);
131+
text("'m' toggle motor" , tx, ty+=gy);
132+
text("'r' reset" , tx, ty+=gy);
133+
text("'t' pause" , tx, ty+=gy);
134+
text("'f' debugdraw" , tx, ty+=gy);
131135

132136
// info
133137
int num_bodies = world.getBodyCount();

‎examples/liquidfun_DrawingParticles_LiquidFx/liquidfun_DrawingParticles_LiquidFx.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void settings(){
8686
public void setup(){
8787
surface.setLocation(viewport_x, viewport_y);
8888
// sprite = loadImage("sprite.png");
89-
font = createFont("data/SourceCodePro-Regular.ttf", 12);
89+
font = createFont("../data/SourceCodePro-Regular.ttf", 12);
9090

9191
pixelflow = new DwPixelFlow(this);
9292
liquidfx = new DwLiquidFX(pixelflow);

‎examples/liquidfun_ParticleColors_LiquidFx/liquidfun_ParticleColors_LiquidFx.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313

1414
package liquidfun_ParticleColors_LiquidFx;
1515

16+
import com.thomasdiewald.liquidfun.java.DwUtils;
17+
import com.thomasdiewald.liquidfun.java.DwWorld;
18+
import com.thomasdiewald.pixelflow.java.DwPixelFlow;
19+
import com.thomasdiewald.pixelflow.java.imageprocessing.filter.DwLiquidFX;
1620

1721
import org.jbox2d.collision.shapes.ChainShape;
1822
import org.jbox2d.collision.shapes.PolygonShape;
@@ -24,11 +28,6 @@
2428
import org.jbox2d.particle.ParticleGroupDef;
2529
import org.jbox2d.particle.ParticleType;
2630

27-
import com.thomasdiewald.liquidfun.java.DwUtils;
28-
import com.thomasdiewald.liquidfun.java.DwWorld;
29-
import com.thomasdiewald.pixelflow.java.DwPixelFlow;
30-
import com.thomasdiewald.pixelflow.java.imageprocessing.filter.DwLiquidFX;
31-
3231
import processing.core.PApplet;
3332
import processing.opengl.PGraphics2D;
3433

‎examples/liquidfun_ParticleEmitter_LiquidFx/liquidfun_ParticleEmitter_LiquidFx.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ public void keyReleased(){
203203
//////////////////////////////////////////////////////////////////////////////
204204

205205

206-
207206
public void initScene() {
208207

209208

‎examples/liquidfun_ParticleRenderGroups_LiquidFx/liquidfun_ParticleRenderGroups_LiquidFx.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
package liquidfun_ParticleRenderGroups_LiquidFx;
1515

1616

17+
import com.thomasdiewald.liquidfun.java.DwWorld;
18+
import com.thomasdiewald.liquidfun.java.interaction.DwParticleSpawn;
19+
import com.thomasdiewald.liquidfun.java.render.DwParticleRenderGroupCallback;
20+
import com.thomasdiewald.pixelflow.java.DwPixelFlow;
21+
import com.thomasdiewald.pixelflow.java.imageprocessing.filter.DwLiquidFX;
22+
1723
import org.jbox2d.collision.shapes.CircleShape;
1824
import org.jbox2d.collision.shapes.PolygonShape;
1925
import org.jbox2d.common.Vec2;
@@ -25,12 +31,6 @@
2531
import org.jbox2d.particle.ParticleGroupType;
2632
import org.jbox2d.particle.ParticleType;
2733

28-
import com.thomasdiewald.liquidfun.java.DwWorld;
29-
import com.thomasdiewald.liquidfun.java.interaction.DwParticleSpawn;
30-
import com.thomasdiewald.liquidfun.java.render.DwParticleRender.ParticleRenderGroupCallback;
31-
import com.thomasdiewald.pixelflow.java.DwPixelFlow;
32-
import com.thomasdiewald.pixelflow.java.imageprocessing.filter.DwLiquidFX;
33-
3434
import processing.core.*;
3535
import processing.opengl.PGraphics2D;
3636

@@ -132,7 +132,7 @@ public void reset(){
132132
world.particles.param.radius_scale = 2;
133133

134134
// callback to group particles by their properties (flags)
135-
world.particles.setParticleRenderGroupCallback(new ParticleRenderGroupCallback() {
135+
world.particles.setParticleRenderGroupCallback(new DwParticleRenderGroupCallback() {
136136
@Override
137137
public int getRenderGroupIndex(int particle_idx, ParticleGroup group, int particle_flag) {
138138
int group_flag = group.getGroupFlags();

‎examples/liquidfun_ParticleTypes/liquidfun_ParticleTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void settings(){
7272
public void setup(){
7373
surface.setLocation(viewport_x, viewport_y);
7474
// sprite = loadImage("sprite.png");
75-
font = createFont("data/SourceCodePro-Regular.ttf", 12);
75+
font = createFont("../data/SourceCodePro-Regular.ttf", 12);
7676
reset();
7777
frameRate(120);
7878
}

‎examples/liquidfun_ParticleTypes_LiquidFx/liquidfun_ParticleTypes_LiquidFx.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void settings(){
8383
public void setup(){
8484
surface.setLocation(viewport_x, viewport_y);
8585
// sprite = loadImage("sprite.png");
86-
font = createFont("data/SourceCodePro-Regular.ttf", 12);
86+
font = createFont("../data/SourceCodePro-Regular.ttf", 12);
8787

8888
pixelflow = new DwPixelFlow(this);
8989
liquidfx = new DwLiquidFX(pixelflow);

0 commit comments

Comments
 (0)