Changeset 5777 in orxonox.OLD for trunk

Timestamp:

Nov 25, 2005, 3:37:11 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: stl::list in AnimationPlayer

Location:

trunk/src

Files:

• lib/physics/physics_engine.h (modified) (1 diff)
• util/animation/animation.cc (modified) (2 diffs)
• util/animation/animation.h (modified) (2 diffs)
• util/animation/animation_player.cc (modified) (9 diffs)
• util/animation/animation_player.h (modified) (2 diffs)

trunk/src/lib/physics/physics_engine.h

@@ -14 +14 @@
 #include "field.h"
 #include <list>
-
 
 // Forward Declaration

trunk/src/util/animation/animation.cc

@@ -31 +31 @@
   // initialize a beginning KeyFrame, that will be deleted afterwards
   this->keyFrameCount = 0;
-  this->bHandled = true;
   this->bDelete = false;
   this->baseObject = NULL;
@@ -50 +49 @@
 Animation::~Animation()
 {
-  this->doNotHandle();
+  AnimationPlayer::getInstance()->removeAnimation(this);
 }
 
-/**
- *  tells the AnimationPlayer, that we do not wish to  handle this animation
-   automatically.
-
-   This means that it will not be ticked, and not be deleted with the AnimationPlayer
-*/
-void Animation::doNotHandle()
-{
-  if (this->bHandled)
-    AnimationPlayer::getInstance()->removeAnimation(this);
-}
 
 /**

trunk/src/util/animation/animation.h

@@ -76 +76 @@
  public:
   virtual ~Animation();
-  void doNotHandle();
 
   void setInfinity(ANIM_INFINITY postInfinity = ANIM_INF_CONSTANT);
@@ -110 +109 @@
   unsigned int          keyFrameCount;          //!< The Count of KeyFrames.
   int                   keyFramesToPlay;        //!< How many more Keyframes to play. if negative it will be ignored if 0 stop.
-  bool                  bHandled;               //!< If this Animation is handled by the AnimationPlayer.
   bool                  bRunning;               //!< If the animation is running
   bool                  bDelete;                //!< If true, the animation will be deleted through the AnimationPlayer.

trunk/src/util/animation/animation_player.cc

@@ -31 +31 @@
   this->setName("AnimationPlayer");
 
-  this->animationList = new tList<Animation>();
   this->play();
 }
@@ -52 +51 @@
   // deleting the Animation List AND all the elements of the List
   this->flush();
-  delete this->animationList;
 
   AnimationPlayer::singletonRef = NULL;
@@ -67 +65 @@
 void AnimationPlayer::addAnimation(Animation* animation)
 {
-  this->animationList->add(animation);
+  this->animationList.push_back(animation);
 }
 
@@ -76 +74 @@
 void AnimationPlayer::removeAnimation(Animation* animation)
 {
-  this->animationList->remove(animation);
+  this->animationList.remove(animation);
 }
 
@@ -85 +83 @@
 {
   // deleting the Animation List AND all the elements of the List
-  tIterator<Animation>* animIt = this->animationList->getIterator();
-  Animation* anim = animIt->firstElement();
-  while( anim != NULL)
-    {
-      delete anim;
-      this->animationList->remove(anim);
-      anim = animIt->nextElement();
-    }
-  delete animIt;
-
-  delete this->animationList;
-  this->animationList = new tList<Animation>();
+  while(this->animationList.size() > 0)
+  {
+    Animation* anim = this->animationList.front();
+    this->animationList.pop_front();
+    delete anim;
+  }
 }
 
@@ -102 +94 @@
  *  Ticks all the animations in animationList
  * @param timePassed the time passed since the last tick.
-*/
+ */
 void AnimationPlayer::tick(float timePassed)
 {
   if (this->bRunning)
+  {
+      // iterate through all the animations and tick them.
+    list<Animation*>::iterator anim;
+    for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
     {
-      // iterate through all the animations and tick them.
-      tIterator<Animation>* animIt = this->animationList->getIterator();
-      Animation* anim = animIt->firstElement();
-      while( anim != NULL)
-        {
-          anim->tick(timePassed);
-          if(unlikely(anim->ifDelete()))
-          {
-            this->animationList->remove(anim);
-            delete anim;
-          }
-          anim = animIt->nextElement();
-        }
-      delete animIt;
+      (*anim)->tick(timePassed);
+      if(unlikely((*anim)->ifDelete()))
+      {
+        this->animationList.remove(*anim);
+        delete *anim;
+      }
     }
+  }
 }
 /**
  *  starts playing the AnimationPlayer
-*/
+ */
 void AnimationPlayer::play()
 {
@@ -133 +122 @@
 /**
  *  pauses playing of the AnimationPlayer
-*/
+ */
 void AnimationPlayer::pause()
 {
@@ -146 +135 @@
 Animation* AnimationPlayer::getAnimationFromBaseObject(const BaseObject* baseObject) const
 {
-  tIterator<Animation>* animIt = this->animationList->getIterator();
-  Animation* anim = animIt->firstElement();
-  while( anim != NULL)
-    {
-      if(anim->getBaseObject() == baseObject)
-        {
-          delete animIt;
-          return anim;
-        }
-      anim = animIt->nextElement();
-    }
-  delete animIt;
+  list<Animation*>::const_iterator anim;
+  for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
+    if((*anim)->getBaseObject() == baseObject)
+      return *anim;
   return NULL;
 }
@@ -172 +153 @@
   PRINT(0)("+------------------------------------+\n");
   PRINT(0)("| Reference: %p\n", this);
-  PRINT(0)("| CountOfAnims %d\n", this->animationList->getSize());
+  PRINT(0)("| CountOfAnims %d\n", this->animationList.size());
   PRINT(0)("-Animation Information---------------+\n");
   // Per ANIMATION DEBUG
-  tIterator<Animation>* animIt = this->animationList->getIterator();
-  Animation* anim = animIt->firstElement();
-  while( anim != NULL)
+  list<Animation*>::iterator anim;
+  for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
     {
       //      anim->debug();
-      anim = animIt->nextElement();
     }
-  delete animIt;
-
   PRINT(0)("+--------------------------------AP--+\n");
 }

trunk/src/util/animation/animation_player.h

@@ -8 +8 @@
 #include "base_object.h"
 #include "animation.h"
+
+#include <list>
 
 /* FORWARD DECLARATION */
@@ -54 +56 @@
 
   /* class specific */
-  tList<Animation>*            animationList;         //!< A List of Animations to be handled.
+  std::list<Animation*>        animationList;         //!< A List of Animations to be handled.
   bool                         bRunning;              //!< If the AnimationPlayer is running.
 };