Changeset 3781 in orxonox.OLD

Timestamp:

Apr 12, 2005, 1:05:46 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: some simple animation-template-class implemented, to animate floats
This class will in the Future be able to animate everything one needs to animate

Location:

orxonox/branches/textEngine/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• animation.h (copied) (copied from orxonox/branches/textEngine/src/proto/proto_class.h) (1 diff)
• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)

orxonox/branches/textEngine/src/Makefile.am

@@ -80 +80 @@
                  track_manager.h \
                  track_node.h \
+                 animation.h \
                  simple_animation.h \
                  garbage_collector.h \

orxonox/branches/textEngine/src/Makefile.in

@@ -288 +288 @@
                  track_manager.h \
                  track_node.h \
+                 animation.h \
                  simple_animation.h \
                  garbage_collector.h \

orxonox/branches/textEngine/src/animation.h

@@ -1 @@
-/*! 
-    \file proto_class.h
-    \brief Definition of the proto class template, used quickly start work
-    \todo Example: this shows how to use simply add a Marker that here has to be done something.
+/* 
+   orxonox - the future of 3D-vertical-scrollers
 
-    The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
-    It is an example for the CODING-CONVENTION, and a starting-point for every class.
+   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: ...
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
 
-#include "what realy has to be included"
+/*! 
+    \file animation.h
+    A Set of functions to animate some floats inside of an Object
+*/
+
+#ifndef _ANIMATION_H
+#define _ANIMATION_H
+
 #include "base_object.h"
 
-// FORWARD DEFINITION \\
-class someClassWeNeed;
+enum ANIM_FUNCTION {ANIM_LINEAR };
+
+//! A Class to handle some animation for single floated values.
+template<class T> class Animation : public BaseObject 
+{
+ public:
+  Animation();
+  virtual ~Animation();
+
+  void setFuncToAnim(T* object, void (T::*animFunc)(float));
+  void setAnimFunc();
+  void setValue(float value);
+
+  void tick(float time);
+
+ private:
+  void (T::*animFunc)(float);
+  
+  float value;
+  T* object;
+};
 
 
-/*class Test;*/ /* forward definition of class Test (without including it here!)*/
 
-//! A default class that aids you to start creating a new class
 /**
-   here can be some longer description of this class
+   \brief standard constructor
+
 */
-class ProtoClass : public BaseObject {
+template<class T>
+Animation<T>::Animation () 
+{
+   this->setClassName ("Animation");
+   this->value = 0.0;
+}
 
- public:
-  ProtoClass();
-  virtual ~ProtoClass();
 
-  bool doNonSense (int nothing);
+/**
+   \brief standard deconstructor
 
- private:
-  int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
+*/
+template<class T>
+Animation<T>::~Animation () 
+{
+  // delete what has to be deleted here
+}
 
-};
 
-#endif /* _PROTO_CLASS_H */
+template<class T>
+void Animation<T>::setFuncToAnim(T* object, void (T::*animFunc)(float))
+{
+  this->object = object;
+  this->animFunc = animFunc;
+}
+
+template<class T>
+void Animation<T>::setValue(float value)
+{
+  this->value = value;
+  (object->*(animFunc))(value);
+}
+
+template<class T>
+void Animation<T>::tick(float time)
+{
+  setValue(value+time/1000);
+  if (value >1)
+    setValue (0);
+}
+
+#endif /* _ANIMATION_H */

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -40 +40 @@
 #include "glmenu_imagescreen.h"
 #include "list.h"
+
+#include "animation.h"
 
 using namespace std;
@@ -354 +356 @@
             this->testText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
             testText->setText("TEXT  rocks");
-            testText->setBlending(.5);
+            testText->setBlending(1.0);
             testText->setBindNode(tn);
 
+            
+            tmpAnim = new Animation<Text>();
+
+            tmpAnim->setFuncToAnim(testText, &Text::setBlending);
             break;
           }
@@ -780 +786 @@
       this->localCamera->tick(this->dt);
       this->garbageCollector->tick(seconds);
+      tmpAnim->tick(this->dt);
     }
   this->lastFrame = currentFrame;

orxonox/branches/textEngine/src/story_entities/world.h

@@ -24 +24 @@
 class GarbageCollector;
 class Text;
+template<class T> class Animation;
 
 //! The game world Interface
@@ -95 +96 @@
   bool bPause;                  //!< pause mode
 
+  Animation<Text>* tmpAnim;
   Text* testText;               //!< A text to Test the TextEngine;
   GLMenuImageScreen* glmis;     //!< The Level-Loader Display