Merge branch 'master' of https://github.com/playcanvas/engine

willeastcott · willeastcott · commit 855436be6477 · 2020-05-07T00:28:47.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) {
diff --git a/src/resources/parser/glb-parser.js b/src/resources/parser/glb-parser.js
@@ -254,7 +254,8 @@ Object.assign(pc, function () {
                     vertexDesc.push({
                         semantic: semantic,
                         components: getNumComponents(accessor.type),
-                        type: getComponentType(accessor.componentType)
+                        type: getComponentType(accessor.componentType),
+                        normalize: accessor.normalized
                     });
                     // store the info we'll need to copy this data into the vertex buffer
                     var size = getNumComponents(accessor.type) * getComponentSizeInBytes(accessor.componentType);
@@ -331,7 +332,8 @@ Object.assign(pc, function () {
                 values: values,
                 numComponents: attribute.num_components(),
                 componentSizeInBytes: componentSizeInBytes,
-                storageType: storageType
+                storageType: storageType,
+                normalized: attribute.normalized()
             };
         };
 
@@ -349,7 +351,7 @@ Object.assign(pc, function () {
                     semantic: semantic,
                     components: attributeInfo.numComponents,
                     type: attributeInfo.storageType,
-                    normalize: semanticMap[attrib].normalize
+                    normalize: attributeInfo.normalized
                 });
 
                 // store the info we'll need to copy this data into the vertex buffer
diff --git a/src/scene/particle-system/particle-emitter.js b/src/scene/particle-system/particle-emitter.js
@@ -384,16 +384,19 @@ Object.assign(pc, function () {
             this.prevWorldBoundsSize.copy(this.worldBoundsSize);
             this.prevWorldBoundsCenter.copy(this.worldBounds.center);
 
-            var recalculateLocalBounds = false;
-            if (this.emitterShape === pc.EMITTERSHAPE_BOX) {
-                recalculateLocalBounds = !this.emitterExtents.equals(this.prevEmitterExtents);
-            } else {
-                recalculateLocalBounds = !(this.emitterRadius === this.prevEmitterRadius);
-            }
-            if (recalculateLocalBounds) {
-                this.calculateLocalBounds();
+            if (!this.useCpu) {
+                var recalculateLocalBounds = false;
+                if (this.emitterShape === pc.EMITTERSHAPE_BOX) {
+                    recalculateLocalBounds = !this.emitterExtents.equals(this.prevEmitterExtents);
+                } else {
+                    recalculateLocalBounds = !(this.emitterRadius === this.prevEmitterRadius);
+                }
+                if (recalculateLocalBounds) {
+                    this.calculateLocalBounds();
+                }
             }
 
+
             var nodeWT = this.node.getWorldTransform();
             if (this.localSpace) {
                 this.worldBoundsNoTrail.copy(this.localBounds);
@@ -1088,9 +1091,7 @@ Object.assign(pc, function () {
 
             this.simTimeTotal += delta;
 
-            if (!this.useCpu) {
-                this.calculateWorldBounds();
-            }
+            this.calculateWorldBounds();
 
             if (this._isAnimated()) {
                 var tilesParams = this.animTilesParams;
