krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix build error and a pair of warnings

Browse source 
The error was about casting between osg::Callback* and osg::NodeCallback*
The warnings are both about virtual classes with non-virtual destructors
This commit is contained in:
Alexander "Ace" Olofsson 2015-07-01 15:06:38 +02:00
parent 2065e0fa2d
commit 5d24091364
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,7 @@ protected:
boost::shared_ptr<float> mTimePtr; boost::shared_ptr<float> mTimePtr;
public: public:
virtual ~AnimationTime() { }
void setTimePtr(boost::shared_ptr<float> time) void setTimePtr(boost::shared_ptr<float> time)
{ mTimePtr = time; } { mTimePtr = time; }

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

@ -721,12 +721,12 @@ public:
if (stateset->getAttribute(osg::StateAttribute::MATERIAL)) if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
{ {
SceneUtil::CompositeStateSetUpdater* composite = NULL; SceneUtil::CompositeStateSetUpdater* composite = NULL;
osg::NodeCallback* callback = node.getUpdateCallback(); osg::NodeCallback* callback = dynamic_cast<osg::NodeCallback*>(node.getUpdateCallback());
while (callback) while (callback)
{ {
if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback))) if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
break; break;
callback = callback->getNestedCallback(); callback = dynamic_cast<osg::NodeCallback*>(callback->getNestedCallback());
} }
if (composite) if (composite)

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

@ -19,6 +19,8 @@ namespace MWRender
float mStartTime; float mStartTime;
public: public:
WeaponAnimationTime(Animation* animation) : mAnimation(animation), mStartTime(0) {} WeaponAnimationTime(Animation* animation) : mAnimation(animation), mStartTime(0) {}
virtual ~WeaponAnimationTime() { }
void setGroup(const std::string& group); void setGroup(const std::string& group);
void updateStartTime(); void updateStartTime();