mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 13:39:40 +00:00
Code Issues Releases Wiki Activity

Fix C4589 msvc warning

Browse source 
Constructor of abstract class 'SceneUtil::KeyframeController' ignores initializer for virtual base class 'osg::Object'
This commit is contained in:
elsid 2022-07-01 13:59:38 +02:00
parent ebdcb7acbd
commit 2d6e048d88
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/nifosg/controller.cpp
View file

@ -71,7 +71,8 @@ KeyframeController::KeyframeController()
} }
KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop) KeyframeController::KeyframeController(const KeyframeController &copy, const osg::CopyOp &copyop)
: SceneUtil::KeyframeController(copy, copyop) : osg::Object(copy, copyop)
, SceneUtil::KeyframeController(copy)
, SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>(copy, copyop) , SceneUtil::NodeCallback<KeyframeController, NifOsg::MatrixTransform*>(copy, copyop)
, mRotations(copy.mRotations) , mRotations(copy.mRotations)
, mXRotations(copy.mXRotations) , mXRotations(copy.mXRotations)

5
components/sceneutil/keyframe.hpp
View file

@ -17,9 +17,8 @@ namespace SceneUtil
public: public:
KeyframeController() {} KeyframeController() {}
KeyframeController(const KeyframeController& copy, const osg::CopyOp& copyop) KeyframeController(const KeyframeController& copy)
: osg::Object(copy, copyop) : SceneUtil::Controller(copy) {}
, SceneUtil::Controller(copy) {}
virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); } virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); }

7
components/sceneutil/osgacontroller.cpp
View file

@ -68,8 +68,11 @@ namespace SceneUtil
traverse( node ); traverse( node );
} }
OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop) : SceneUtil::KeyframeController(copy, copyop), SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop) OsgAnimationController::OsgAnimationController(const OsgAnimationController &copy, const osg::CopyOp &copyop)
, mEmulatedAnimations(copy.mEmulatedAnimations) : osg::Object(copy, copyop)
, SceneUtil::KeyframeController(copy)
, SceneUtil::NodeCallback<OsgAnimationController>(copy, copyop)
, mEmulatedAnimations(copy.mEmulatedAnimations)
{ {
mLinker = nullptr; mLinker = nullptr;
for (const auto& mergedAnimationTrack : copy.mMergedAnimationTracks) for (const auto& mergedAnimationTrack : copy.mMergedAnimationTracks)