Changeset 4415 in orxonox.OLD for orxonox/trunk

Timestamp:

May 31, 2005, 9:12:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added quick-animation for FAST, bad animations that suffice for the properties particles over time

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• lib/graphics/particles/quick_animation.cc (copied) (copied from orxonox/trunk/src/proto/proto_class.cc) (3 diffs)
• lib/graphics/particles/quick_animation.h (copied) (copied from orxonox/trunk/src/proto/proto_class.h) (2 diffs)

orxonox/trunk/src/Makefile.am

@@ -101 +101 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
+                 lib/graphics/particles/quick_animation.cc \
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
@@ -179 +180 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
+                 lib/graphics/particles/quick_animation.h \
                  lib/lang/base_object.h \
                  util/common/list.h \

orxonox/trunk/src/Makefile.in

@@ -74 +74 @@
         material.$(OBJEXT) texture.$(OBJEXT) particle_engine.$(OBJEXT) \
         particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
-        base_object.$(OBJEXT) ini_parser.$(OBJEXT) substring.$(OBJEXT) \
-        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
+        quick_animation.$(OBJEXT) base_object.$(OBJEXT) \
+        ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \
+        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
         benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
@@ -112 +113 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/quick_animation.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
@@ -315 +317 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
+                 lib/graphics/particles/quick_animation.cc \
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
@@ -393 +396 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
+                 lib/graphics/particles/quick_animation.h \
                  lib/lang/base_object.h \
                  util/common/list.h \
@@ -527 +531 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick_animation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/satellite.Po@am__quote@
@@ -1394 +1399 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`
+
+quick_animation.o: lib/graphics/particles/quick_animation.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT quick_animation.o -MD -MP -MF "$(DEPDIR)/quick_animation.Tpo" -c -o quick_animation.o `test -f 'lib/graphics/particles/quick_animation.cc' || echo '$(srcdir)/'`lib/graphics/particles/quick_animation.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/quick_animation.Tpo" "$(DEPDIR)/quick_animation.Po"; else rm -f "$(DEPDIR)/quick_animation.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/quick_animation.cc' object='quick_animation.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/quick_animation.Po' tmpdepfile='$(DEPDIR)/quick_animation.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o quick_animation.o `test -f 'lib/graphics/particles/quick_animation.cc' || echo '$(srcdir)/'`lib/graphics/particles/quick_animation.cc
+
+quick_animation.obj: lib/graphics/particles/quick_animation.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT quick_animation.obj -MD -MP -MF "$(DEPDIR)/quick_animation.Tpo" -c -o quick_animation.obj `if test -f 'lib/graphics/particles/quick_animation.cc'; then $(CYGPATH_W) 'lib/graphics/particles/quick_animation.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/quick_animation.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/quick_animation.Tpo" "$(DEPDIR)/quick_animation.Po"; else rm -f "$(DEPDIR)/quick_animation.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/quick_animation.cc' object='quick_animation.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/quick_animation.Po' tmpdepfile='$(DEPDIR)/quick_animation.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o quick_animation.obj `if test -f 'lib/graphics/particles/quick_animation.cc'; then $(CYGPATH_W) 'lib/graphics/particles/quick_animation.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/quick_animation.cc'; fi`
 
 base_object.o: lib/lang/base_object.cc

orxonox/trunk/src/lib/graphics/particles/quick_animation.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "quick_animation.h"
+
+#include "compiler.h"
+#include "debug.h"
+#ifndef NULL
+#define NULL 0
+#endif
+
 
 using namespace std;
@@ -23 +30 @@
 /**
    \brief standard constructor
-   \todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass () 
+QuickAnimation::QuickAnimation (float rangeStart, float valueStart, float rangeEnd, float valueEnd)
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass"); 
+   this->setClassName("QuickAnimation");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_list.h eg. CL_NEW_CLASS
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
+   this->first = this->current = new QuickKeyFrame;
+   this->current->positionStart = rangeStart;
+   this->current->positionEnd = rangeEnd;
+   this->current->valueStart = valueStart;
+   this->current->valueEnd = valueEnd;
+   this->current->next = NULL;
 }
 
@@ -46 +48 @@
 
 */
