xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Implmented GLTF Compile and Load Overhaul #404

Merged
XiaoQiDigipen merged 17 commits from SP3-13-Assets-Manager into main 2023-03-07 23:27:01 +08:00
Conversation 0 Commits 17 Files Changed 42 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d4081a7e09 - Show all commits

9
SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
View File

@ -174,13 +174,14 @@ namespace SHADE
reinterpret_cast<char*>(&node.inverseBindMatrix), reinterpret_cast<char*>(&node.inverseBindMatrix),
sizeof(SHMatrix) sizeof(SHMatrix)
); );
node.inverseBindMatrix = SHMatrix::Transpose(node.inverseBindMatrix);
NodeDataFlag flag; NodeDataFlag flag;
file.get(reinterpret_cast<char&>(flag)); file.get(reinterpret_cast<char&>(flag));
SHVec3 scale{ SHVec3::One }, translation{ SHVec3::Zero }; SHVec3 scale{ SHVec3::One }, translation{ SHVec3::Zero };
SHVec4 rotation{ SHVec4::UnitW }; SHVec4 rotation{ SHVec4::UnitW };
//SHMatrix matrix{ SHMatrix::Identity }; SHMatrix matrix{ SHMatrix::Identity };
std::vector<double> carrier; std::vector<double> carrier;
if (flag & NODE_DATA_ROTATION) if (flag & NODE_DATA_ROTATION)
@ -223,8 +224,10 @@ namespace SHADE
// matrix = GetMatrixFromVector(carrier); // matrix = GetMatrixFromVector(carrier);
//} //}
auto const result = SHMatrix::Transform(translation, rotation, scale); //matrix *= SHMatrix::Transform(translation, rotation, scale);
node.transform = result; matrix *= SHMatrix::Translate(translation) * SHMatrix::Rotate(rotation) * SHMatrix::Scale(scale);
//result = SHMatrix::Transpose(result);
node.transform = matrix;
} }
} }