Changeset 11291 for OpenSceneGraph/trunk/include/osgAnimation/Channel
- Timestamp:
- 03/25/10 18:50:29 (3 years ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/include/osgAnimation/Channel (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/include/osgAnimation/Channel
r11009 r11291 17 17 */ 18 18 19 #ifndef OSGANIMATION_CHANNEL _H20 #define OSGANIMATION_CHANNEL _H19 #ifndef OSGANIMATION_CHANNEL 20 #define OSGANIMATION_CHANNEL 1 21 21 22 22 #include <osgAnimation/Export> … … 38 38 virtual Channel* clone() const = 0; 39 39 40 virtual void update( floattime, float weight, int priority) = 0;40 virtual void update(double time, float weight, int priority) = 0; 41 41 virtual void reset() = 0; 42 42 virtual Target* getTarget() = 0; … … 46 46 void setName(const std::string& name); 47 47 48 virtual floatgetStartTime() const = 0;49 virtual floatgetEndTime() const = 0;48 virtual double getStartTime() const = 0; 49 virtual double getEndTime() const = 0; 50 50 51 51 const std::string& getTargetName() const; … … 114 114 115 115 virtual ~TemplateChannel() {} 116 virtual void update( floattime, float weight, int priority)116 virtual void update(double time, float weight, int priority) 117 117 { 118 118 // skip if weight == 0 … … 149 149 void setTarget(TargetType* target) { _target = target; } 150 150 151 virtual floatgetStartTime() const { return _sampler->getStartTime(); }152 virtual floatgetEndTime() const { return _sampler->getEndTime(); }151 virtual double getStartTime() const { return _sampler->getStartTime(); } 152 virtual double getEndTime() const { return _sampler->getEndTime(); } 153 153 154 154 protected:
