diff --git a/apps/openmw/mwrender/animblendcontroller.cpp b/apps/openmw/mwrender/animblendcontroller.cpp index 684183e230..3d8b7b59d7 100644 --- a/apps/openmw/mwrender/animblendcontroller.cpp +++ b/apps/openmw/mwrender/animblendcontroller.cpp @@ -143,6 +143,11 @@ namespace MWRender setKeyframeTrack(keyframeTrack, newState, blendRules); } + AnimBlendController::AnimBlendController() + : mEasingFn(&Easings::sineOut) + { + } + NifAnimBlendController::NifAnimBlendController(const osg::ref_ptr& keyframeTrack, const AnimBlendStateData& newState, const osg::ref_ptr& blendRules) : AnimBlendController(keyframeTrack, newState, blendRules) diff --git a/apps/openmw/mwrender/animblendcontroller.hpp b/apps/openmw/mwrender/animblendcontroller.hpp index 8f8ac03ae0..40a5d7582f 100644 --- a/apps/openmw/mwrender/animblendcontroller.hpp +++ b/apps/openmw/mwrender/animblendcontroller.hpp @@ -30,7 +30,7 @@ namespace MWRender AnimBlendController(const osg::ref_ptr& keyframeTrack, const AnimBlendStateData& animState, const osg::ref_ptr& blendRules); - AnimBlendController() {} + AnimBlendController(); void setKeyframeTrack(const osg::ref_ptr& kft, const AnimBlendStateData& animState, const osg::ref_ptr& blendRules); @@ -111,7 +111,7 @@ namespace MWRender { public: BoneAnimBlendControllerWrapper(osg::ref_ptr rootCallback, osgAnimation::Bone* node) - : mRootCallback(rootCallback) + : mRootCallback(std::move(rootCallback)) , mNode(node) { } @@ -135,7 +135,7 @@ namespace MWRender private: osg::ref_ptr mRootCallback; - osgAnimation::Bone* mNode; + osgAnimation::Bone* mNode{ nullptr }; }; } diff --git a/components/sceneutil/animblendrules.cpp b/components/sceneutil/animblendrules.cpp index 6e53d4bc5e..c812feb07e 100644 --- a/components/sceneutil/animblendrules.cpp +++ b/components/sceneutil/animblendrules.cpp @@ -30,7 +30,7 @@ namespace SceneUtil if (delimiterInd == std::string::npos) { - group = full; + group = std::move(full); Misc::StringUtils::trim(group); } else