combine bounds correctly (playcanvas#2030)

slimbuck · Donovan Hutchence · web-flow · commit 416b9ca5fe4d · 2020-04-28T16:24:37.000+01:00
Co-authored-by: Donovan Hutchence &lt;dhutchence@snapchat.com&gt;
diff --git a/src/scene/morph.js b/src/scene/morph.js
@@ -95,13 +95,9 @@ Object.assign(pc, function () {
             this.aabb.copy(this._baseAabb);
 
             var numIndices;
-            var i, j, target, index, id;
+            var i, j, target;
             var x, y, z;
 
-            var vertSizeF = this._vertSizeF;
-            var offsetPF = this._offsetPF;
-            var baseData = this._baseData;
-
             for (i = 0; i < this._targets.length; i++) {
                 target = this._targets[i];
 
@@ -112,12 +108,9 @@ Object.assign(pc, function () {
 
                     numIndices = target.indices.length;
                     for (j = 0; j < numIndices; j++) {
-                        index = target.indices[j];
-                        id = index * vertSizeF + offsetPF;
-
-                        x = baseData[id] + target.deltaPositions[j * 3];
-                        y = baseData[id + 1] + target.deltaPositions[j * 3 + 1];
-                        z = baseData[id + 2] + target.deltaPositions[j * 3 + 2];
+                        x = target.deltaPositions[j * 3];
+                        y = target.deltaPositions[j * 3 + 1];
+                        z = target.deltaPositions[j * 3 + 2];
 
                         if (_morphMin.x > x) _morphMin.x = x;
                         if (_morphMin.y > y) _morphMin.y = y;
@@ -129,7 +122,13 @@ Object.assign(pc, function () {
                     }
                     target.aabb.setMinMax(_morphMin, _morphMax);
                 }
-                if (target.aabb) this.aabb.add(target.aabb);
+                if (target.aabb) {
+                    var newMin = new pc.Vec3();
+                    var newMax = new pc.Vec3();
+                    newMin.add2(this.aabb.getMin(), target.aabb.getMin());
+                    newMax.add2(this.aabb.getMax(), target.aabb.getMax());
+                    this.aabb.setMinMax(newMin, newMax);
+                }
             }
             this._aabbDirty = false;
         },
