mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-27 11:06:49 +00:00
Code Issues Releases Wiki Activity

Merge branch 'animationblendingcoverity' into 'master'

Browse source 
Make Coverity happy about animation blending

See merge request OpenMW/openmw!4276
This commit is contained in:
psi29a 2024-07-26 06:55:14 +00:00
commit 11f25e4448
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwrender/animblendcontroller.cpp
View file

@ -143,6 +143,11 @@ namespace MWRender
setKeyframeTrack(keyframeTrack, newState, blendRules); setKeyframeTrack(keyframeTrack, newState, blendRules);
} }
AnimBlendController::AnimBlendController()
: mEasingFn(&Easings::sineOut)
{
}
NifAnimBlendController::NifAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack, NifAnimBlendController::NifAnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules) const AnimBlendStateData& newState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules)
: AnimBlendController(keyframeTrack, newState, blendRules) : AnimBlendController(keyframeTrack, newState, blendRules)

6
apps/openmw/mwrender/animblendcontroller.hpp
View file

@ -30,7 +30,7 @@ namespace MWRender
AnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack, AnimBlendController(const osg::ref_ptr<SceneUtil::KeyframeController>& keyframeTrack,
const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules); const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
AnimBlendController() {} AnimBlendController();
void setKeyframeTrack(const osg::ref_ptr<SceneUtil::KeyframeController>& kft, void setKeyframeTrack(const osg::ref_ptr<SceneUtil::KeyframeController>& kft,
const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules); const AnimBlendStateData& animState, const osg::ref_ptr<const SceneUtil::AnimBlendRules>& blendRules);
@ -111,7 +111,7 @@ namespace MWRender
{ {
public: public:
BoneAnimBlendControllerWrapper(osg::ref_ptr<BoneAnimBlendController> rootCallback, osgAnimation::Bone* node) BoneAnimBlendControllerWrapper(osg::ref_ptr<BoneAnimBlendController> rootCallback, osgAnimation::Bone* node)
: mRootCallback(rootCallback) : mRootCallback(std::move(rootCallback))
, mNode(node) , mNode(node)
{ {
} }
@ -135,7 +135,7 @@ namespace MWRender
private: private:
osg::ref_ptr<BoneAnimBlendController> mRootCallback; osg::ref_ptr<BoneAnimBlendController> mRootCallback;
osgAnimation::Bone* mNode; osgAnimation::Bone* mNode{ nullptr };
}; };
} }

2
components/sceneutil/animblendrules.cpp
View file

@ -30,7 +30,7 @@ namespace SceneUtil
if (delimiterInd == std::string::npos) if (delimiterInd == std::string::npos)
{ {
group = full; group = std::move(full);
Misc::StringUtils::trim(group); Misc::StringUtils::trim(group);
} }
else else