Merge pull request #2223 from bghgary/glTFFileLoader

Add flag to enable/disable glTF loader extensions and bug fixes

loaders/src/glTF/2.0/babylon.glTFLoader.ts

@@ -489,8 +489,6 @@ module BABYLON.GLTF2 {
         var indexStarts = [];
         var indexCounts = [];
 
-        var morphTargetManager: MorphTargetManager;
-
         // Positions, normals and UVs
         for (var primitiveIndex = 0; primitiveIndex < mesh.primitives.length; primitiveIndex++) {
             // Temporary vertex data
@@ -546,7 +544,6 @@ module BABYLON.GLTF2 {
             if (accessor) {
                 buffer = GLTFUtils.GetBufferFromAccessor(runtime, accessor);
                 tempVertexData.indices = <Uint32Array>buffer;
-                indexCounts.push(tempVertexData.indices.length);
             }
             else {
                 // Set indices on the fly
@@ -554,9 +551,8 @@ module BABYLON.GLTF2 {
                 for (var index = 0; index < tempVertexData.indices.length; index++) {
                     tempVertexData.indices[index] = index;
                 }
-
-                indexCounts.push(tempVertexData.indices.length);
             }
+            indexCounts.push(tempVertexData.indices.length);
 
             vertexData.merge(tempVertexData);
             tempVertexData = undefined;
@@ -623,12 +619,11 @@ module BABYLON.GLTF2 {
                     }
 
                     if (morph.getPositions()) {
-                        if (!morphTargetManager) {
-                            morphTargetManager = new MorphTargetManager();
-                            babylonMesh.morphTargetManager = morphTargetManager;
+                        if (!babylonMesh.morphTargetManager) {
+                            babylonMesh.morphTargetManager = new MorphTargetManager();
                         }
 
-                        morphTargetManager.addTarget(morph);
+                        babylonMesh.morphTargetManager.addTarget(morph);
                     }
                     else {
                         Tools.Warn("Not adding morph target '" + morph.name + "' because it has no position data");
@@ -917,7 +912,34 @@ module BABYLON.GLTF2 {
             return material;
         }
 
-        public static LoadMetallicRoughnessMaterialPropertiesAsync(runtime: IGLTFRuntime, material: IGLTFMaterial, onSuccess: () => void, onError: () => void): void {
+        public static LoadCoreMaterialAsync(runtime: IGLTFRuntime, index: number, onSuccess: () => void, onError: () => void): void {
+            var material = GLTFLoader.LoadMaterial(runtime, index);
+            if (!material) {
+                onSuccess();
+                return;
+            }
+
+            var metallicRoughnessPropertiesSuccess = false;
+            var commonPropertiesSuccess = false;
+
+            var checkSuccess = () => {
+                if (metallicRoughnessPropertiesSuccess && commonPropertiesSuccess) {
+                    onSuccess();
+                }
+            }
+
+            GLTFLoader._loadMetallicRoughnessMaterialPropertiesAsync(runtime, material, () => {
+                metallicRoughnessPropertiesSuccess = true;
+                checkSuccess();
+            }, onError);
+
+            GLTFLoader.LoadCommonMaterialPropertiesAsync(runtime, material, () => {
+                commonPropertiesSuccess = true;
+                checkSuccess();
+            }, onError);
+        }
+
+        private static _loadMetallicRoughnessMaterialPropertiesAsync(runtime: IGLTFRuntime, material: IGLTFMaterial, onSuccess: () => void, onError: () => void): void {
             // Ensure metallic workflow
             material.babylonMaterial.metallic = 1;
             material.babylonMaterial.roughness = 1;
@@ -933,8 +955,8 @@ module BABYLON.GLTF2 {
             //
 
             material.babylonMaterial.albedoColor = properties.baseColorFactor ? Color3.FromArray(properties.baseColorFactor) : new Color3(1, 1, 1);
-            material.babylonMaterial.metallic = properties.metallicFactor || 1;
-            material.babylonMaterial.roughness = properties.roughnessFactor || 1;
+            material.babylonMaterial.metallic = properties.metallicFactor === undefined ? 1 : properties.metallicFactor;
+            material.babylonMaterial.roughness = properties.roughnessFactor === undefined ? 1 : properties.roughnessFactor;
 
             //
             // Load Textures
@@ -1190,17 +1212,12 @@ module BABYLON.GLTF2 {
                 }
             }
 
-            // Load buffers, materials, etc.
             GLTFLoader._loadBuffersAsync(runtime, () => {
                 GLTFLoader._loadMaterialsAsync(runtime, () => {
                     postLoad(runtime);
                     onSuccess(meshes, null, skeletons);
                 }, onError);
             }, onError);
-
-            if (BABYLON.GLTFFileLoader.IncrementalLoading && onSuccess) {
-                onSuccess(meshes, null, skeletons);
-            }
         }
 
         /**

loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts

@@ -4,6 +4,8 @@ module BABYLON.GLTF2 {
     export abstract class GLTFLoaderExtension {
         private _name: string;
 
+        public enabled: boolean = true;
+
         public constructor(name: string) {
             this._name = name;
         }
@@ -24,42 +26,23 @@ module BABYLON.GLTF2 {
         public static PostCreateRuntime(runtime: IGLTFRuntime): void {
             for (var extensionName in GLTFLoader.Extensions) {
                 var extension = GLTFLoader.Extensions[extensionName];
-                extension.postCreateRuntime(runtime);
+                if (extension.enabled) {
+                    extension.postCreateRuntime(runtime);
+                }
             }
         }
 
         public static LoadMaterialAsync(runtime: IGLTFRuntime, index: number, onSuccess: () => void, onError: () => void): void {
             for (var extensionName in GLTFLoader.Extensions) {
                 var extension = GLTFLoader.Extensions[extensionName];
-                if (extension.loadMaterialAsync(runtime, index, onSuccess, onError)) {
-                    return;
+                if (extension.enabled) {
+                    if (extension.loadMaterialAsync(runtime, index, onSuccess, onError)) {
+                        return;
+                    }
                 }
             }
 
-            var material = GLTFLoader.LoadMaterial(runtime, index);
-            if (!material) {
-                onSuccess();
-                return;
-            }
-
-            var metallicRoughnessPropertiesSuccess = false;
-            var commonPropertiesSuccess = false;
-
-            var checkSuccess = () => {
-                if (metallicRoughnessPropertiesSuccess && commonPropertiesSuccess) {
-                    onSuccess();
-                }
-            }
-
-            GLTFLoader.LoadMetallicRoughnessMaterialPropertiesAsync(runtime, material, () => {
-                metallicRoughnessPropertiesSuccess = true;
-                checkSuccess();
-            }, onError);
-
-            GLTFLoader.LoadCommonMaterialPropertiesAsync(runtime, material, () => {
-                commonPropertiesSuccess = true;
-                checkSuccess();
-            }, onError);
+            GLTFLoader.LoadCoreMaterialAsync(runtime, index, onSuccess, onError);
         }
     }
 }