Browse Source

Added check of mime types

Popov72 5 years ago
parent
commit
7849572184
1 changed files with 7 additions and 3 deletions
  1. 7 3
      loaders/src/glTF/glTFFileLoader.ts

+ 7 - 3
loaders/src/glTF/glTFFileLoader.ts

@@ -637,13 +637,17 @@ export class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAsync, ISc
 
 
     /** @hidden */
     /** @hidden */
     public canDirectLoad(data: string): boolean {
     public canDirectLoad(data: string): boolean {
-        return (data.indexOf("asset") !== -1 && data.indexOf("version") !== -1) ||
-                StringTools.StartsWith(data, "data:base64," + GLTFFileLoader.magicBase64Encoded);
+        return (data.indexOf("asset") !== -1 && data.indexOf("version") !== -1)
+                || StringTools.StartsWith(data, "data:base64," + GLTFFileLoader.magicBase64Encoded)
+                || StringTools.StartsWith(data, "data:application/octet-stream;base64," + GLTFFileLoader.magicBase64Encoded)
+                || StringTools.StartsWith(data, "data:model/gltf-binary;base64," + GLTFFileLoader.magicBase64Encoded);
     }
     }
 
 
     /** @hidden */
     /** @hidden */
     public directLoad(scene: Scene, data: string): Promise<any> {
     public directLoad(scene: Scene, data: string): Promise<any> {
-        if (StringTools.StartsWith(data, "base64," + GLTFFileLoader.magicBase64Encoded)) {
+        if (StringTools.StartsWith(data, "base64," + GLTFFileLoader.magicBase64Encoded) ||
+            StringTools.StartsWith(data, "application/octet-stream;base64," + GLTFFileLoader.magicBase64Encoded) ||
+            StringTools.StartsWith(data, "model/gltf-binary;base64," + GLTFFileLoader.magicBase64Encoded)) {
             const arrayBuffer = Tools.DecodeBase64(data);
             const arrayBuffer = Tools.DecodeBase64(data);
 
 
             this._validate(scene, arrayBuffer);
             this._validate(scene, arrayBuffer);