[FIX] GLB assets not loading when part of asset bundles (playcanvas#2055)

vkalpias · web-flow · commit da7b96eae0a1 · 2020-05-05T21:45:49.000+01:00
diff --git a/src/resources/animation.js b/src/resources/animation.js
@@ -26,7 +26,11 @@ Object.assign(pc, function () {
             };
 
             if (url.load.startsWith('blob:')) {
-                options.responseType = pc.Http.ResponseType.JSON;
+                if (pc.path.getExtension(url.original).toLowerCase() === '.glb') {
+                    options.responseType = pc.Http.ResponseType.ARRAY_BUFFER;
+                } else {
+                    options.responseType = pc.Http.ResponseType.JSON;
+                }
             }
 
             pc.http.get(url.load, options, function (err, response) {
@@ -39,7 +43,7 @@ Object.assign(pc, function () {
         },
 
         open: function (url, data) {
-            if (pc.path.getExtension(url) === '.glb') {
+            if (pc.path.getExtension(url).toLowerCase() === '.glb') {
                 var glb = pc.GlbParser.parse("filename.glb", data, null);
                 if (!glb) {
                     return null;
diff --git a/src/resources/model.js b/src/resources/model.js
@@ -46,7 +46,11 @@ Object.assign(pc, function () {
             };
 
             if (url.load.startsWith('blob:')) {
-                options.responseType = pc.Http.ResponseType.JSON;
+                if (pc.path.getExtension(url.original).toLowerCase() === '.glb') {
+                    options.responseType = pc.Http.ResponseType.ARRAY_BUFFER;
+                } else {
+                    options.responseType = pc.Http.ResponseType.JSON;
+                }
             }
 
             pc.http.get(url.load, options, function (err, response) {