-ProtoClass::~ProtoClass () 
+QuickAnimation::~QuickAnimation () 
 {
-  // delete what has to be deleted here
+  this->current = this->first;
+  QuickKeyFrame delKF;
+  
+  while (this->current != NULL)
+    {
+      this->first = this->current->next;
+      delete this->current;
+      this->current = this->first;
+    }
+
 }
+
+
+void QuickAnimation::addEntry(float position, float value)
+{
+  this->current = this->first;
+  if (position < this->current->positionStart)
+    {
+      this->current = new QuickKeyFrame;
+
+      this->current->positionStart = position;
+      this->current->positionEnd = this->first->positionStart;
+
+      this->current->valueStart = value;
+      this->current->valueEnd = this->first->valueStart;
+      
+      this->current->next = this->first;
+      this->first = this->current;
+    }
+  
+  while(this->current != NULL)
+    {
+      if (this->current->positionStart < position)
+        {
+          QuickKeyFrame* tmpKey = new QuickKeyFrame;
+          tmpKey->positionStart = position;
+          tmpKey->positionEnd = this->current->positionEnd;
+          tmpKey->valueStart = value;
+          tmpKey->valueEnd = this->current->valueEnd;
+          tmpKey->next = this->current->next;
+          
+          this->current->positionEnd = tmpKey->positionStart;
+          this->current->valueEnd = tmpKey->valueStart;
+        }
+    }
+}
+
+
+float QuickAnimation::getValue(float position)
+{
+  while (likely (this->current->positionStart > position || this->current->positionEnd < position))
+    {
+      if (likely(this->current->next != NULL))
+        this->current = this->current->next;
+      else
+        {
+          if (unlikely(this->first->positionStart > position))
+            {
+              PRINTF(2)("Position out of range. chose %f, min is: %f, max is\n", position, this->first->positionStart, this->current->positionEnd);
+              return 0;
+            }
+          this->current = this->first;
+        }
+    }
+  return this->current->valueStart + (this->current->positionEnd - position) *
+    (this->current->valueEnd - this->current->valueStart) /
+    (this->current->positionEnd - this->current->positionStart);
+}
+

orxonox/trunk/src/lib/graphics/particles/quick_animation.h

@@ -1 +1 @@
 /*! 
-    \file proto_class.h
-    \brief Definition of ...
+    \file quick_animation.h
+    \brief Definition of the QuickAnimation-class
 
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _QUICK_ANIMATION_H
+#define _QUICK_ANIMATION_H
 
 #include "base_object.h"
@@ -14 +14 @@
 
 
-//! A class for ...
-class ProtoClass : public BaseObject {
+
+//! A class for that linearely interpolates between multiple values.
+/**
+   to be quick this only has the capability to store very little date
+
+   this class is optimized for a raising value. eg. 100 particles sorted
+   by age.
+*/
+class QuickAnimation : public BaseObject {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  //! a simple struct that stores keyframes for the QuickAnimation-Class.
+  struct QuickKeyFrame
+  {
+    float valueStart;       //!< The starting value of this KeyFrame
+    float valueEnd;         //!< The end value of this KeyFrame
+    float positionStart;    //!< The starting position of this KeyFrame
+    float positionEnd;      //!< The end position of thies KeyFrame
 
+    QuickKeyFrame* next;    //!< The next Animation
+  };
+
+  QuickAnimation(float rangeStart = 0.0, float valueStart = 0.0, float rangeEnd = 1.0, float valueEnd = 0.0);
+  virtual ~QuickAnimation();
+
+  void addEntry(float position, float value);
+
+  float getValue(float position);
 
  private:
+  QuickKeyFrame* first;
+  QuickKeyFrame* current;
 
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _QUICK_ANIMATION_H */