Changeset 3782 in orxonox.OLD

Timestamp:

Apr 12, 2005, 9:36:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: added Anim a superclass of Animation, for handling animation-ticking in a List…

Location:

orxonox/branches/textEngine/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• animation.cc (added)
• animation.h (modified) (2 diffs)

orxonox/branches/textEngine/src/Makefile.am

@@ -33 +33 @@
                  track_manager.cc \
                  track_node.cc \
+                 animation.cc \
                  simple_animation.cc \
                  garbage_collector.cc \

orxonox/branches/textEngine/src/Makefile.in

@@ -56 +56 @@
         command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
         track_manager.$(OBJEXT) track_node.$(OBJEXT) \
-        simple_animation.$(OBJEXT) garbage_collector.$(OBJEXT) \
-        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
-        world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
-        skysphere.$(OBJEXT) terrain.$(OBJEXT) weapon.$(OBJEXT) \
-        projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
-        test_gun.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
-        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        animation.$(OBJEXT) simple_animation.$(OBJEXT) \
+        garbage_collector.$(OBJEXT) story_entity.$(OBJEXT) \
+        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
+        player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
+        terrain.$(OBJEXT) weapon.$(OBJEXT) projectile.$(OBJEXT) \
+        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) ai.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
         data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
         text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
@@ -74 +74 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ai.Po ./$(DEPDIR)/array.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ai.Po ./$(DEPDIR)/animation.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_entity.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
@@ -241 +241 @@
                  track_manager.cc \
                  track_node.cc \
+                 animation.cc \
                  simple_animation.cc \
                  garbage_collector.cc \
@@ -408 +409 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ai.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@

orxonox/branches/textEngine/src/animation.h

@@ -23 +23 @@
 #define _ANIMATION_H
 
-#include "base_object.h"
+
+// FORWARD DEFINITION
+template<class T> class tList;
 
 enum ANIM_FUNCTION {ANIM_LINEAR };
 
+class Anim
+{
+ protected:
+  Anim();
+
+  static tList<Anim>* animatorList;
+};
+
+
 //! A Class to handle some animation for single floated values.
-template<class T> class Animation : public BaseObject 
+template<class T> class Animation : public Anim
 {
  public:
@@ -56 +67 @@
 Animation<T>::Animation () 
 {
-   this->setClassName ("Animation");
    this->value = 0.0;
 }