Changeset 3851 in orxonox.OLD for orxonox/trunk/src/t_animation.h

Timestamp:

Apr 17, 2005, 1:21:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: animation: more adaptions to the new Framework

File:

• orxonox/trunk/src/t_animation.h (modified) (7 diffs)

orxonox/trunk/src/t_animation.h

@@ -1 @@
-
-
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   ### File Specific:
+   main-programmer: Benjamin Grauer
+   co-programmer: ...
+*/
+
+
+/*! 
+    \file t_animation.h
+*/
+
+#ifndef _T_ANIMATION_H
+#define _T_ANIMATION_H
 
 #include "animation.h"
@@ -16 +36 @@
   void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_LINEAR);
 
-  virtual void tick(float time);
+  virtual void tick(float timePassed);
 
   // animation functions
   void setAnimFunc(ANIM_FUNCTION animFunc);
+
+ private:
 
   float constant(float timePassed) const;
@@ -29 +51 @@
   float quadratic(float timePassed) const;
   float random(float timePassed) const;
+
+
   //  ANIM_FUNCTION animFunc;
   float (tAnimation<T>::*animFunc)(float) const;
@@ -35 +59 @@
   tList<KeyFrameF>* keyFrameList;
 
-
-
-
- private:
   float expFactor;
   T* object;
@@ -110 +130 @@
   if (duration <= 0.0)
     duration = 1.0;
-  
 
   KeyFrameF* tmpKeyFrame;
@@ -135 +154 @@
 
 template<class T>
-void tAnimation<T>::tick(float time)
+void tAnimation<T>::tick(float timePassed)
 {
   if (this->bRunning)
     {
-      this->localTime += time;
+      this->localTime += timePassed;
       if (localTime >= this->currentKeyFrame->duration)
         {
           // switching to the next Key-Frame
+          this->localTime -= this->currentKeyFrame->duration;
+
           this->currentKeyFrame = this->nextKeyFrame;
-          this->localTime = 0;
           // checking, if we should still Play the animation
           if (this->currentKeyFrame == this->keyFrameList->lastElement())
@@ -270 +290 @@
 
 }
+
+
+#endif /* _T_ANIMATION_H */