浏览代码

adding extensions to parsedTexture

jackcaron 10 年之前
父节点
当前提交
64ccf63e2c
共有 1 个文件被更改,包括 12 次插入11 次删除
  1. 12 11
      src/Loading/Plugins/babylon.babylonFileLoader.ts

+ 12 - 11
src/Loading/Plugins/babylon.babylonFileLoader.ts

@@ -19,25 +19,26 @@
     }
 
     var loadCubeTexture = (rootUrl, parsedTexture, scene) => {
-        var texture = new BABYLON.CubeTexture(rootUrl + parsedTexture.name, scene);
-
-        texture.name = parsedTexture.name;
-        texture.hasAlpha = parsedTexture.hasAlpha;
-        texture.level = parsedTexture.level;
-        texture.coordinatesMode = parsedTexture.coordinatesMode;
-
+        var texture = null;
+        if ((parsedTexture.name || parsedTexture.extensions) && !parsedTexture.isRenderTarget) {
+            texture = new BABYLON.CubeTexture(rootUrl + parsedTexture.name, scene, parsedTexture.extensions);
+            texture.name = parsedTexture.name;
+            texture.hasAlpha = parsedTexture.hasAlpha;
+            texture.level = parsedTexture.level;
+            texture.coordinatesMode = parsedTexture.coordinatesMode;
+        }
         return texture;
     };
 
     var loadTexture = (rootUrl, parsedTexture, scene) => {
-        if (!parsedTexture.name && !parsedTexture.isRenderTarget) {
-            return null;
-        }
-
         if (parsedTexture.isCube) {
             return loadCubeTexture(rootUrl, parsedTexture, scene);
         }
 
+        if (!parsedTexture.name && !parsedTexture.isRenderTarget) {
+            return null;
+        }
+
         var texture;
 
         if (parsedTexture.mirrorPlane) {