Merge pull request godotengine#38506 from madmiraal/fix-scale-calcula…

…tion Fix scale calculation in VHACD Volume::Voxelize().
Calinou · May 6, 2020 · 50f4f0f · 50f4f0f
2 parents aca9cfa + 75553c4
commit 50f4f0f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/thirdparty/vhacd/0005-fix-scale-calculation.patch b/thirdparty/vhacd/0005-fix-scale-calculation.patch
@@ -0,0 +1,20 @@
+diff --git a/thirdparty/vhacd/inc/vhacdVolume.h b/thirdparty/vhacd/inc/vhacdVolume.h
+index 8c47fa1e2c..c445f20122 100644
+--- a/thirdparty/vhacd/inc/vhacdVolume.h
++++ b/thirdparty/vhacd/inc/vhacdVolume.h
+@@ -316,13 +316,13 @@ void Volume::Voxelize(const T* const points, const uint32_t stridePoints, const
+
+     double d[3] = { m_maxBB[0] - m_minBB[0], m_maxBB[1] - m_minBB[1], m_maxBB[2] - m_minBB[2] };
+     double r;
+-    if (d[0] > d[1] && d[0] > d[2]) {
++    if (d[0] >= d[1] && d[0] >= d[2]) {
+         r = d[0];
+         m_dim[0] = dim;
+         m_dim[1] = 2 + static_cast<size_t>(dim * d[1] / d[0]);
+         m_dim[2] = 2 + static_cast<size_t>(dim * d[2] / d[0]);
+     }
+-    else if (d[1] > d[0] && d[1] > d[2]) {
++    else if (d[1] >= d[0] && d[1] >= d[2]) {
+         r = d[1];
+         m_dim[1] = dim;
+         m_dim[0] = 2 + static_cast<size_t>(dim * d[0] / d[1]);
diff --git a/thirdparty/vhacd/inc/vhacdVolume.h b/thirdparty/vhacd/inc/vhacdVolume.h
@@ -316,13 +316,13 @@ void Volume::Voxelize(const T* const points, const uint32_t stridePoints, const
 
     double d[3] = { m_maxBB[0] - m_minBB[0], m_maxBB[1] - m_minBB[1], m_maxBB[2] - m_minBB[2] };
     double r;
-    if (d[0] > d[1] && d[0] > d[2]) {
+    if (d[0] >= d[1] && d[0] >= d[2]) {
         r = d[0];
         m_dim[0] = dim;
         m_dim[1] = 2 + static_cast<size_t>(dim * d[1] / d[0]);
         m_dim[2] = 2 + static_cast<size_t>(dim * d[2] / d[0]);
     }
-    else if (d[1] > d[0] && d[1] > d[2]) {
+    else if (d[1] >= d[0] && d[1] >= d[2]) {
         r = d[1];
         m_dim[1] = dim;
         m_dim[0] = 2 + static_cast<size_t>(dim * d[0] / d[1]);