From 97b40428ca8db492e4a984358174c73c33b7784d Mon Sep 17 00:00:00 2001
From: Josh Faust <josh@torch3d.com>
Date: Mon, 12 Feb 2018 15:27:10 -0800
Subject: [PATCH] Fix ConvexPolyheron AABB calculation if a vertex component is
 always decreasing

---
 src/shapes/ConvexPolyhedron.js | 12 +++++++++---
 test/ConvexPolyhedron.js       | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/shapes/ConvexPolyhedron.js b/src/shapes/ConvexPolyhedron.js
index 841727350..282a251aa 100644
--- a/src/shapes/ConvexPolyhedron.js
+++ b/src/shapes/ConvexPolyhedron.js
@@ -741,19 +741,25 @@ ConvexPolyhedron.prototype.calculateWorldAABB = function(pos,quat,min,max){
         var v = tempWorldVertex;
         if     (v.x < minx || minx===undefined){
             minx = v.x;
-        } else if(v.x > maxx || maxx===undefined){
+        } 
+        
+        if(v.x > maxx || maxx===undefined){
             maxx = v.x;
         }
 
         if     (v.y < miny || miny===undefined){
             miny = v.y;
-        } else if(v.y > maxy || maxy===undefined){
+        } 
+        
+        if(v.y > maxy || maxy===undefined){
             maxy = v.y;
         }
 
         if     (v.z < minz || minz===undefined){
             minz = v.z;
-        } else if(v.z > maxz || maxz===undefined){
+        }  
+        
+        if(v.z > maxz || maxz===undefined){
             maxz = v.z;
         }
     }
diff --git a/test/ConvexPolyhedron.js b/test/ConvexPolyhedron.js
index fd79be8d2..ea7a2635f 100644
--- a/test/ConvexPolyhedron.js
+++ b/test/ConvexPolyhedron.js
@@ -26,6 +26,41 @@ module.exports = {
         test.done();
     },
 
+    calculateWorldAABBAlwaysDecreasingVertsNoUndefined: function(test) {
+        var vertices = [
+            new Vec3( 4, 4, 4),
+            new Vec3( 3, 3, 3),
+            new Vec3( 2, 2, 2),
+            new Vec3( 1, 1, 1),
+            new Vec3( 0, 0, 0),
+            new Vec3(-1,-1,-1),
+            new Vec3(-2,-2,-2),
+            new Vec3(-3,-3,-3)
+        ];
+    
+        var indices = [
+            [3,2,1,0],
+            [4,5,6,7],
+            [5,4,0,1],
+            [2,3,7,6],
+            [0,4,7,3],
+            [1,2,6,5],
+        ];
+
+        var poly = new ConvexPolyhedron(vertices, indices);
+        var min = new Vec3();
+        var max = new Vec3();
+        poly.calculateWorldAABB(new Vec3(0, 0, 0), new Quaternion(0, 0, 0, 1), min, max); 
+
+        test.notEqual(min.x, undefined);
+        test.notEqual(max.x, undefined);
+        test.notEqual(min.y, undefined);
+        test.notEqual(max.y, undefined);
+        test.notEqual(min.z, undefined);
+        test.notEqual(max.z, undefined);
+        test.done();
+    },
+
     clipFaceAgainstPlane : function(test){
         var h = createBoxHull();