Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4746 in orxonox.OLD for orxonox/trunk/src/util/animation


Ignore:
Timestamp:
Jul 1, 2005, 12:48:48 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: changed (void) → ()

Location:
orxonox/trunk/src/util/animation
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/util/animation/animation.cc

    r4597 r4746  
    2525   This also adds the Animation automatically to the AnimationPlayer's list
    2626*/
    27 Animation::Animation(void)
     27Animation::Animation()
    2828{
    2929  this->setClassID(CL_ANIMATION, "Animation");
    … …  
    4848   this also takes the animation out of the AnimationPlayer's list (if it is there)
    4949*/
    50 Animation::~Animation(void)
     50Animation::~Animation()
    5151{
    5252  this->doNotHandle();
    … …  
    5959   This means that it will not be ticked, and not be deleted with the AnimationPlayer
    6060*/
    61 void Animation::doNotHandle(void)
     61void Animation::doNotHandle()
    6262{
    6363  if (this->bHandled)
    … …  
    7777   \brief handles the Animation if it gets out of boundraries eg. if animation is finished.
    7878*/
    79 void Animation::handleInfinity(void)
     79void Animation::handleInfinity()
    8080{
    8181  switch (this->postInfinity)

  • orxonox/trunk/src/util/animation/animation.h

    r4597 r4746  
    7575{
    7676 public:
    77   virtual ~Animation(void);
    78   void doNotHandle(void);
     77  virtual ~Animation();
     78  void doNotHandle();
    7979
    8080  void setInfinity(ANIM_INFINITY postInfinity = ANIM_INF_CONSTANT);
    … …  
    9292
    9393  /** \returns the BaseObject, this animation operates on */
    94   BaseObject* getBaseObject(void) const { return this->baseObject; };
     94  BaseObject* getBaseObject() const { return this->baseObject; };
    9595
    9696  /** \returns if the Animation should be deleted */
    97   inline bool ifDelete(void) { return bDelete; };
     97  inline bool ifDelete() { return bDelete; };
    9898
    9999 protected:
    100   Animation(void);
     100  Animation();
    101101
    102   void handleInfinity(void);
     102  void handleInfinity();
    103103
    104104 protected:

  • orxonox/trunk/src/util/animation/animation3d.cc

    r4597 r4746  
    5454   deletes all the Keyframes
    5555*/
    56 Animation3D::~Animation3D(void)
     56Animation3D::~Animation3D()
    5757{
    5858  // delete all the KeyFrames
    … …  
    7171   \brief rewinds the Animation to the beginning (first KeyFrame and time == 0)
    7272*/
    73 void Animation3D::rewind(void)
     73void Animation3D::rewind()
    7474{
    7575  this->currentKeyFrame = keyFrameList->firstElement();

  • orxonox/trunk/src/util/animation/animation3d.h

    r4597 r4746  
    3232 public:
    3333  Animation3D(PNode* object);
    34   virtual ~Animation3D(void);
     34  virtual ~Animation3D();
    3535
    36   virtual void rewind(void);
     36  virtual void rewind();
    3737
    3838  void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFuncMov = ANIM_DEFAULT_FUNCTION, ANIM_FUNCTION animFuncRot = ANIM_NULL);

  • orxonox/trunk/src/util/animation/animation_player.cc

    r4597 r4746  
    8282   \brief empties the list AND deletes all the Animations
    8383*/
    84 void AnimationPlayer::flush(void)
     84void AnimationPlayer::flush()
    8585{
    8686  // deleting the Animation List AND all the elements of the List
    … …  
    126126   \brief starts playing the AnimationPlayer
    127127*/
    128 void AnimationPlayer::play(void)
     128void AnimationPlayer::play()
    129129{
    130130  this->bRunning = true;
    … …  
    134134   \brief pauses playing of the AnimationPlayer
    135135*/
    136 void AnimationPlayer::pause(void)
     136void AnimationPlayer::pause()
    137137{
    138138  this->bRunning = false;
    … …  
    166166   \brief Outputs some nice debug-information
    167167*/
    168 void AnimationPlayer::debug(void)
     168void AnimationPlayer::debug()
    169169{
    170170  PRINT(0)("+------------------------------------+\n");

  • orxonox/trunk/src/util/animation/animation_player.h

    r4597 r4746  
    3030 public:
    3131  /** \returns a Pointer to the only object of this Class */
    32   inline static AnimationPlayer* getInstance(void) { if (!singletonRef) singletonRef = new AnimationPlayer();  return singletonRef; };
     32  inline static AnimationPlayer* getInstance() { if (!singletonRef) singletonRef = new AnimationPlayer();  return singletonRef; };
    3333
    34   virtual ~AnimationPlayer(void);
     34  virtual ~AnimationPlayer();
    3535
    3636  // animation handling
    3737  void addAnimation(Animation* animation);
    3838  void removeAnimation(Animation* animation);
    39   void flush(void);
     39  void flush();
    4040
    4141  // time functions
    4242  void tick(float timePassed);
    43   void play(void);
    44   void pause(void);
     43  void play();
     44  void pause();
    4545
    4646  Animation* getAnimationFromBaseObject(const BaseObject* baseObject) const;
    4747
    48   void debug(void);
     48  void debug();
    4949
    5050 private:
    5151  /* singleton */
    52   AnimationPlayer(void);
     52  AnimationPlayer();
    5353  static AnimationPlayer*      singletonRef;          //!< SingletonReference to this class.
    5454

  • orxonox/trunk/src/util/animation/t_animation.h

    r4597 r4746  
    122122*/
    123123template<class T>
    124 void tAnimation<T>::rewind(void)
     124void tAnimation<T>::rewind()
    125125{
    126126  this->currentKeyFrame = keyFrameList->firstElement();
Note: See TracChangeset for help on using the changeset viewer.