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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/util/animation

Files:

• animation.cc (modified) (2 diffs)
• animation.h (modified) (3 diffs)
• animation_player.cc (modified) (2 diffs)
• animation_player.h (modified) (2 diffs)

trunk/src/util/animation/animation.cc

@@ -20 +20 @@
 #include "animation_player.h"
 
+ObjectListDefinition(Animation);
 /**
  *  creates a new Animation
@@ -27 +28 @@
 Animation::Animation()
 {
-  this->setClassID(CL_ANIMATION, "Animation");
+  this->registerObject(this, Animation::_objectList);
 
   // initialize a beginning KeyFrame, that will be deleted afterwards

trunk/src/util/animation/animation.h

@@ -73 +73 @@
 class Animation : public BaseObject
 {
- public:
+  ObjectListDeclaration(Animation);
+public:
   virtual ~Animation();
 
@@ -95 +96 @@
   inline bool ifDelete() { return bDelete; };
 
- protected:
+protected:
   Animation();
 
   void handleInfinity();
 
- protected:
+protected:
   // variables
   float                 localTime;              //!< The Time passed since the beginning of the currentKeyFrame.
@@ -119 +120 @@
 class aTest
 {
- public:
+public:
   inline aTest() { last = 0.0;}
   /** a little debug information to show the results of this class @param f new value */
   inline void littleDebug(float f) {  diff = f - last; printf("f=%f, diff=%f\n", f,diff); last = f;}
- private:
+private:
   float     diff;           //!< difference from the last value
   float     last;           //!< the last calculated value

trunk/src/util/animation/animation_player.cc

@@ -22 +22 @@
 
 
-
+ObjectListDefinition(AnimationPlayer);
 /**
  *  standard constructor
@@ -28 +28 @@
 AnimationPlayer::AnimationPlayer ()
 {
-  this->setClassID(CL_ANIMATION_PLAYER, "AnimationPlayer");
+  this->registerObject(this, AnimationPlayer::_objectList);
   this->setName("AnimationPlayer");
 

trunk/src/util/animation/animation_player.h

@@ -28 +28 @@
    eveything else will be done by the AnimationPlayer itself.\n
 */
-class AnimationPlayer : public BaseObject {
+class AnimationPlayer : public BaseObject
+{
+  ObjectListDeclaration(AnimationPlayer);
 
- public:
+public:
   /** @returns a Pointer to the only object of this Class */
   inline static AnimationPlayer* getInstance() { if (!singletonRef) singletonRef = new AnimationPlayer();  return singletonRef; };
@@ -50 +52 @@
   void debug();
 
- private:
+private:
   /* singleton */
   AnimationPlayer();