Show
Ignore:
Timestamp:
03/25/10 18:50:29 (5 years ago)
Author:
cedricpinson
Message:

Change time type from float to double in osgAnimation

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgAnimation/Channel

    r11009 r11291  
    1717 */ 
    1818 
    19 #ifndef OSGANIMATION_CHANNEL_H 
    20 #define OSGANIMATION_CHANNEL_H 
     19#ifndef OSGANIMATION_CHANNEL 
     20#define OSGANIMATION_CHANNEL 1 
    2121 
    2222#include <osgAnimation/Export> 
     
    3838        virtual Channel* clone() const = 0; 
    3939 
    40         virtual void update(float time, float weight, int priority) = 0; 
     40        virtual void update(double time, float weight, int priority) = 0; 
    4141        virtual void reset() = 0; 
    4242        virtual Target* getTarget() = 0; 
     
    4646        void setName(const std::string& name); 
    4747 
    48         virtual float getStartTime() const = 0; 
    49         virtual float getEndTime() const = 0; 
     48        virtual double getStartTime() const = 0; 
     49        virtual double getEndTime() const = 0; 
    5050 
    5151        const std::string& getTargetName() const; 
     
    114114 
    115115        virtual ~TemplateChannel() {} 
    116         virtual void update(float time, float weight, int priority)  
     116        virtual void update(double time, float weight, int priority)  
    117117        { 
    118118            // skip if weight == 0 
     
    149149        void setTarget(TargetType* target) { _target = target; } 
    150150 
    151         virtual float getStartTime() const { return _sampler->getStartTime(); } 
    152         virtual float getEndTime() const { return _sampler->getEndTime(); } 
     151        virtual double getStartTime() const { return _sampler->getStartTime(); } 
     152        virtual double getEndTime() const { return _sampler->getEndTime(); } 
    153153 
    154154    protected: