mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 07:09:41 +00:00
Code Issues Releases Wiki Activity

Use unique_ptr to manage Bone lifetime

Browse source
This commit is contained in:
elsid 2022-07-17 12:12:17 +02:00
parent f393fee9d1
commit e4f599575e
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
components/sceneutil/skeleton.cpp
View file

@ -80,15 +80,16 @@ Bone* Skeleton::getBone(const std::string &name)
{ {
if (bone->mChildren[i]->mNode == matrixTransform) if (bone->mChildren[i]->mNode == matrixTransform)
{ {
child = bone->mChildren[i]; child = bone->mChildren[i].get();
break; break;
} }
} }
if (!child) if (child == nullptr)
{ {
child = new Bone; auto childBone = std::make_unique<Bone>();
bone->mChildren.push_back(child); child = childBone.get();
bone->mChildren.push_back(std::move(childBone));
mNeedToUpdateBoneMatrices = true; mNeedToUpdateBoneMatrices = true;
} }
bone = child; bone = child;
@ -165,13 +166,6 @@ Bone::Bone()
{ {
} }
Bone::~Bone()
{
for (unsigned int i=0; i<mChildren.size(); ++i)
delete mChildren[i];
mChildren.clear();
}
void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace) void Bone::update(const osg::Matrixf* parentMatrixInSkeletonSpace)
{ {
if (!mNode) if (!mNode)

7
components/sceneutil/skeleton.hpp
View file

@ -15,20 +15,15 @@ namespace SceneUtil
{ {
public: public:
Bone(); Bone();
~Bone();
osg::Matrixf mMatrixInSkeletonSpace; osg::Matrixf mMatrixInSkeletonSpace;
osg::MatrixTransform* mNode; osg::MatrixTransform* mNode;
std::vector<Bone*> mChildren; std::vector<std::unique_ptr<Bone>> mChildren;
/// Update the skeleton-space matrix of this bone and all its children. /// Update the skeleton-space matrix of this bone and all its children.
void update(const osg::Matrixf* parentMatrixInSkeletonSpace); void update(const osg::Matrixf* parentMatrixInSkeletonSpace);
private:
Bone(const Bone&);
void operator=(const Bone&);
}; };
/// @brief Handles the bone matrices for any number of child RigGeometries. /// @brief Handles the bone matrices for any number of child RigGeometries.