Changeset 3738 in orxonox.OLD

Timestamp:

Apr 7, 2005, 12:11:44 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: simpleanimation is on the way to support more than one world entity it is bound to… does not yet work, and may crash in segfault.

Location:

orxonox/trunk

Files:

• ToDo (modified) (1 diff)
• src/simple_animation.cc (modified) (3 diffs)
• src/simple_animation.h (modified) (4 diffs)

orxonox/trunk/ToDo

@@ -5 +5 @@
 --------
 
-- perspective change: smooth glide back in zero mode (pb)
-- efficency in garbage collection ShootLaser
-- player speed, *speed setting smoother (now taking current fps rate): average
+#define "objModel.h" has nothing todo in world_entity.h
+
+Collision Detection: SetObjectCollisionBox( void );
 
 
-./configure
------------
-- if dri is not supported glxinfo returns "Xlib:  extension "XFree86-DRI" missing on display ":0.0"." -> this message should not be shown on the console!
 
-

orxonox/trunk/src/simple_animation.cc

@@ +1 @@
+
 
 
@@ -45 +46 @@
    this->setClassName ("SimpleAnimation");
    this->frames = new tList<KeyFrame>();
+   this->animators = new tList<Animation>();
    this->localTime = 0;
    this->bRunning = false;
@@ -254 +256 @@
 void SimpleAnimation::tick(float time)
 {
-  if( !this->bRunning)
-    return;
-
   this->localTime += time;
-  /* first get the current frame via time-stamps */ 
-  while( this->localTime > this->currentFrame->time)
-    {
-      printf("SimpleAnimation::tick(...) - changing Frame\n");
-      this->localTime -= this->currentFrame->time;
-
-      //this->currentFrame->object->setRelCoor(*this->currentFrame->position);
-      *this->lastPosition = *this->currentFrame->position;
-
-      this->lastFrame = this->currentFrame;
-      this->currentFrame = this->frames->nextElement(this->currentFrame);
-      this->mode = this->currentFrame->mode;
-      if( this->mode == NEG_EXP)
+  tIterator<Animation>* iterator = this->animators->getIterator();
+  Animation* anim = iterator->nextElement();
+  while( anim != NULL)
+    {
+      if( anim->bRunning)
         {
-          *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-          deltaT = 1/this->currentFrame->time * logf(1.0 + 600.0/this->tmpVect->len());
+          
+          
+          /* first get the current frame via time-stamps */ 
+          while( this->localTime > anim->currentFrame->time)
+            {
+              printf("SimpleAnimation::tick(...) - changing Frame\n");
+              
+              //this->currentFrame->object->setRelCoor(*this->currentFrame->position);
+              *anim->lastPosition = *anim->currentFrame->position;
+              
+              anim->lastFrame = anim->currentFrame;
+              anim->currentFrame = anim->frames->nextElement(anim->currentFrame);
+              anim->movMode = anim->currentFrame->mode;
+              if( anim->movMode == NEG_EXP)
+                {
+                  *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+                  anim->deltaT = 1/anim->currentFrame->time * logf(1.0 + 600.0/anim->tmpVect->len());
+                }
+            }
+          
+          /* now animate it */
+          switch( anim->movMode)
+            {
+            case LINEAR:
+              
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * this->localTime / anim->currentFrame->time;
+              anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
+              *anim->lastPosition = *anim->tmpVect;
+              break;
+            case EXP:
+              
+              break;
+            case NEG_EXP:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * (1 - exp(- this->localTime * anim->deltaT));     
+              anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
+              *anim->lastPosition = *anim->tmpVect;
+              break;
+            case SIN:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / anim->currentFrame->time));     
+              anim->currentFrame->object->setRelCoor(*anim->lastFrame->position + *anim->tmpVect);
+              *anim->lastPosition = *anim->tmpVect;
+              break;
+            case COS:
+              
+              break;
+            case QUADRATIC:
+              *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
+              *anim->tmpVect = *anim->tmpVect * 1/3 * ldexpf(this->localTime, 3);
+              break;
+            default:
+              break;
+            }
         }
-    }
-
-  /* now animate it */
-  switch( this->mode)
-    {
-    case LINEAR:
-
-      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-      *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
-      this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
-      *this->lastPosition = *this->tmpVect;
-      break;
-    case EXP:
-      
-      break;
-    case NEG_EXP:
-      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-      *this->tmpVect = *this->tmpVect * (1 - exp(- this->localTime * this->deltaT));     
-      this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
-      *this->lastPosition = *this->tmpVect;
-      break;
-    case SIN:
-      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-      *this->tmpVect = *this->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / this->currentFrame->time));     
-      this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
-      *this->lastPosition = *this->tmpVect;
-      break;
-    case COS:
-      
-      break;
-    case QUADRATIC:
-      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-      *this->tmpVect = *this->tmpVect * 1/3 * ldexpf(this->localTime, 3);
-      break;
-    default:
-      break;
-    }
-}
+      anim = iterator->nextElement();
+    }
+  delete anim;
+}

orxonox/trunk/src/simple_animation.h

@@ -21 +21 @@
 
 typedef enum movementMode{LINEAR=0, EXP, NEG_EXP, SIN, COS, QUADRATIC};
+typedef enum animationMode{SINGLE=0, LOOP};
 #define DEFAULT_ANIMATION_MODE LINEAR
+
 
 //! KeyFrame Struct
@@ -35 +37 @@
 };
 
+//! Animation Struct
+/**
+   This represents an animation for a object
+*/
+typedef struct Animation {
+  WorldEntity* object;
+  KeyFrame* currentFrame;
+  KeyFrame* lastFrame;
+  Vector* lastPosition;
+  Vector* tmpVect;
+  tList<KeyFrame>* frames;
+  animationMode animMode;
+  movementMode movMode;
+  bool bRunning;
+  float deltaT;
+};
 
 //! Animation Class
@@ -70 +88 @@
   bool bRunning;                   //<! is set, when the animation is running
   tList<KeyFrame>* frames;         //<! where keyframes are stored in
+  tList<Animation>* animators;      //<! a list of animation's
   KeyFrame* currentFrame;          //<! the frame that is been played now
   KeyFrame* lastFrame;
@@ -79 +98 @@
   Vector* tmpVect;                 //<! this is the temporary vector save place - 
   WorldEntity* workingObject;      //<! this is a pointer to the current working object that has been selected via selectObject()
+  Animator* workingAnimator;       //<! the animator with which you are currently working
   float deltaT;                    //<! this is a time constant for the movement