|
@@ -209,7 +209,7 @@ private class ParticleInstance {
|
|
|
static var tmpCamAlign = new h3d.Vector();
|
|
|
static var tmpCamVec = new h3d.Vector();
|
|
|
static var tmpCamVec2 = new h3d.Vector();
|
|
|
- static var tmpQuat = new h3d.h3d.Quat();
|
|
|
+ static var tmpQuat = new h3d.Quat();
|
|
|
var tmpColor = new h3d.Vector();
|
|
|
|
|
|
|
|
@@ -814,7 +814,7 @@ class EmitterObject extends h3d.scene.Object {
|
|
|
}
|
|
|
if( isSubEmitter && totalBurstCount == burstCount )
|
|
|
enable = false;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -870,7 +870,7 @@ class EmitterObject extends h3d.scene.Object {
|
|
|
particles = next;
|
|
|
|
|
|
disposeInstance(p);
|
|
|
-
|
|
|
+
|
|
|
// SUB EMITTER
|
|
|
if( subEmitterTemplate != null ) {
|
|
|
if( tmpCtx == null ) {
|
|
@@ -911,7 +911,7 @@ class EmitterObject extends h3d.scene.Object {
|
|
|
trails[i] = trails[trails.length - 1];
|
|
|
trails.pop();
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
i++;
|
|
|
}
|
|
|
}
|
|
@@ -1178,10 +1178,10 @@ class Emitter extends Object3D {
|
|
|
emitterObj.trailTemplate = trailTemplate;
|
|
|
// RANDOM
|
|
|
emitterObj.seedGroup = getParamVal("seedGroup");
|
|
|
- // LIFE
|
|
|
+ // LIFE
|
|
|
emitterObj.lifeTime = getParamVal("lifeTime");
|
|
|
emitterObj.lifeTimeRand = getParamVal("lifeTimeRand");
|
|
|
- // EMIT PARAMS
|
|
|
+ // EMIT PARAMS
|
|
|
emitterObj.emitType = getParamVal("emitType");
|
|
|
emitterObj.burstCount = getParamVal("burstCount");
|
|
|
emitterObj.burstDelay = getParamVal("burstDelay");
|
|
@@ -1192,22 +1192,22 @@ class Emitter extends Object3D {
|
|
|
emitterObj.maxCount = getParamVal("maxCount");
|
|
|
emitterObj.emitRate = makeParam(this, "emitRate");
|
|
|
emitterObj.emitShape = getParamVal("emitShape");
|
|
|
- // EMIT SHAPE
|
|
|
+ // EMIT SHAPE
|
|
|
emitterObj.emitAngle = getParamVal("emitAngle");
|
|
|
emitterObj.emitRad1 = getParamVal("emitRad1");
|
|
|
emitterObj.emitRad2 = getParamVal("emitRad2");
|
|
|
emitterObj.emitSurface = getParamVal("emitSurface");
|
|
|
- // ALIGNMENT
|
|
|
+ // ALIGNMENT
|
|
|
emitterObj.alignMode = getParamVal("alignMode");
|
|
|
emitterObj.alignAxis = getParamVal("alignAxis");
|
|
|
emitterObj.alignLockAxis = getParamVal("alignLockAxis");
|
|
|
- // ANIMATION
|
|
|
+ // ANIMATION
|
|
|
emitterObj.frameCount = getParamVal("frameCount");
|
|
|
emitterObj.frameDivisionX = getParamVal("frameDivisionX");
|
|
|
emitterObj.frameDivisionY = getParamVal("frameDivisionY");
|
|
|
emitterObj.animationRepeat = getParamVal("animationRepeat");
|
|
|
emitterObj.animationLoop = getParamVal("animationLoop");
|
|
|
- // COLLISION
|
|
|
+ // COLLISION
|
|
|
emitterObj.useCollision = getParamVal("useCollision");
|
|
|
emitterObj.killOnCollision = getParamVal("killOnCollision");
|
|
|
emitterObj.elasticity = getParamVal("elasticity");
|
|
@@ -1310,7 +1310,7 @@ class Emitter extends Object3D {
|
|
|
for( p in params ) {
|
|
|
if( p.groupName == null && groupNames.indexOf("Emitter") == -1 )
|
|
|
groupNames.push("Emitter");
|
|
|
- else if( p.groupName != null && groupNames.indexOf(p.groupName) == -1 )
|
|
|
+ else if( p.groupName != null && groupNames.indexOf(p.groupName) == -1 )
|
|
|
groupNames.push(p.groupName);
|
|
|
}
|
|
|
|