TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

8
Engine/lib/assimp/code/AssetLib/X/XFileParser.cpp
View file

@ -454,7 +454,7 @@ void XFileParser::ParseDataObjectSkinWeights(Mesh *pMesh) {
std::string transformNodeName;
GetNextTokenAsString(transformNodeName);
pMesh->mBones.push_back(Bone());
pMesh->mBones.emplace_back();
Bone &bone = pMesh->mBones.back();
bone.mName = transformNodeName;
@ -640,7 +640,7 @@ void XFileParser::ParseDataObjectMeshMaterialList(Mesh *pMesh) {
CheckForClosingBrace(); // skip }
} else if (objectName == "Material") {
pMesh->mMaterials.push_back(Material());
pMesh->mMaterials.emplace_back();
ParseDataObjectMaterial(&pMesh->mMaterials.back());
} else if (objectName == ";") {
// ignore
@ -678,12 +678,12 @@ void XFileParser::ParseDataObjectMaterial(Material *pMaterial) {
// some exporters write "TextureFileName" instead.
std::string texname;
ParseDataObjectTextureFilename(texname);
pMaterial->mTextures.push_back(TexEntry(texname));
pMaterial->mTextures.emplace_back(texname);
} else if (objectName == "NormalmapFilename" || objectName == "NormalmapFileName") {
// one exporter writes out the normal map in a separate filename tag
std::string texname;
ParseDataObjectTextureFilename(texname);
pMaterial->mTextures.push_back(TexEntry(texname, true));
pMaterial->mTextures.emplace_back(texname, true);
} else {
ASSIMP_LOG_WARN("Unknown data object in material in x file");
ParseUnknownDataObject();