luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Ensure that absent bone names work

Browse Source 
Achieved by refactoring the code to use
`std::optional<std::string>` instead of `core::stringc`.
This commit is contained in:
Lars Mueller
2024-01-31 00:00:40 +01:00
parent 4299ee21d8
commit 6ab23fa848
12 changed files with 69 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/Irrlicht/CAnimatedMeshSceneNode.cpp
View File

@@ -471,21 +471,21 @@ IBoneSceneNode* CAnimatedMeshSceneNode::getJointNode(const c8* jointName)
ISkinnedMesh *skinnedMesh=(ISkinnedMesh*)Mesh;
const s32 number = skinnedMesh->getJointNumber(jointName);
const std::optional<u32> number = skinnedMesh->getJointNumber(jointName);
if (number == -1)
if (!number.has_value())
{
os::Printer::log("Joint with specified name not found in skinned mesh", jointName, ELL_DEBUG);
return 0;
}
if ((s32)JointChildSceneNodes.size() <= number)
if (JointChildSceneNodes.size() <= *number)
{
os::Printer::log("Joint was found in mesh, but is not loaded into node", jointName, ELL_WARNING);
return 0;
}
return JointChildSceneNodes[number];
return JointChildSceneNodes[*number];
}