TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +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

12
Engine/lib/assimp/code/AssetLib/B3D/B3DImporter.cpp
View file

@ -88,9 +88,7 @@ void DeleteAllBarePointers(std::vector<T> &x) {
}
}
B3DImporter::~B3DImporter() {
// empty
}
B3DImporter::~B3DImporter() = default;
// ------------------------------------------------------------------------------------------------
bool B3DImporter::CanRead(const std::string &pFile, IOSystem * /*pIOHandler*/, bool /*checkSig*/) const {
@ -479,13 +477,13 @@ void B3DImporter::ReadKEYS(aiNodeAnim *nodeAnim) {
while (ChunkSize()) {
int frame = ReadInt();
if (flags & 1) {
trans.push_back(aiVectorKey(frame, ReadVec3()));
trans.emplace_back(frame, ReadVec3());
}
if (flags & 2) {
scale.push_back(aiVectorKey(frame, ReadVec3()));
scale.emplace_back(frame, ReadVec3());
}
if (flags & 4) {
rot.push_back(aiQuatKey(frame, ReadQuat()));
rot.emplace_back(frame, ReadQuat());
}
}
@ -673,7 +671,7 @@ void B3DImporter::ReadBB3D(aiScene *scene) {
int bone = v.bones[k];
float weight = v.weights[k];
vweights[bone].push_back(aiVertexWeight(vertIdx + faceIndex, weight));
vweights[bone].emplace_back(vertIdx + faceIndex, weight);
}
}
++face;