TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 05:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update Assimp from 5.2.3 to 5.2.5

Browse source
This commit is contained in:
Bloodknight 2022-10-02 19:02:49 +01:00
parent ea7ca63301
commit 16f3710058
379 changed files with 14469 additions and 47175 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Engine/lib/assimp/code/AssetLib/Q3D/Q3DLoader.cpp
View file

@ -72,15 +72,11 @@ static const aiImporterDesc desc = {
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
Q3DImporter::Q3DImporter() {
// empty
}
Q3DImporter::Q3DImporter() = default;
// ------------------------------------------------------------------------------------------------
// Destructor, private as well
Q3DImporter::~Q3DImporter() {
// empty
}
Q3DImporter::~Q3DImporter() = default;
// ------------------------------------------------------------------------------------------------
// Returns whether the class can handle the format of the given file.
@ -129,10 +125,20 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
unsigned int numTextures = (unsigned int)stream.GetI4();
std::vector<Material> materials;
materials.reserve(numMats);
try {
materials.reserve(numMats);
} catch(const std::bad_alloc&) {
ASSIMP_LOG_ERROR("Invalid alloc for materials.");
throw DeadlyImportError("Invalid Quick3D-file, material allocation failed.");
}
std::vector<Mesh> meshes;
meshes.reserve(numMeshes);
try {
meshes.reserve(numMeshes);
} catch(const std::bad_alloc&) {
ASSIMP_LOG_ERROR("Invalid alloc for meshes.");
throw DeadlyImportError("Invalid Quick3D-file, mesh allocation failed.");
}
// Allocate the scene root node
pScene->mRootNode = new aiNode();
@ -147,7 +153,7 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
// Meshes chunk
case 'm': {
for (unsigned int quak = 0; quak < numMeshes; ++quak) {
meshes.push_back(Mesh());
meshes.emplace_back();
Mesh &mesh = meshes.back();
// read all vertices
@ -174,7 +180,7 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
// number of indices
for (unsigned int i = 0; i < numVerts; ++i) {
faces.push_back(Face(stream.GetI2()));
faces.emplace_back(stream.GetI2());
if (faces.back().indices.empty())
throw DeadlyImportError("Quick3D: Found face with zero indices");
}
@ -238,7 +244,7 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
case 'c':
for (unsigned int i = 0; i < numMats; ++i) {
materials.push_back(Material());
materials.emplace_back();
Material &mat = materials.back();
// read the material name
@ -392,7 +398,7 @@ outer:
// If we have no materials loaded - generate a default mat
if (materials.empty()) {
ASSIMP_LOG_INFO("Quick3D: No material found, generating one");
materials.push_back(Material());
materials.emplace_back();
materials.back().diffuse = fgColor;
}
@ -412,7 +418,7 @@ outer:
(*fit).mat = 0;
}
if (fidx[(*fit).mat].empty()) ++pScene->mNumMeshes;
fidx[(*fit).mat].push_back(FaceIdx(p, q));
fidx[(*fit).mat].emplace_back(p, q);
}
}
pScene->mNumMaterials = pScene->mNumMeshes;