Prechádzať zdrojové kódy

Fixing light exclusion mechanism

David Catuhe 11 rokov pred
rodič
commit
c626aab4ed

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

@@ -18,8 +18,8 @@ var BABYLON;
             this.orthoBottom = null;
             this.orthoTop = null;
             this.fov = 0.8;
-            this.minZ = 0.1;
-            this.maxZ = 1000.0;
+            this.minZ = 1.0;
+            this.maxZ = 10000.0;
             this.inertia = 0.9;
             this.mode = Camera.PERSPECTIVE_CAMERA;
             this.isIntermediate = false;

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

@@ -11,8 +11,8 @@
         public orthoBottom = null;
         public orthoTop = null;
         public fov = 0.8;
-        public minZ = 0.1;
-        public maxZ = 1000.0;
+        public minZ = 1.0;
+        public maxZ = 10000.0;
         public inertia = 0.9;
         public mode = Camera.PERSPECTIVE_CAMERA;
         public isIntermediate = false;

+ 1 - 1
Babylon/Lights/babylon.light.js

@@ -41,7 +41,7 @@ var BABYLON;
                 return false;
             }
 
-            if (this.includedOnlyMeshes.length > 0 && this.excludedMeshes.indexOf(mesh) !== -1) {
+            if (this.excludedMeshes.length > 0 && this.excludedMeshes.indexOf(mesh) !== -1) {
                 return false;
             }
 

+ 1 - 1
Babylon/Lights/babylon.light.ts

@@ -38,7 +38,7 @@
                 return false;
             }
 
-            if (this.includedOnlyMeshes.length > 0 && this.excludedMeshes.indexOf(mesh) !== -1) {
+            if (this.excludedMeshes.length > 0 && this.excludedMeshes.indexOf(mesh) !== -1) {
                 return false;
             }
 

+ 5 - 6
Babylon/babylon.engine.js

@@ -1676,15 +1676,14 @@
 
             var deg = 360;
 
-            imgBack.addEventListener("transitionend", function () {
+            var onTransitionEnd = function () {
                 deg += 360;
                 imgBack.style.transform = "rotateZ(" + deg + "deg)";
-            });
-
-            imgBack.addEventListener("webkitTransitionEnd", function () {
-                deg += 360;
                 imgBack.style.webkitTransform = "rotateZ(" + deg + "deg)";
-            });
+            };
+
+            imgBack.addEventListener("transitionend", onTransitionEnd);
+            imgBack.addEventListener("webkitTransitionEnd", onTransitionEnd);
 
             this._loadingDiv.appendChild(imgBack);
 

+ 5 - 7
Babylon/babylon.engine.ts

@@ -1684,16 +1684,14 @@
 
             var deg = 360;
 
-            imgBack.addEventListener("transitionend", () => {
-                deg += 360;
-                imgBack.style.transform = "rotateZ(" + deg + "deg)";
-            });
-
-            imgBack.addEventListener("webkitTransitionEnd", () => {
+            var onTransitionEnd = () => {
                 deg += 360;
+                imgBack.style.transform = "rotateZ(" + deg + "deg)"; 
                 imgBack.style.webkitTransform = "rotateZ(" + deg + "deg)";
-            });
+            }
 
+            imgBack.addEventListener("transitionend", onTransitionEnd);
+            imgBack.addEventListener("webkitTransitionEnd", onTransitionEnd);
 
             this._loadingDiv.appendChild(imgBack);
 

+ 8 - 9
babylon.1.14-beta-debug.js

@@ -4468,15 +4468,14 @@ var BABYLON;
 
             var deg = 360;
 
-            imgBack.addEventListener("transitionend", function () {
+            var onTransitionEnd = function () {
                 deg += 360;
                 imgBack.style.transform = "rotateZ(" + deg + "deg)";
-            });
-
-            imgBack.addEventListener("webkitTransitionEnd", function () {
-                deg += 360;
                 imgBack.style.webkitTransform = "rotateZ(" + deg + "deg)";
-            });
+            };
+
+            imgBack.addEventListener("transitionend", onTransitionEnd);
+            imgBack.addEventListener("webkitTransitionEnd", onTransitionEnd);
 
             this._loadingDiv.appendChild(imgBack);
 
@@ -5127,7 +5126,7 @@ var BABYLON;
                 return false;
             }
 
-            if (this.includedOnlyMeshes.length > 0 && this.excludedMeshes.indexOf(mesh) !== -1) {
+            if (this.excludedMeshes.length > 0 && this.excludedMeshes.indexOf(mesh) !== -1) {
                 return false;
             }
 
@@ -6000,8 +5999,8 @@ var BABYLON;
             this.orthoBottom = null;
             this.orthoTop = null;
             this.fov = 0.8;
-            this.minZ = 0.1;
-            this.maxZ = 1000.0;
+            this.minZ = 1.0;
+            this.maxZ = 10000.0;
             this.inertia = 0.9;
             this.mode = Camera.PERSPECTIVE_CAMERA;
             this.isIntermediate = false;

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