TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update assimp to 5.2.3 Bugfix-Release

Browse source
This commit is contained in:
AzaezelX 2022-04-26 11:56:24 -05:00
parent 3f796d2a06
commit f297476092
1150 changed files with 165834 additions and 112019 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/lib/assimp/contrib/poly2tri/README
View file

@ -1,4 +1,4 @@
==================
==================
INSTALLATION GUIDE
==================
@ -48,4 +48,4 @@ Examples:
./p2t nazca_monkey.dat 0 0 9
./p2t random 10 100 5.0
./p2t random 1000 20000 0.025
./p2t random 1000 20000 0.025

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/common/shapes.cc
View file

@ -362,4 +362,4 @@ void Triangle::DebugPrint()
cout << points_[2]->x << "," << points_[2]->y << endl;
}
}
}

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/common/shapes.h
View file

@ -324,4 +324,4 @@ inline void Triangle::IsInterior(bool b)
}
#endif
#endif

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/poly2tri.h
View file

@ -35,4 +35,4 @@
#include "common/shapes.h"
#include "sweep/cdt.h"
#endif
#endif

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/sweep/advancing_front.cc
View file

@ -105,4 +105,4 @@ AdvancingFront::~AdvancingFront()
{
}
}
}

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/sweep/advancing_front.h
View file

@ -115,4 +115,4 @@ inline void AdvancingFront::set_search(Node* node)
}
#endif
#endif

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/sweep/cdt.cc
View file

@ -68,4 +68,4 @@ CDT::~CDT()
delete sweep_;
}
}
}

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/sweep/cdt.h
View file

@ -102,4 +102,4 @@ public:
}
#endif
#endif

16
Engine/lib/assimp/contrib/poly2tri/poly2tri/sweep/sweep.cc
View file

@ -36,6 +36,11 @@
namespace p2t {
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning( disable : 4702 )
#endif // _MSC_VER
// Triangulate simple polygon with holes
void Sweep::Triangulate(SweepContext& tcx)
{
@ -52,8 +57,8 @@ void Sweep::SweepPoints(SweepContext& tcx)
for (size_t i = 1; i < tcx.point_count(); i++) {
Point& point = *tcx.GetPoint(i);
Node* node = &PointEvent(tcx, point);
for (unsigned int i = 0; i < point.edge_list.size(); i++) {
EdgeEvent(tcx, point.edge_list[i], node);
for (unsigned int ii = 0; ii < point.edge_list.size(); ii++) {
EdgeEvent(tcx, point.edge_list[ii], node);
}
}
}
@ -124,7 +129,7 @@ void Sweep::EdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle* triangl
EdgeEvent( tcx, ep, *p1, triangle, *p1 );
} else {
// ASSIMP_CHANGE (aramis_acg)
std::runtime_error("EdgeEvent - collinear points not supported");
throw std::runtime_error("EdgeEvent - collinear points not supported");
}
return;
}
@ -795,5 +800,8 @@ Sweep::~Sweep() {
}
}
#ifdef _MSC_VER
# pragma warning( pop )
#endif // _MSC_VER
}

2
Engine/lib/assimp/contrib/poly2tri/poly2tri/sweep/sweep.h
View file

@ -282,4 +282,4 @@ private:
}
#endif
#endif