Merge pull request #148 from playcanvas/master

m
playcanvas · Dec 9, 2015 · 4d16de6 · 4d16de6
2 parents 3e160f1 + 56042fb
commit 4d16de6
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.178.2-dev
+0.179.0-dev
diff --git a/src/audio/audio_channel.js b/src/audio/audio_channel.js
@@ -66,6 +66,10 @@ pc.extend(pc, function () {
                 this.manager.on('volumechange', this.onManagerVolumeChange, this);
                 this.manager.on('suspend', this.onManagerSuspend, this);
                 this.manager.on('resume', this.onManagerResume, this);
+
+                // suspend immediately if manager is suspended
+                if (this.manager.suspended)
+                    this.onManagerSuspend();
             },
 
             /**
@@ -227,6 +231,10 @@ pc.extend(pc, function () {
                 this.manager.on('suspend', this.onManagerSuspend, this);
                 this.manager.on('resume', this.onManagerResume, this);
 
+                // suspend immediately if manager is suspended
+                if (this.manager.suspended)
+                    this.onManagerSuspend();
+
             },
 
             pause: function () {

diff --git a/src/audio/audio_channel3d.js b/src/audio/audio_channel3d.js
@@ -75,6 +75,11 @@ pc.extend(pc, function () {
                 this.source.connect(this.panner);
                 this.panner.connect(this.gain);
                 this.gain.connect(context.destination);
+
+                if (!this.loop) {
+                    // mark source as paused when it ends
+                    this.source.onended = this.pause.bind(this);
+                }
             }
         });
     } else if (pc.AudioManager.hasAudio()) {

diff --git a/src/framework/components/audiosource/audiosource_component.js b/src/framework/components/audiosource/audiosource_component.js
@@ -223,7 +223,19 @@ pc.extend(pc, function () {
         onSet3d: function (name, oldValue, newValue) {
             if (oldValue !== newValue) {
                 if (this.system.initialized && this.currentSource) {
+                    var paused = false;
+                    var suspended = false;
+                    if (this.channel) {
+                        paused = this.channel.paused;
+                        suspended = this.channel.suspended;
+                    }
+
                     this.play(this.currentSource);
+
+                    if (this.channel) {
+                        this.channel.paused = paused;
+                        this.channel.suspended = suspended;
+                    }
                 }
             }
         },

diff --git a/src/framework/components/script/script_component.js b/src/framework/components/script/script_component.js
@@ -134,8 +134,16 @@ pc.extend(pc, function () {
             var i, len;
             var cached = [];
 
+            var prefix = this.system._prefix || "";
+            var regex = /^http(s)?:\/\//i;
+
             for (i = 0, len = urls.length; i < len; i++) {
-                var type = this.system.app.loader.getFromCache(urls[i]);
+                var url = urls[i];
+                if (! regex.test(url)) {
+                    url = pc.path.join(prefix, url);
+                }
+
+                var type = this.system.app.loader.getFromCache(url, 'script');
 
                 // if we cannot find the script in the cache then return and load
                 // all scripts with the resource loader

diff --git a/src/scene/scene_mesh.js b/src/scene/scene_mesh.js
@@ -141,6 +141,7 @@ pc.extend(pc, function () {
                 if (!this.mesh.boneAabb) {
 
                     this.mesh.boneAabb = [];
+                    this.mesh.boneUsed = [];
                     var elems = this.mesh.vertexBuffer.format.elements;
                     var numVerts = this.mesh.vertexBuffer.numVertices;
                     var vertSize = this.mesh.vertexBuffer.format.size;
@@ -167,6 +168,7 @@ pc.extend(pc, function () {
                     var x, y, z;
                     var boneMin = [];
                     var boneMax = [];
+                    var boneUsed = this.mesh.boneUsed;
 
                     for(i=0; i<numBones; i++) {
                         boneMin[i] = new pc.Vec3(Number.MAX_VALUE, Number.MAX_VALUE, Number.MAX_VALUE);
@@ -192,6 +194,8 @@ pc.extend(pc, function () {
                                 if (bMax.x < x) bMax.x = x;
                                 if (bMax.y < y) bMax.y = y;
                                 if (bMax.z < z) bMax.z = z;
+
+                                boneUsed[index] = true;
                             }
                         }
                     }
@@ -211,15 +215,25 @@ pc.extend(pc, function () {
                         this._boneAabb[i] = new pc.BoundingBox();
                     }
                 }
+
+                var boneUsed = this.mesh.boneUsed;
+
                 // Update per-instance bone AABBs
                 for(i=0; i<this.mesh.boneAabb.length; i++) {
+                    if (!boneUsed[i]) continue;
                     this._boneAabb[i].setFromTransformedAabb(this.mesh.boneAabb[i], this.skinInstance.matrices[i]);
                 }
                 // Update full instance AABB
-                this._aabb.center.copy(this._boneAabb[0].center);
-                this._aabb.halfExtents.copy(this._boneAabb[0].halfExtents);
+                var first = true;
                 for(i=0; i<this.mesh.boneAabb.length; i++) {
-                    this._aabb.add(this._boneAabb[i]);
+                    if (!boneUsed[i]) continue;
+                    if (first) {
+                        this._aabb.center.copy(this._boneAabb[i].center);
+                        this._aabb.halfExtents.copy(this._boneAabb[i].halfExtents);
+                        first = false;
+                    } else {
+                        this._aabb.add(this._boneAabb[i]);
+                    }
                 }
             } else {
                 this._aabb.setFromTransformedAabb(this.mesh.aabb, this.node.worldTransform);