Browse Source

Update babylon.particleSystem.ts

KK 9 years ago
parent
commit
a6425ee93d
1 changed files with 10 additions and 3 deletions
  1. 10 3
      src/Particles/babylon.particleSystem.ts

+ 10 - 3
src/Particles/babylon.particleSystem.ts

@@ -450,7 +450,11 @@
             var serializationObject: any = {};
 
             serializationObject.name = this.name;
-            serializationObject.emitterId = this.emitter.id;
+            if (this.emittor.position) {
+                serializationObject.emitterId = this.emitter.id;
+            } else {
+                serializationObject.emitter = this.emitter.asArray();;
+            }
             serializationObject.capacity = this.getCapacity();
 
             if (this.particleTexture) {
@@ -489,8 +493,11 @@
                 particleSystem.particleTexture = new Texture(rootUrl + parsedParticleSystem.textureName, scene);
                 particleSystem.particleTexture.name = parsedParticleSystem.textureName;
             }
-            var emitter = scene.getLastMeshByID(parsedParticleSystem.emitterId);
-            particleSystem.emitter = emitter ? emitter : BABYLON.Vector3.Zero();
+            if (parsedParticleSystem.emitterId) {
+                particleSystem.emitter = scene.getLastMeshByID(parsedParticleSystem.emitterId);
+            } else {
+                particleSystem.emitter = Vector3.FromArray(parsedParticleSystem.emitter);
+            }
             particleSystem.minAngularSpeed = parsedParticleSystem.minAngularSpeed;
             particleSystem.maxAngularSpeed = parsedParticleSystem.maxAngularSpeed;
             particleSystem.minSize = parsedParticleSystem.minSize;