David Catuhe 9 年之前
父节点
当前提交
16a548edb5

文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.core.js


文件差异内容过多而无法显示
+ 3441 - 3441
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 7 - 7
dist/preview release/babylon.js


+ 5 - 2
dist/preview release/babylon.max.js

@@ -26428,6 +26428,9 @@ var BABYLON;
             return SceneLoader._getDefaultPlugin();
         };
         SceneLoader._getPluginForFilename = function (sceneFilename) {
+            if (sceneFilename.name) {
+                sceneFilename = sceneFilename.name;
+            }
             var dotPosition = sceneFilename.lastIndexOf(".");
             var queryStringPosition = sceneFilename.indexOf("?");
             if (queryStringPosition === -1) {
@@ -55227,10 +55230,10 @@ var BABYLON;
                 return false;
             }
             var emitterPosition = this.getEmitterPosition();
-            var direction = emitterPosition.subtract(this._scene.activeCamera.position);
+            var direction = emitterPosition.subtract(this._scene.activeCamera.globalPosition);
             var distance = direction.length();
             direction.normalize();
-            var ray = new BABYLON.Ray(this._scene.activeCamera.position, direction);
+            var ray = new BABYLON.Ray(this._scene.activeCamera.globalPosition, direction);
             var pickInfo = this._scene.pickWithRay(ray, this.meshesSelectionPredicate, true);
             return !pickInfo.hit || pickInfo.distance > distance;
         };

文件差异内容过多而无法显示
+ 7 - 7
dist/preview release/babylon.noworker.js


+ 2 - 2
src/LensFlare/babylon.lensFlareSystem.js

@@ -86,10 +86,10 @@ var BABYLON;
                 return false;
             }
             var emitterPosition = this.getEmitterPosition();
-            var direction = emitterPosition.subtract(this._scene.activeCamera.position);
+            var direction = emitterPosition.subtract(this._scene.activeCamera.globalPosition);
             var distance = direction.length();
             direction.normalize();
-            var ray = new BABYLON.Ray(this._scene.activeCamera.position, direction);
+            var ray = new BABYLON.Ray(this._scene.activeCamera.globalPosition, direction);
             var pickInfo = this._scene.pickWithRay(ray, this.meshesSelectionPredicate, true);
             return !pickInfo.hit || pickInfo.distance > distance;
         };

+ 3 - 0
src/Loading/babylon.sceneLoader.js

@@ -72,6 +72,9 @@ var BABYLON;
             return SceneLoader._getDefaultPlugin();
         };
         SceneLoader._getPluginForFilename = function (sceneFilename) {
+            if (sceneFilename.name) {
+                sceneFilename = sceneFilename.name;
+            }
             var dotPosition = sceneFilename.lastIndexOf(".");
             var queryStringPosition = sceneFilename.indexOf("?");
             if (queryStringPosition === -1) {

+ 5 - 1
src/Loading/babylon.sceneLoader.ts

@@ -85,7 +85,11 @@
             return SceneLoader._getDefaultPlugin();
         }
 
-        private static _getPluginForFilename(sceneFilename: string): IRegisteredPlugin {
+        private static _getPluginForFilename(sceneFilename: any): IRegisteredPlugin {
+            if (sceneFilename.name) {
+                sceneFilename = sceneFilename.name;
+            }
+
             var dotPosition = sceneFilename.lastIndexOf(".");
 
             var queryStringPosition = sceneFilename.indexOf("?");