Fix particle.isLocal

package.json

@@ -107,4 +107,4 @@
         "xhr2": "^0.1.4",
         "xmlbuilder": "8.2.2"
     }
-}
+}

src/Particles/particle.ts

@@ -243,6 +243,13 @@ export class Particle {
             other._initialDirection = null;
         }
         other.direction.copyFrom(this.direction);
+        if (this._localPosition) {   
+            if (other._localPosition) {         
+                other._localPosition.copyFrom(this._localPosition);
+            } else {
+                other._localPosition = this._localPosition.clone();
+            }
+        }
         other.color.copyFrom(this.color);
         other.colorStep.copyFrom(this.colorStep);
         other.lifeTime = this.lifeTime;

src/Particles/particleSystem.ts

@@ -67,12 +67,12 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
      * This function can be defined to specify initial direction for every new particle.
      * It by default use the emitterType defined function
      */
-    public startDirectionFunction: (worldMatrix: Matrix, directionToUpdate: Vector3, particle: Particle) => void;
+    public startDirectionFunction: (worldMatrix: Matrix, directionToUpdate: Vector3, particle: Particle, isLocal: boolean) => void;
     /**
      * This function can be defined to specify initial position for every new particle.
      * It by default use the emitterType defined function
      */
-    public startPositionFunction: (worldMatrix: Matrix, positionToUpdate: Vector3, particle: Particle) => void;
+    public startPositionFunction: (worldMatrix: Matrix, positionToUpdate: Vector3, particle: Particle, isLocal: boolean) => void;
 
     /**
      * @hidden
@@ -1288,9 +1288,14 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
         // Update current
         this._alive = this._particles.length > 0;
 
+        let worldMatrix: Nullable<Matrix> = null;
+
         if ((<AbstractMesh>this.emitter).position) {
             var emitterMesh = (<AbstractMesh>this.emitter);
             this._emitterWorldMatrix = emitterMesh.getWorldMatrix();
+            if (this.isLocal) {
+                worldMatrix = this._emitterWorldMatrix;
+            }
         } else {
             var emitterPosition = (<Vector3>this.emitter);
             this._emitterWorldMatrix = Matrix.Translation(emitterPosition.x, emitterPosition.y, emitterPosition.z);
@@ -1298,12 +1303,6 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
         this.updateFunction(this._particles);
 
-        let worldMatrix: Nullable<Matrix> = null;
-
-        if (this.isLocal && this.emitter && (this.emitter as AbstractMesh).getWorldMatrix) {
-            worldMatrix = (this.emitter as AbstractMesh).getWorldMatrix();
-        }
-
         // Add new ones
         var particle: Particle;
         for (var index = 0; index < newParticles; index++) {
@@ -1334,7 +1333,7 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
             let emitPower = Scalar.RandomRange(this.minEmitPower, this.maxEmitPower);
 
             if (this.startPositionFunction) {
-                this.startPositionFunction(this._emitterWorldMatrix, particle.position, particle);
+                this.startPositionFunction(this._emitterWorldMatrix, particle.position, particle, this.isLocal);
             }
             else {
                 this.particleEmitterType.startPositionFunction(this._emitterWorldMatrix, particle.position, particle, this.isLocal);
@@ -1350,7 +1349,7 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
             }
 
             if (this.startDirectionFunction) {
-                this.startDirectionFunction(this._emitterWorldMatrix, particle.direction, particle);
+                this.startDirectionFunction(this._emitterWorldMatrix, particle.direction, particle, this.isLocal);
             }
             else {
                 this.particleEmitterType.startDirectionFunction(this._emitterWorldMatrix, particle.direction, particle, this.isLocal);