Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-03 23:37:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge branch 'animation_osg_ref_ptr' into 'master'

Browse source 
Avoid using owning raw pointer

See merge request OpenMW/openmw!2322
This commit is contained in:
psi29a 2022-08-21 20:04:38 +00:00
commit a99c78c85f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/animation.cpp
View file

@ -1734,7 +1734,7 @@ namespace MWRender
mRootController = addRotateController("bip01"); mRootController = addRotateController("bip01");
} }
RotateController* Animation::addRotateController(const std::string &bone) osg::ref_ptr<RotateController> Animation::addRotateController(const std::string &bone)
{ {
auto iter = getNodeMap().find(bone); auto iter = getNodeMap().find(bone);
if (iter == getNodeMap().end()) if (iter == getNodeMap().end())
@ -1757,7 +1757,7 @@ namespace MWRender
if (!foundKeyframeCtrl) if (!foundKeyframeCtrl)
return nullptr; return nullptr;
RotateController* controller = new RotateController(mObjectRoot.get()); osg::ref_ptr<RotateController> controller(new RotateController(mObjectRoot.get()));
node->addUpdateCallback(controller); node->addUpdateCallback(controller);
mActiveControllers.emplace_back(node, controller); mActiveControllers.emplace_back(node, controller);
return controller; return controller;

2
apps/openmw/mwrender/animation.hpp
View file

@ -274,7 +274,7 @@ protected:
float mLegsYawRadians; float mLegsYawRadians;
float mBodyPitchRadians; float mBodyPitchRadians;
RotateController* addRotateController(const std::string& bone); osg::ref_ptr<RotateController> addRotateController(const std::string& bone);
bool mHasMagicEffects; bool mHasMagicEffects;