sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

point particles: various fixes

Browse Source 
* support any number of particles by re-using temp buffer
 * fix exception when changing particle count
This commit is contained in:
Kirill Vainer 2016-02-29 21:54:50 -05:00
parent d76cb99772
commit 8413ed715c
1 changed files with 74 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
jme3-core/src/main/java/com/jme3/effect/ParticlePointMesh.java
View File

@ -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,39 +68,46 @@ 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);
vb.setupData(Usage.Stream, 1, Format.Byte, eb); if (vb != null) {
setBuffer(vb); vb.updateData(eb);
} else {
vb = new VertexBuffer(VertexBuffer.Type.InterleavedData);
vb.setupData(Usage.Stream, 1, Format.Byte, eb);
setBuffer(vb);
}
VertexBuffer pb = new VertexBuffer(VertexBuffer.Type.Position); if (getBuffer(VertexBuffer.Type.Position) == null) {
pb.setupData(Usage.Stream, 3, Format.Float, eb); VertexBuffer pb = new VertexBuffer(VertexBuffer.Type.Position);
pb.updateData(null); pb.setupData(Usage.Stream, 3, Format.Float, eb);
pb.setOffset(0); pb.updateData(null);
pb.setStride(TOTAL_SIZE); pb.setOffset(0);
setBuffer(pb); pb.setStride(BYTES_PER_PARTICLE);
setBuffer(pb);
VertexBuffer cb = new VertexBuffer(VertexBuffer.Type.Color); VertexBuffer cb = new VertexBuffer(VertexBuffer.Type.Color);
cb.setupData(Usage.Stream, 4, Format.UnsignedByte, eb); cb.setupData(Usage.Stream, 4, Format.UnsignedByte, eb);
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,38 +116,53 @@ 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;
for (int i = 0; i < particles.length; i++) { int particlesPerIteration = floatArray.length / FLOATS_PER_PARTICLE;
Particle p = particles[i]; int iterations = (particles.length + particlesPerIteration - 1) / particlesPerIteration;
temp[index++] = p.position.x; int particleIndex = 0;
temp[index++] = p.position.y; for (int iteration = 0; iteration < iterations; iteration++) {
temp[index++] = p.position.z; int particlesRemaining = Math.min(
temp[index++] = Float.intBitsToFloat(p.color.asIntABGR()); particles.length - particleIndex,
temp[index++] = p.size * sizeScale; particlesPerIteration);
int imgX = p.imageIndex % imagesX; int floatIndex = 0;
int imgY = (p.imageIndex - imgX) / imagesY; for (int i = 0; i < particlesRemaining; i++) {
Particle p = particles[particleIndex++];
float startX = ((float) imgX) / imagesX; floatArray[floatIndex++] = p.position.x;
float startY = ((float) imgY) / imagesY; floatArray[floatIndex++] = p.position.y;
float endX = startX + (1f / imagesX); floatArray[floatIndex++] = p.position.z;
float endY = startY + (1f / imagesY); floatArray[floatIndex++] = Float.intBitsToFloat(p.color.asIntABGR());
floatArray[floatIndex++] = p.size * sizeScale;
temp[index++] = startX; int imgX = p.imageIndex % imagesX;
temp[index++] = startY; int imgY = (p.imageIndex - imgX) / imagesY;
temp[index++] = endX;
temp[index++] = endY; float startX = ((float) imgX) / imagesX;
float startY = ((float) imgY) / imagesY;
float endX = startX + (1f / imagesX);
float endY = startY + (1f / imagesY);
floatArray[floatIndex++] = startX;
floatArray[floatIndex++] = startY;
floatArray[floatIndex++] = endX;
floatArray[floatIndex++] = endY;
}
floatElements.put(floatArray, 0, FLOATS_PER_PARTICLE * particlesRemaining);
} }
elements.asFloatBuffer().put(temp, 0, (TOTAL_SIZE / 4) * particles.length).flip(); if (floatElements.remaining() != 0) {
throw new IllegalStateException();
}
eb.updateData(elements); eb.updateData(elements);