From d3a6c31dd1eba0fcb80c681254defc72c73f6080 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Sun, 25 Mar 2007 20:48:23 +0000 Subject: [PATCH] added a test for the particle engine --- src/ei/engine/effects/Lesson19.java | 4 - src/ei/engine/effects/Particles.java | 28 +- src/ei/engine/test/ParticlesTest.java | 57 ++++ src/ei/engine/test/ParticlesTestFrame.java | 348 +++++++++++++++++++++ 4 files changed, 419 insertions(+), 18 deletions(-) create mode 100644 src/ei/engine/test/ParticlesTest.java create mode 100644 src/ei/engine/test/ParticlesTestFrame.java diff --git a/src/ei/engine/effects/Lesson19.java b/src/ei/engine/effects/Lesson19.java index 2c4f469..f95eff1 100644 --- a/src/ei/engine/effects/Lesson19.java +++ b/src/ei/engine/effects/Lesson19.java @@ -7,10 +7,6 @@ package ei.engine.effects; * Visit Our Sites At www.tiptup.com and nehe.gamedev.net */ -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.IntBuffer; - import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; diff --git a/src/ei/engine/effects/Particles.java b/src/ei/engine/effects/Particles.java index ffbf4a9..bb97de0 100644 --- a/src/ei/engine/effects/Particles.java +++ b/src/ei/engine/effects/Particles.java @@ -30,13 +30,14 @@ import ei.engine.texture.TextureLoader; * */ public class Particles extends Entity{ + public int maxParticles = 1000; public boolean regenerate = true; public boolean enabled = true; public boolean rainbow = true; // Rainbow Mode? public float slowdown = 1.0f; // Slow Down Particles - public float xspeed = 00; // Base X Speed (To Allow Keyboard Direction Of Tail) - public float yspeed = 000; // Base Y Speed (To Allow Keyboard Direction Of Tail) + public float xspeed = 0.0f; // Base X Speed (To Allow Keyboard Direction Of Tail) + public float yspeed = 0.0f; // Base Y Speed (To Allow Keyboard Direction Of Tail) public float MaxSpeedX = 500; // The Max Random Speed On X Axis public float MaxSpeedY = 500; // The Max Random Speed On Y Axis @@ -56,7 +57,6 @@ public class Particles extends Entity{ {0.5f,0.5f,1.0f},{0.75f,0.5f,1.0f},{1.0f,0.5f,1.0f},{1.0f,0.5f,0.75f} }; - private final int MAX_PARTICLES = 1000; private Particle particle[]; private int col; // Current Color Selection private int delay; // Rainbow Effect Delay @@ -74,9 +74,9 @@ public class Particles extends Entity{ * */ public void reset(){ - particle = new Particle[MAX_PARTICLES]; + particle = new Particle[maxParticles]; - for(int i=0;i