Browse Source

Fix Emitter Type parsing

sebastien 7 years ago
parent
commit
012a9a4d40

File diff suppressed because it is too large
+ 0 - 41968
Playground/babylon.d.txt


File diff suppressed because it is too large
+ 10875 - 10875
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/babylon.js


+ 4 - 4
dist/preview release/babylon.max.js

@@ -56647,10 +56647,10 @@ var BABYLON;
          * @param serializationObject defines the JSON object
          */
         BoxParticleEmitter.prototype.parse = function (serializationObject) {
-            this.direction1.copyFrom(serializationObject.direction1);
-            this.direction2.copyFrom(serializationObject.direction2);
-            this.minEmitBox.copyFrom(serializationObject.minEmitBox);
-            this.maxEmitBox.copyFrom(serializationObject.maxEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction1, 0, this.direction1);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction2, 0, this.direction2);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.minEmitBox, 0, this.minEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.maxEmitBox, 0, this.maxEmitBox);
         };
         return BoxParticleEmitter;
     }());

+ 4 - 4
dist/preview release/babylon.no-module.max.js

@@ -56614,10 +56614,10 @@ var BABYLON;
          * @param serializationObject defines the JSON object
          */
         BoxParticleEmitter.prototype.parse = function (serializationObject) {
-            this.direction1.copyFrom(serializationObject.direction1);
-            this.direction2.copyFrom(serializationObject.direction2);
-            this.minEmitBox.copyFrom(serializationObject.minEmitBox);
-            this.maxEmitBox.copyFrom(serializationObject.maxEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction1, 0, this.direction1);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction2, 0, this.direction2);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.minEmitBox, 0, this.minEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.maxEmitBox, 0, this.maxEmitBox);
         };
         return BoxParticleEmitter;
     }());

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/babylon.worker.js


+ 4 - 4
dist/preview release/es6.js

@@ -56614,10 +56614,10 @@ var BABYLON;
          * @param serializationObject defines the JSON object
          */
         BoxParticleEmitter.prototype.parse = function (serializationObject) {
-            this.direction1.copyFrom(serializationObject.direction1);
-            this.direction2.copyFrom(serializationObject.direction2);
-            this.minEmitBox.copyFrom(serializationObject.minEmitBox);
-            this.maxEmitBox.copyFrom(serializationObject.maxEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction1, 0, this.direction1);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction2, 0, this.direction2);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.minEmitBox, 0, this.minEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.maxEmitBox, 0, this.maxEmitBox);
         };
         return BoxParticleEmitter;
     }());

File diff suppressed because it is too large
+ 5 - 5
dist/preview release/viewer/babylon.viewer.js


+ 4 - 4
dist/preview release/viewer/babylon.viewer.max.js

@@ -56735,10 +56735,10 @@ var BABYLON;
          * @param serializationObject defines the JSON object
          */
         BoxParticleEmitter.prototype.parse = function (serializationObject) {
-            this.direction1.copyFrom(serializationObject.direction1);
-            this.direction2.copyFrom(serializationObject.direction2);
-            this.minEmitBox.copyFrom(serializationObject.minEmitBox);
-            this.maxEmitBox.copyFrom(serializationObject.maxEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction1, 0, this.direction1);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.direction2, 0, this.direction2);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.minEmitBox, 0, this.minEmitBox);
+            BABYLON.Vector3.FromArrayToRef(serializationObject.maxEmitBox, 0, this.maxEmitBox);
         };
         return BoxParticleEmitter;
     }());

+ 4 - 4
src/Particles/EmitterTypes/babylon.boxParticleEmitter.ts

@@ -119,10 +119,10 @@ module BABYLON {
          * @param serializationObject defines the JSON object
          */
         public parse(serializationObject: any): void {
-            this.direction1.copyFrom(serializationObject.direction1);
-            this.direction2.copyFrom(serializationObject.direction2);
-            this.minEmitBox.copyFrom(serializationObject.minEmitBox);
-            this.maxEmitBox.copyFrom(serializationObject.maxEmitBox);
+            Vector3.FromArrayToRef(serializationObject.direction1, 0, this.direction1);
+            Vector3.FromArrayToRef(serializationObject.direction2, 0, this.direction2);
+            Vector3.FromArrayToRef(serializationObject.minEmitBox, 0, this.minEmitBox);
+            Vector3.FromArrayToRef(serializationObject.maxEmitBox, 0, this.maxEmitBox);
         }
     }
 }