point particles: various fixes

* support any number of particles by re-using temp buffer
 * fix exception when changing particle count
experimental
Kirill Vainer 9 years ago
parent d76cb99772
commit 8413ed715c
  1. 66
      jme3-core/src/main/java/com/jme3/effect/ParticlePointMesh.java

@ -40,6 +40,7 @@ import com.jme3.scene.VertexBuffer.Usage;
import com.jme3.util.BufferUtils; import com.jme3.util.BufferUtils;
import com.jme3.util.TempVars; import com.jme3.util.TempVars;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
public class ParticlePointMesh extends ParticleMesh { public class ParticlePointMesh extends ParticleMesh {
@ -47,7 +48,8 @@ public class ParticlePointMesh extends ParticleMesh {
private static final int COLOR_SIZE = 4 * 1; private static final int COLOR_SIZE = 4 * 1;
private static final int SIZE_SIZE = 1 * 4; private static final int SIZE_SIZE = 1 * 4;
private static final int UV_SIZE = 4 * 4; private static final int UV_SIZE = 4 * 4;
private static final int TOTAL_SIZE = POS_SIZE + COLOR_SIZE + SIZE_SIZE + UV_SIZE; private static final int BYTES_PER_PARTICLE = POS_SIZE + COLOR_SIZE + SIZE_SIZE + UV_SIZE;
private static final int FLOATS_PER_PARTICLE = BYTES_PER_PARTICLE / 4;
private ParticleEmitter emitter; private ParticleEmitter emitter;
@ -66,16 +68,22 @@ public class ParticlePointMesh extends ParticleMesh {
this.emitter = emitter; this.emitter = emitter;
ByteBuffer eb = BufferUtils.createByteBuffer(TOTAL_SIZE * numParticles); ByteBuffer eb = BufferUtils.createByteBuffer(BYTES_PER_PARTICLE * numParticles);
VertexBuffer vb = new VertexBuffer(VertexBuffer.Type.InterleavedData); VertexBuffer vb = getBuffer(VertexBuffer.Type.InterleavedData);
if (vb != null) {
vb.updateData(eb);
} else {
vb = new VertexBuffer(VertexBuffer.Type.InterleavedData);
vb.setupData(Usage.Stream, 1, Format.Byte, eb); vb.setupData(Usage.Stream, 1, Format.Byte, eb);
setBuffer(vb); setBuffer(vb);
}
if (getBuffer(VertexBuffer.Type.Position) == null) {
VertexBuffer pb = new VertexBuffer(VertexBuffer.Type.Position); VertexBuffer pb = new VertexBuffer(VertexBuffer.Type.Position);
pb.setupData(Usage.Stream, 3, Format.Float, eb); pb.setupData(Usage.Stream, 3, Format.Float, eb);
pb.updateData(null); pb.updateData(null);
pb.setOffset(0); pb.setOffset(0);
pb.setStride(TOTAL_SIZE); pb.setStride(BYTES_PER_PARTICLE);
setBuffer(pb); setBuffer(pb);
VertexBuffer cb = new VertexBuffer(VertexBuffer.Type.Color); VertexBuffer cb = new VertexBuffer(VertexBuffer.Type.Color);
@ -83,22 +91,23 @@ public class ParticlePointMesh extends ParticleMesh {
cb.updateData(null); cb.updateData(null);
cb.setNormalized(true); cb.setNormalized(true);
cb.setOffset(POS_SIZE); cb.setOffset(POS_SIZE);
cb.setStride(TOTAL_SIZE); cb.setStride(BYTES_PER_PARTICLE);
setBuffer(cb); setBuffer(cb);
VertexBuffer sb = new VertexBuffer(VertexBuffer.Type.Size); VertexBuffer sb = new VertexBuffer(VertexBuffer.Type.Size);
sb.setupData(Usage.Stream, 1, Format.Float, eb); sb.setupData(Usage.Stream, 1, Format.Float, eb);
sb.updateData(null); sb.updateData(null);
sb.setOffset(POS_SIZE + COLOR_SIZE); sb.setOffset(POS_SIZE + COLOR_SIZE);
sb.setStride(TOTAL_SIZE); sb.setStride(BYTES_PER_PARTICLE);
setBuffer(sb); setBuffer(sb);
VertexBuffer tb = new VertexBuffer(VertexBuffer.Type.TexCoord); VertexBuffer tb = new VertexBuffer(VertexBuffer.Type.TexCoord);
tb.setupData(Usage.Stream, 4, Format.Float, eb); tb.setupData(Usage.Stream, 4, Format.Float, eb);
tb.updateData(null); tb.updateData(null);
tb.setOffset(POS_SIZE + COLOR_SIZE + SIZE_SIZE); tb.setOffset(POS_SIZE + COLOR_SIZE + SIZE_SIZE);
tb.setStride(TOTAL_SIZE); tb.setStride(BYTES_PER_PARTICLE);
setBuffer(tb); setBuffer(tb);
}
updateCounts(); updateCounts();
} }
@ -107,22 +116,32 @@ public class ParticlePointMesh extends ParticleMesh {
public void updateParticleData(RenderManager rm, Particle[] particles, Camera cam, Matrix3f inverseRotation) { public void updateParticleData(RenderManager rm, Particle[] particles, Camera cam, Matrix3f inverseRotation) {
VertexBuffer eb = getBuffer(VertexBuffer.Type.InterleavedData); VertexBuffer eb = getBuffer(VertexBuffer.Type.InterleavedData);
ByteBuffer elements = (ByteBuffer) eb.getData(); ByteBuffer elements = (ByteBuffer) eb.getData();
FloatBuffer floatElements = elements.asFloatBuffer();
float sizeScale = emitter.getWorldScale().x; float sizeScale = emitter.getWorldScale().x;
TempVars vars = TempVars.get(); TempVars vars = TempVars.get();
try { try {
float[] temp = vars.skinTangents; float[] floatArray = vars.skinTangents;
int index = 0;
int particlesPerIteration = floatArray.length / FLOATS_PER_PARTICLE;
int iterations = (particles.length + particlesPerIteration - 1) / particlesPerIteration;
int particleIndex = 0;
for (int iteration = 0; iteration < iterations; iteration++) {
int particlesRemaining = Math.min(
particles.length - particleIndex,
particlesPerIteration);
for (int i = 0; i < particles.length; i++) { int floatIndex = 0;
Particle p = particles[i]; for (int i = 0; i < particlesRemaining; i++) {
Particle p = particles[particleIndex++];
temp[index++] = p.position.x; floatArray[floatIndex++] = p.position.x;
temp[index++] = p.position.y; floatArray[floatIndex++] = p.position.y;
temp[index++] = p.position.z; floatArray[floatIndex++] = p.position.z;
temp[index++] = Float.intBitsToFloat(p.color.asIntABGR()); floatArray[floatIndex++] = Float.intBitsToFloat(p.color.asIntABGR());
temp[index++] = p.size * sizeScale; floatArray[floatIndex++] = p.size * sizeScale;
int imgX = p.imageIndex % imagesX; int imgX = p.imageIndex % imagesX;
int imgY = (p.imageIndex - imgX) / imagesY; int imgY = (p.imageIndex - imgX) / imagesY;
@ -132,13 +151,18 @@ public class ParticlePointMesh extends ParticleMesh {
float endX = startX + (1f / imagesX); float endX = startX + (1f / imagesX);
float endY = startY + (1f / imagesY); float endY = startY + (1f / imagesY);
temp[index++] = startX; floatArray[floatIndex++] = startX;
temp[index++] = startY; floatArray[floatIndex++] = startY;
temp[index++] = endX; floatArray[floatIndex++] = endX;
temp[index++] = endY; floatArray[floatIndex++] = endY;
} }
elements.asFloatBuffer().put(temp, 0, (TOTAL_SIZE / 4) * particles.length).flip(); floatElements.put(floatArray, 0, FLOATS_PER_PARTICLE * particlesRemaining);
}
if (floatElements.remaining() != 0) {
throw new IllegalStateException();
}
eb.updateData(elements); eb.updateData(elements);

Loading…
Cancel
Save