FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the usage of assert to prevent associated compile warnings and to clean up code

Browse Source
This commit is contained in:
Robert Osfield
2009-01-06 19:09:50 +00:00
parent 5bf69c9cbb
commit 8745ec7d69
9 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgAnimation/Channel
View File

@@ -18,7 +18,6 @@
#include <osgAnimation/Export>
#include <osgAnimation/Sampler>
#include <osgAnimation/Target>
#include <osgAnimation/Assert>
#include <osg/Referenced>
#include <string>
@@ -107,8 +106,8 @@ namespace osgAnimation
TargetType* getTargetTyped() { return _target.get(); }
void setTarget(TargetType* target) { _target = target; }
virtual float getStartTime() const { OSGANIMATION_ASSERT(_sampler.valid() && "no sampler attached to channel"); return _sampler->getStartTime(); }
virtual float getEndTime() const { OSGANIMATION_ASSERT(_sampler.valid() && "no sampler attached to channel"); return _sampler->getEndTime(); }
virtual float getStartTime() const { return _sampler->getStartTime(); }
virtual float getEndTime() const { return _sampler->getEndTime(); }
protected:
osg::ref_ptr<TargetType> _target;