forked from mirror/openmw-tes3mp
Fix the comments
This commit is contained in:
parent
5d24091364
commit
aaaee74a4d
4 changed files with 8 additions and 5 deletions
|
@ -93,7 +93,6 @@ 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; }
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include <osg/PositionAttitudeTransform>
|
#include <osg/PositionAttitudeTransform>
|
||||||
#include <osg/TexEnvCombine>
|
#include <osg/TexEnvCombine>
|
||||||
#include <osg/TexMat>
|
#include <osg/TexMat>
|
||||||
|
#include <osg/Version>
|
||||||
|
|
||||||
#include <osgParticle/ParticleSystem>
|
#include <osgParticle/ParticleSystem>
|
||||||
#include <osgParticle/ParticleSystemUpdater>
|
#include <osgParticle/ParticleSystemUpdater>
|
||||||
|
@ -721,12 +722,16 @@ public:
|
||||||
if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
|
if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
|
||||||
{
|
{
|
||||||
SceneUtil::CompositeStateSetUpdater* composite = NULL;
|
SceneUtil::CompositeStateSetUpdater* composite = NULL;
|
||||||
osg::NodeCallback* callback = dynamic_cast<osg::NodeCallback*>(node.getUpdateCallback());
|
#if OSG_MIN_VERSION_REQUIRED(3,3,3)
|
||||||
|
osg::Callback* callback = node.getUpdateCallback();
|
||||||
|
#else
|
||||||
|
osg::NodeCallback* callback = node.getUpdateCallback();
|
||||||
|
#endif
|
||||||
while (callback)
|
while (callback)
|
||||||
{
|
{
|
||||||
if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
|
if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
|
||||||
break;
|
break;
|
||||||
callback = dynamic_cast<osg::NodeCallback*>(callback->getNestedCallback());
|
callback = callback->getNestedCallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (composite)
|
if (composite)
|
||||||
|
|
|
@ -19,8 +19,6 @@ 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();
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ namespace SceneUtil
|
||||||
class ControllerSource
|
class ControllerSource
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
virtual ~ControllerSource() { }
|
||||||
virtual float getValue(osg::NodeVisitor* nv) = 0;
|
virtual float getValue(osg::NodeVisitor* nv) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue