Prechádzať zdrojové kódy

Fixing instances loading from Blender

David Catuhe 11 rokov pred
rodič
commit
32cfe695de

+ 1 - 1
Babylon/Cameras/babylon.camera.js

@@ -272,7 +272,7 @@ var BABYLON;
             var engine = this.getEngine();
             if (this.mode === BABYLON.Camera.PERSPECTIVE_CAMERA) {
                 if (this.minZ <= 0) {
-                    this.minZ = BABYLON.Engine.Epsilon;
+                    this.minZ = 0.1;
                 }
 
                 BABYLON.Matrix.PerspectiveFovLHToRef(this.fov, engine.getAspectRatio(this), this.minZ, this.maxZ, this._projectionMatrix);

+ 1 - 1
Babylon/Cameras/babylon.camera.ts

@@ -288,7 +288,7 @@
             var engine = this.getEngine();
             if (this.mode === BABYLON.Camera.PERSPECTIVE_CAMERA) {
                 if (this.minZ <= 0) {
-                    this.minZ = Engine.Epsilon;
+                    this.minZ = 0.1;
                 }
 
                 BABYLON.Matrix.PerspectiveFovLHToRef(this.fov, engine.getAspectRatio(this), this.minZ, this.maxZ, this._projectionMatrix);

+ 10 - 0
Babylon/Loading/Plugins/babylon.babylonFileLoader.js

@@ -646,6 +646,16 @@ var BABYLON = BABYLON || {};
                 }
 
                 instance.scaling = BABYLON.Vector3.FromArray(parsedInstance.scaling);
+
+                instance.checkCollisions = mesh.checkCollisions;
+
+                if (parsedMesh.animations) {
+                    for (animationIndex = 0; animationIndex < parsedMesh.animations.length; animationIndex++) {
+                        parsedAnimation = parsedMesh.animations[animationIndex];
+
+                        instance.animations.push(parseAnimation(parsedAnimation));
+                    }
+                }
             }
         }
 

+ 2 - 2
Babylon/Particles/babylon.particleSystem.js

@@ -151,11 +151,11 @@
                     if (particle.color.a < 0)
                         particle.color.a = 0;
 
+                    particle.angle += particle.angularSpeed * this._scaledUpdateSpeed;
+
                     particle.direction.scaleToRef(this._scaledUpdateSpeed, this._scaledDirection);
                     particle.position.addInPlace(this._scaledDirection);
 
-                    particle.angle += particle.angularSpeed * this._scaledUpdateSpeed;
-
                     this.gravity.scaleToRef(this._scaledUpdateSpeed, this._scaledGravity);
                     particle.direction.addInPlace(this._scaledGravity);
                 }

+ 2 - 2
Babylon/Particles/babylon.particleSystem.ts

@@ -182,11 +182,11 @@
                     if (particle.color.a < 0)
                         particle.color.a = 0;
 
+                    particle.angle += particle.angularSpeed * this._scaledUpdateSpeed;
+
                     particle.direction.scaleToRef(this._scaledUpdateSpeed, this._scaledDirection);
                     particle.position.addInPlace(this._scaledDirection);
 
-                    particle.angle += particle.angularSpeed * this._scaledUpdateSpeed;
-
                     this.gravity.scaleToRef(this._scaledUpdateSpeed, this._scaledGravity);
                     particle.direction.addInPlace(this._scaledGravity);
                 }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 7 - 7
babylon.1.12-beta.js