Explorar o código

Merge pull request #2242 from HowardWolosky/gltfDirectLoad

Add canDirectLoad to glTFLoader
David Catuhe %!s(int64=8) %!d(string=hai) anos
pai
achega
bbcca9ed9e

+ 4 - 0
loaders/src/glTF/babylon.glTFFileLoader.ts

@@ -45,6 +45,10 @@ module BABYLON {
             return loader.loadAsync(scene, loaderData, rootUrl, onSuccess, onError);
         }
 
+        public canDirectLoad(data: string): boolean {
+            return ((data.indexOf("scene") !== -1) && (data.indexOf("node") !== -1));
+        }
+
         private static _parse(data: string | ArrayBuffer): IGLTFLoaderData {
             if (data instanceof ArrayBuffer) {
                 return GLTFFileLoader._parseBinary(data);

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

@@ -168,7 +168,7 @@
             var manifestChecked = success => {
                 scene.database = database;
 
-                var registeredPlugin = directLoad ? SceneLoader._getPluginForDirectLoad(sceneFilename) : SceneLoader._getPluginForFilename(sceneFilename);
+                var registeredPlugin = directLoad ? SceneLoader._getPluginForDirectLoad(directLoad) : SceneLoader._getPluginForFilename(sceneFilename);
                 var plugin = registeredPlugin.plugin;
                 var useArrayBuffer = registeredPlugin.isBinary;