Changeset 3833 in orxonox.OLD

Timestamp:

Apr 14, 2005, 2:03:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: animation can now return the BaseObject it operates on

Location:

orxonox/trunk/src

Files:

• animation.cc (modified) (2 diffs)
• animation.h (modified) (6 diffs)
• animation_player.cc (modified) (1 diff)
• animation_player.h (modified) (1 diff)
• lib/graphics/text_engine.cc (modified) (1 diff)
• lib/graphics/text_engine.h (modified) (1 diff)

orxonox/trunk/src/animation.cc

@@ -25 +25 @@
   this->bHasKeys = false;
   this->bHandled = true;
+  this->baseObject = NULL;
 
   // setting default values
@@ -55 +56 @@
   this->bRunning = true;
 }
+
+
 void Anim::stop()
 {

orxonox/trunk/src/animation.h

@@ -28 +28 @@
 
 #include "list.h"
+#include "base_object.h"
+
 // FORWARD DEFINITION
 
@@ -52 +54 @@
   ANIM_FUNCTION animFunc;
 };
-
-
-/**********************TEST*******************************/
-class aTest
-{
- public:
-  aTest() { last = 0.0;}
-  ~aTest() {}
-  void littleDebug(float f) {  diff = f - last; printf("f=%f, diff=%f\n", f,diff); last = f;}
- private:
-  float diff;
-  float last;
-};
-
-//aTest::aTest() {}
-//aTest::~aTest() {}
-
-//void aTest::littleDebug(float f)
-
-/**********************TEST*******************************/
-
 
 class Anim
@@ -99 +80 @@
    * virtual rewind, to go to the first Keyframe. (other functions will call this one)
    */
+
+  /**
+     \returns the BaseObject, this animation operates on
+  */
+  BaseObject* getBaseObject(void) const { return baseObject;}
+
  protected:
   Anim(void);
@@ -107 +94 @@
   ANIM_INFINITY postInfinity;
 
+  BaseObject* baseObject;         //!< The same as object in the derived classes, but with reference to BaseObject
   bool bHasKeys;
   bool bHandled;                  //!< If this Animation is handled by the AnimationPlayer.
@@ -209 +197 @@
 void tAnim<T>::setFuncToAnim(T* object, void (T::*funcToAnim)(float))
 {
-  this->object = object;
+  this->baseObject = this->object = object;
   this->funcToAnim = funcToAnim;
 }
@@ -380 +368 @@
 
 
+
+/**********************TEST*******************************/
+class aTest
+{
+ public:
+  aTest() { last = 0.0;}
+  ~aTest() {}
+  void littleDebug(float f) {  diff = f - last; printf("f=%f, diff=%f\n", f,diff); last = f;}
+ private:
+  float diff;
+  float last;
+};
+
+//aTest::aTest() {}
+//aTest::~aTest() {}
+
+//void aTest::littleDebug(float f)
+
+/**********************TEST*******************************/
+
+
 #endif /* _ANIMATION_H */

orxonox/trunk/src/animation_player.cc

@@ -142 +142 @@
 
 
+Anim* AnimationPlayer::getObjectFromBaseObject(const BaseObject* baseObject) const
+{
+  tIterator<Anim>* animIt = this->animationList->getIterator();
+  Anim* anim = animIt->nextElement();
+  while( anim != NULL)
+    {
+      if(anim->getBaseObject() == baseObject)
+        {
+          delete animIt;
+          return anim;
+        }
+      anim = animIt->nextElement();
+    }
+  delete animIt;
+
+}
+
+
 
 /**

orxonox/trunk/src/animation_player.h

@@ -42 +42 @@
   void pause(void);
 
+  Anim* getObjectFromBaseObject(const BaseObject* baseObject) const;
+
   void debug(void);
 

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -51 +51 @@
 Text::Text(Font* font, int type)
 {
+  this->setClassName("Text");
+
   // initialize this Text
   this->bindNode = NULL;

orxonox/trunk/src/lib/graphics/text_engine.h

@@ -90 +90 @@
 ////////////
 //! Represents one textElement.
-class Text
+class Text : public BaseObject
 {
   friend class TextEngine;