mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-09 13:44:32 +00:00
update assimp to 6.0.5
This commit is contained in:
parent
2d2eb57e2e
commit
f5cf21cfeb
941 changed files with 22718 additions and 12240 deletions
|
|
@ -128,13 +128,17 @@ void X3DGeoHelper::rect_parallel_epiped(const aiVector3D &pSize, std::list<aiVec
|
|||
|
||||
#undef MESH_RectParallelepiped_CREATE_VERT
|
||||
|
||||
static constexpr int InvalidIndex = -1;
|
||||
|
||||
void X3DGeoHelper::coordIdx_str2faces_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces, unsigned int &pPrimitiveTypes) {
|
||||
std::vector<int32_t> f_data(pCoordIdx);
|
||||
std::vector<unsigned int> inds;
|
||||
unsigned int prim_type = 0;
|
||||
|
||||
if (f_data.back() != (-1)) {
|
||||
f_data.push_back(-1);
|
||||
if (!f_data.empty()) {
|
||||
if (f_data.back() != InvalidIndex) {
|
||||
f_data.push_back(InvalidIndex);
|
||||
}
|
||||
}
|
||||
|
||||
// reserve average size.
|
||||
|
|
@ -191,8 +195,10 @@ mg_m_err:
|
|||
void X3DGeoHelper::coordIdx_str2lines_arr(const std::vector<int32_t> &pCoordIdx, std::vector<aiFace> &pFaces) {
|
||||
std::vector<int32_t> f_data(pCoordIdx);
|
||||
|
||||
if (f_data.back() != (-1)) {
|
||||
f_data.push_back(-1);
|
||||
if (!f_data.empty()) {
|
||||
if (f_data.back() != InvalidIndex) {
|
||||
f_data.push_back(InvalidIndex);
|
||||
}
|
||||
}
|
||||
|
||||
// reserve average size.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue