TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-24 22:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update tsMeshFit.cpp

Browse source 
code cleanup, fix warnings etc
This commit is contained in:
marauder2k7 2024-05-12 15:21:59 +01:00
parent 109d8c06e9
commit 948d2e5cef
1 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Engine/source/ts/tsMeshFit.cpp
View file

@ -633,23 +633,23 @@ void MeshFit::fitK_DOP( const Vector<Point3F>& planes )
lastMesh.transform.identity(); lastMesh.transform.identity();
U32* indices = new U32[ch.m_triangles.size() * 3]; U32* indices = new U32[ch.m_triangles.size() * 3];
for (U32 i = 0; i < ch.m_triangles.size(); i++) for (U32 ind = 0; ind < ch.m_triangles.size(); ind++)
{ {
indices[i * 3 + 0] = ch.m_triangles[i].mI0; indices[ind * 3 + 0] = ch.m_triangles[ind].mI0;
indices[i * 3 + 1] = ch.m_triangles[i].mI1; indices[ind * 3 + 1] = ch.m_triangles[ind].mI1;
indices[i * 3 + 2] = ch.m_triangles[i].mI2; indices[ind * 3 + 2] = ch.m_triangles[ind].mI2;
} }
F32* resultPts = new F32[ch.m_points.size() * 3]; F32* resultPts = new F32[ch.m_points.size() * 3];
for (U32 i = 0; i < ch.m_points.size(); i++) for (U32 pts = 0; pts < ch.m_points.size(); pts++)
{ {
resultPts[i * 3 + 0] = ch.m_points[i].mX; resultPts[pts * 3 + 0] = ch.m_points[pts].mX;
resultPts[i * 3 + 1] = ch.m_points[i].mY; resultPts[pts * 3 + 1] = ch.m_points[pts].mY;
resultPts[i * 3 + 2] = ch.m_points[i].mZ; resultPts[pts * 3 + 2] = ch.m_points[pts].mZ;
} }
lastMesh.tsmesh = createTriMesh(resultPts, ch.m_points.size(), lastMesh.tsmesh = createTriMesh(resultPts, (S32)ch.m_points.size(),
indices, ch.m_triangles.size()); indices, (S32)ch.m_triangles.size());
lastMesh.tsmesh->computeBounds(); lastMesh.tsmesh->computeBounds();
iface->Release(); iface->Release();
@ -663,9 +663,6 @@ void MeshFit::fitK_DOP( const Vector<Point3F>& planes )
void MeshFit::fitConvexHulls( U32 depth, F32 mergeThreshold, F32 concavityThreshold, U32 maxHullVerts, void MeshFit::fitConvexHulls( U32 depth, F32 mergeThreshold, F32 concavityThreshold, U32 maxHullVerts,
F32 boxMaxError, F32 sphereMaxError, F32 capsuleMaxError ) F32 boxMaxError, F32 sphereMaxError, F32 capsuleMaxError )
{ {
const F32 SkinWidth = 0.0f;
const F32 SplitThreshold = 2.0f;
VHACD::IVHACD::Parameters p; VHACD::IVHACD::Parameters p;
p.m_fillMode = VHACD::FillMode::FLOOD_FILL; p.m_fillMode = VHACD::FillMode::FLOOD_FILL;
p.m_maxNumVerticesPerCH = maxHullVerts; p.m_maxNumVerticesPerCH = maxHullVerts;
@ -698,25 +695,25 @@ void MeshFit::fitConvexHulls( U32 depth, F32 mergeThreshold, F32 concavityThresh
{ {
// Compute error between actual mesh and fitted primitives // Compute error between actual mesh and fitted primitives
F32* points = new F32[ch.m_points.size() * 3]; F32* points = new F32[ch.m_points.size() * 3];
for (U32 i = 0; i < ch.m_points.size(); i++) for (U32 pt = 0; pt < ch.m_points.size(); pt++)
{ {
points[i * 3 + 0] = ch.m_points[i].mX; points[pt * 3 + 0] = ch.m_points[pt].mX;
points[i * 3 + 1] = ch.m_points[i].mY; points[pt * 3 + 1] = ch.m_points[pt].mY;
points[i * 3 + 2] = ch.m_points[i].mZ; points[pt * 3 + 2] = ch.m_points[pt].mZ;
} }
U32* indices = new U32[ch.m_triangles.size() * 3]; U32* indices = new U32[ch.m_triangles.size() * 3];
for (U32 i = 0; i < ch.m_triangles.size(); i++) for (U32 ind = 0; ind < ch.m_triangles.size(); ind++)
{ {
indices[i * 3 + 0] = ch.m_triangles[i].mI0; indices[ind * 3 + 0] = ch.m_triangles[ind].mI0;
indices[i * 3 + 1] = ch.m_triangles[i].mI1; indices[ind * 3 + 1] = ch.m_triangles[ind].mI1;
indices[i * 3 + 2] = ch.m_triangles[i].mI2; indices[ind * 3 + 2] = ch.m_triangles[ind].mI2;
} }
F32 meshVolume = FLOAT_MATH::fm_computeMeshVolume(points, ch.m_triangles.size(), indices); F32 meshVolume = FLOAT_MATH::fm_computeMeshVolume(points, ch.m_triangles.size(), indices);
PrimFit primFitter; PrimFit primFitter;
F32 boxError = 100.0f, sphereError = 100.0f, capsuleError = 100.0f; F32 boxError = 100.0f, sphereError = 100.0f, capsuleError = 100.0;
if ( boxMaxError > 0 ) if ( boxMaxError > 0 )
{ {
primFitter.fitBox(ch.m_points.size(), points); primFitter.fitBox(ch.m_points.size(), points);
@ -759,6 +756,10 @@ void MeshFit::fitConvexHulls( U32 depth, F32 mergeThreshold, F32 concavityThresh
else if ( meshType == MeshFit::Capsule ) else if ( meshType == MeshFit::Capsule )
addCapsule( primFitter.mCapRadius, primFitter.mCapHeight, primFitter.mCapTransform ); addCapsule( primFitter.mCapRadius, primFitter.mCapHeight, primFitter.mCapTransform );
// else fall through to Hull processing // else fall through to Hull processing
// cleanup
delete[] points;
delete[] indices;
} }
if ( meshType == MeshFit::Hull ) if ( meshType == MeshFit::Hull )
@ -770,19 +771,19 @@ void MeshFit::fitConvexHulls( U32 depth, F32 mergeThreshold, F32 concavityThresh
lastMesh.transform.identity(); lastMesh.transform.identity();
U32* indices = new U32[ch.m_triangles.size() * 3]; U32* indices = new U32[ch.m_triangles.size() * 3];
for (U32 i = 0; i < ch.m_triangles.size(); i++) for (U32 ind = 0; ind < ch.m_triangles.size(); ind++)
{ {
indices[i * 3 + 0] = ch.m_triangles[i].mI0; indices[ind * 3 + 0] = ch.m_triangles[ind].mI0;
indices[i * 3 + 1] = ch.m_triangles[i].mI1; indices[ind * 3 + 1] = ch.m_triangles[ind].mI1;
indices[i * 3 + 2] = ch.m_triangles[i].mI2; indices[ind * 3 + 2] = ch.m_triangles[ind].mI2;
} }
F32* points = new F32[ch.m_points.size() * 3]; F32* points = new F32[ch.m_points.size() * 3];
for (U32 i = 0; i < ch.m_points.size(); i++) for (U32 pt = 0; pt < ch.m_points.size(); pt++)
{ {
points[i * 3 + 0] = ch.m_points[i].mX; points[pt * 3 + 0] = ch.m_points[pt].mX;
points[i * 3 + 1] = ch.m_points[i].mY; points[pt * 3 + 1] = ch.m_points[pt].mY;
points[i * 3 + 2] = ch.m_points[i].mZ; points[pt * 3 + 2] = ch.m_points[pt].mZ;
} }
lastMesh.tsmesh = createTriMesh(points, ch.m_points.size(), indices, ch.m_triangles.size()); lastMesh.tsmesh = createTriMesh(points, ch.m_points.size(), indices, ch.m_triangles.size());