Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
75553c4f
Commit
75553c4f
authored
May 06, 2020
by
Marcel Admiraal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix scale calculation in VHACD Volume::Voxelize().
parent
aca9cfa7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
0005-fix-scale-calculation.patch
thirdparty/vhacd/0005-fix-scale-calculation.patch
+20
-0
vhacdVolume.h
thirdparty/vhacd/inc/vhacdVolume.h
+2
-2
No files found.
thirdparty/vhacd/0005-fix-scale-calculation.patch
0 → 100644
View file @
75553c4f
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]);
thirdparty/vhacd/inc/vhacdVolume.h
View file @
75553c4f
...
@@ -316,13 +316,13 @@ void Volume::Voxelize(const T* const points, const uint32_t stridePoints, const
...
@@ -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
d
[
3
]
=
{
m_maxBB
[
0
]
-
m_minBB
[
0
],
m_maxBB
[
1
]
-
m_minBB
[
1
],
m_maxBB
[
2
]
-
m_minBB
[
2
]
};
double
r
;
double
r
;
if
(
d
[
0
]
>
d
[
1
]
&&
d
[
0
]
>
d
[
2
])
{
if
(
d
[
0
]
>
=
d
[
1
]
&&
d
[
0
]
>=
d
[
2
])
{
r
=
d
[
0
];
r
=
d
[
0
];
m_dim
[
0
]
=
dim
;
m_dim
[
0
]
=
dim
;
m_dim
[
1
]
=
2
+
static_cast
<
size_t
>
(
dim
*
d
[
1
]
/
d
[
0
]);
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
]);
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
];
r
=
d
[
1
];
m_dim
[
1
]
=
dim
;
m_dim
[
1
]
=
dim
;
m_dim
[
0
]
=
2
+
static_cast
<
size_t
>
(
dim
*
d
[
0
]
/
d
[
1
]);
m_dim
[
0
]
=
2
+
static_cast
<
size_t
>
(
dim
*
d
[
0
]
/
d
[
1
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment