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

WIP Loading of multiple roots in rig

This commit is contained in:
Xiao Qi 2023-03-15 19:26:13 +08:00
parent c824f2c9e4
commit e06ef624e6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SHADE_Engine/src/Assets/Asset Types/Models/SHRigAsset.h
View File

@ -54,6 +54,6 @@ namespace SHADE
~SHRigAsset(); ~SHRigAsset();
SHRigDataHeader header; SHRigDataHeader header;
std::vector<SHRigNodeData> nodeDataCollection{}; std::vector<SHRigNodeData> nodeDataCollection{};
SHRigNodeAsset* root; std::vector<SHRigNodeAsset*> roots;
}; };
} }

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

@ -279,6 +279,8 @@ namespace SHADE
SHRigNodeAsset* depthPtr = nodePool + 1; SHRigNodeAsset* depthPtr = nodePool + 1;
NodeTemp* depthTempPtr = dst + 1; NodeTemp* depthTempPtr = dst + 1;
uint32_t nodeCount{ 0 };
while(!nodeQueue.empty()) while(!nodeQueue.empty())
{ {
auto currPair = nodeQueue.front(); auto currPair = nodeQueue.front();
@ -288,6 +290,13 @@ namespace SHADE
currNode->idRef = currTemp->id; currNode->idRef = currTemp->id;
nodeCount++;
if (currTemp->numChild == 0 && nodeCount < header.nodeCount)
{
}
for (auto i{0}; i < currTemp->numChild; ++i) for (auto i{0}; i < currTemp->numChild; ++i)
{ {
currNode->children.push_back(depthPtr); currNode->children.push_back(depthPtr);