oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

no more children

Browse source
This commit is contained in:
Lars Mueller 2025-01-20 14:02:30 +01:00
parent 8dbcaf25c3
commit d73b86c16a
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
irr/include/SkinnedMesh.h
View file

@ -329,8 +329,6 @@ public:
return {trs}; return {trs};
} }
//! List of child joints
std::vector<SJoint *> Children;
//! List of attached meshes //! List of attached meshes
std::vector<u32> AttachedMeshes; std::vector<u32> AttachedMeshes;

2
irr/src/CXMeshFileLoader.cpp
View file

@ -528,8 +528,6 @@ bool CXMeshFileLoader::parseDataObjectFrame(SkinnedMesh::SJoint *Parent)
#ifdef _XREADER_DEBUG #ifdef _XREADER_DEBUG
os::Printer::log("using joint ", name.c_str(), ELL_DEBUG); os::Printer::log("using joint ", name.c_str(), ELL_DEBUG);
#endif #endif
if (Parent)
Parent->Children.push_back(joint);
} }
// Now inside a frame. // Now inside a frame.

10
src/unittest/test_irr_gltf_mesh_loader.cpp
View file

@ -404,12 +404,12 @@ SECTION("simple skin")
}; };
// Check the node hierarchy // Check the node hierarchy
const auto parent = findJoint([](auto joint) { const auto *parent = findJoint([](auto *joint) {
return !joint->Children.empty(); return !joint->ParentJointID;
});
const auto child = findJoint([&](auto *joint) {
return joint->ParentJointID && *joint->ParentJointID == parent->JointID;
}); });
REQUIRE(parent->Children.size() == 1);
const auto child = parent->Children[0];
REQUIRE(child != parent);
SECTION("transformations are correct") SECTION("transformations are correct")
{ {