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

EffectTrack : fixed serialization issue

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9841 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-10-05 20:54:17 +00:00
parent fa841874c6
commit cb06858534
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
engine/src/core/com/jme3/animation/EffectTrack.java
View File

@ -74,16 +74,35 @@ public class EffectTrack implements ClonableTrack {
private float length = 0; private float length = 0;
private boolean emitted = false; private boolean emitted = false;
private boolean initialized = false; private boolean initialized = false;
private boolean stopRequested = false;
//control responsible for disable and cull the emitter once all particles are gone //control responsible for disable and cull the emitter once all particles are gone
private AbstractControl killParticles = new AbstractControl() { private KillParticleControl killParticles = new KillParticleControl();
public static class KillParticleControl extends AbstractControl {
ParticleEmitter emitter;
boolean stopRequested = false;
public KillParticleControl() {
}
@Override
public void setSpatial(Spatial spatial) {
super.setSpatial(spatial);
if(spatial instanceof ParticleEmitter){
emitter = (ParticleEmitter)spatial;
}else{
throw new IllegalArgumentException("KillParticleEmitter can only ba attached to ParticleEmitter");
}
}
@Override @Override
protected void controlUpdate(float tpf) { protected void controlUpdate(float tpf) {
if (emitter.getNumVisibleParticles() == 0) { if (emitter.getNumVisibleParticles() == 0) {
emitter.setCullHint(CullHint.Always); emitter.setCullHint(CullHint.Always);
emitter.setEnabled(false); emitter.setEnabled(false);
emitter.removeControl(killParticles); emitter.removeControl(this);
stopRequested = false; stopRequested = false;
} }
} }
@ -163,9 +182,9 @@ public class EffectTrack implements ClonableTrack {
//if the emitter has 0 particles per seconds emmit all particles in one shot //if the emitter has 0 particles per seconds emmit all particles in one shot
if (particlesPerSeconds == 0) { if (particlesPerSeconds == 0) {
emitter.emitAllParticles(); emitter.emitAllParticles();
if (!stopRequested) { if (!killParticles.stopRequested) {
emitter.addControl(killParticles); emitter.addControl(killParticles);
stopRequested = true; killParticles.stopRequested = true;
} }
} else { } else {
//else reset its former particlePerSec value to let it emmit. //else reset its former particlePerSec value to let it emmit.
@ -178,9 +197,9 @@ public class EffectTrack implements ClonableTrack {
private void stop() { private void stop() {
emitter.setParticlesPerSec(0); emitter.setParticlesPerSec(0);
emitted = false; emitted = false;
if (!stopRequested) { if (!killParticles.stopRequested) {
emitter.addControl(killParticles); emitter.addControl(killParticles);
stopRequested = true; killParticles.stopRequested = true;
} }
} }
@ -283,6 +302,10 @@ public class EffectTrack implements ClonableTrack {
data.getTracks().remove(this); data.getTracks().remove(this);
} }
this.emitter = emitter; this.emitter = emitter;
//saving particles per second value
this.particlesPerSeconds = emitter.getParticlesPerSec();
//setting the emmitter to not emmit.
this.emitter.setParticlesPerSec(0);
setUserData(this); setUserData(this);
} }
@ -327,8 +350,6 @@ public class EffectTrack implements ClonableTrack {
OutputCapsule out = ex.getCapsule(this); OutputCapsule out = ex.getCapsule(this);
//reseting the particle emission rate on the emitter before saving. //reseting the particle emission rate on the emitter before saving.
emitter.setParticlesPerSec(particlesPerSeconds); emitter.setParticlesPerSec(particlesPerSeconds);
//removing eventual unpersisted control off the emitter
emitter.removeControl(killParticles);
out.write(emitter, "emitter", null); out.write(emitter, "emitter", null);
out.write(particlesPerSeconds, "particlesPerSeconds", 0); out.write(particlesPerSeconds, "particlesPerSeconds", 0);
out.write(length, "length", 0); out.write(length, "length", 0);
@ -349,6 +370,8 @@ public class EffectTrack implements ClonableTrack {
//This also avoid null pointer exception if the model is not loaded via the AssetManager. //This also avoid null pointer exception if the model is not loaded via the AssetManager.
emitter = (ParticleEmitter) in.readSavable("emitter", null); emitter = (ParticleEmitter) in.readSavable("emitter", null);
emitter.setParticlesPerSec(0); emitter.setParticlesPerSec(0);
//if the emitter was saved with a KillParticleControl we remove it.
emitter.removeControl(KillParticleControl.class);
length = in.readFloat("length", length); length = in.readFloat("length", length);
startOffset = in.readFloat("startOffset", 0); startOffset = in.readFloat("startOffset", 0);
} }