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

* Added AbstractControl.getSpatial() as otherwise AnimEventListener is kinda useless as it only gives the AnimControl as the reference and to get userdata you need the spatial itself

Browse Source 
* World space particles are now influenced by rotation


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7980 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-08-06 03:55:56 +00:00
parent 5476be99f7
commit 2d2ce703d9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/core/com/jme3/effect/ParticleEmitter.java
View File

@ -44,6 +44,7 @@ import com.jme3.export.OutputCapsule;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.math.FastMath; import com.jme3.math.FastMath;
import com.jme3.math.Matrix3f; import com.jme3.math.Matrix3f;
import com.jme3.math.Quaternion;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.renderer.Camera; import com.jme3.renderer.Camera;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
@ -878,7 +879,9 @@ public class ParticleEmitter extends Geometry {
//shape.getRandomPoint(p.position); //shape.getRandomPoint(p.position);
particleInfluencer.influenceParticle(p, shape); particleInfluencer.influenceParticle(p, shape);
if (worldSpace) { if (worldSpace) {
p.position.addLocal(worldTransform.getTranslation()); worldTransform.transformVector(p.position, p.position);
worldTransform.getRotation().mult(p.velocity, p.velocity);
// TODO: Make scale relevant somehow??
} }
if (randomAngle) { if (randomAngle) {
p.angle = FastMath.nextRandomFloat() * FastMath.TWO_PI; p.angle = FastMath.nextRandomFloat() * FastMath.TWO_PI;

4
engine/src/core/com/jme3/scene/control/AbstractControl.java
View File

@ -60,6 +60,10 @@ public abstract class AbstractControl implements Control {
} }
this.spatial = spatial; this.spatial = spatial;
} }
public Spatial getSpatial(){
return spatial;
}
public void setEnabled(boolean enabled) { public void setEnabled(boolean enabled) {
this.enabled = enabled; this.enabled = enabled;