Changeset 3743 in orxonox.OLD for orxonox

Timestamp:

Apr 7, 2005, 2:57:33 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: SimpleAnimation - work is progressing

File:

• orxonox/trunk/src/simple_animation.cc (modified) (13 diffs)

orxonox/trunk/src/simple_animation.cc

@@ -97 +97 @@
 {
   this->workingObject = NULL;
+  this->workingAnimator = NULL;
   this->bDescriptive = false;
 }
@@ -117 +118 @@
 void SimpleAnimation::selectObject(WorldEntity* entity)
 {
+  printf("SimpleAnimation::selectObject() - selecing active object\n");
   Animation* anim = getAnimationFromWorldEntity(entity);
   if( anim == NULL)
@@ -125 +127 @@
       anim->lastPosition = new Vector();
       anim->tmpVect = new Vector();
-      frames = new tList<KeyFrame>();
+      anim->frames = new tList<KeyFrame>();
       bRunning = false;
       deltaT = 0.0;
       this->animators->add(anim);
     }
+  else 
+    printf("SimpleAnimation::selectObject() - animation already existent, using it\n");
   this->workingAnimator = anim;
+  printf("SimpleAnimation::selectObject() - selection completed\n");
 }
 
@@ -143 +148 @@
 void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* direction, float time)
 {
-  if( !this->bDescriptive)
+  if( !this->bDescriptive || this->workingAnimator == NULL)
     {
       PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
@@ -153 +158 @@
   frame->time = time;
   frame->mode = DEFAULT_ANIMATION_MODE;
-  frame->object = this->workingObject;
-  this->frames->add(frame);
+  frame->object = this->workingAnimator->object;
+  this->workingAnimator->frames->add(frame);
 }
 
@@ -167 +172 @@
 void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode)
 {
-  if( !this->bDescriptive)
+  if( !this->bDescriptive || this->workingAnimator == NULL)
     {
       PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
@@ -177 +182 @@
   frame->time = time;
   frame->mode = mode;
-  frame->object = this->workingObject;
-  this->frames->add(frame);
+  frame->object = this->workingAnimator->object;
+  this->workingAnimator->frames->add(frame);
 }
 
@@ -187 +192 @@
 void SimpleAnimation::addKeyFrame(KeyFrame* frame)
 {
-  if( !this->bDescriptive)
+  printf("SimpleAnimation::addKeyFrame() - adding frame\n");
+  if( !this->bDescriptive || this->workingAnimator == NULL)
     {
       PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
       return;
     }
-  frame->object = this->workingObject;
-  this->frames->add(frame);
+  frame->object = this->workingAnimator->object;
+  this->workingAnimator->frames->add(frame);
+  printf("SimpleAnimation::addKeyFrame() - addition completed\n");
 }
 
@@ -202 +209 @@
 void SimpleAnimation::reset()
 {
+  /*
   tIterator<KeyFrame>* iterator = this->frames->getIterator();
   KeyFrame* frame = iterator->nextElement(); 
@@ -218 +226 @@
   this->currentFrame = NULL;
   this->lastFrame = NULL;
+  */
 }
 
@@ -232 +241 @@
   
   this->localTime = 0;
-  this->lastFrame = this->frames->firstElement();
-  this->currentFrame = this->frames->nextElement(this->currentFrame);
+
+  /*
+  tIterator<Animation>* iterator = this->animators->getIterator();
+  Animation* anim = iterator->nextElement();
+  while( anim != NULL)
+    {
+      printf("SimpleAnimation::start() - initializing an animaion\n");
+      anim->currentFrame = anim->frames->firstElement();
+      anim->lastFrame = anim->frames->nextElement(anim->currentFrame);
+      anim = iterator->nextElement();
+    }
+  */
+
   this->bRunning = true;
 }
@@ -252 +272 @@
 {
   this->localTime = 0;
-  this->lastFrame = this->frames->firstElement();
-  this->currentFrame = this->frames->nextElement(this->currentFrame);
+  //this->lastFrame = this->frames->firstElement();
+  //this->currentFrame = this->frames->nextElement(this->currentFrame);
   this->bRunning = true;
 }
@@ -285 +305 @@
     {
       if( anim->bRunning)
-        {
-          
+        { 
           
           /* first get the current frame via time-stamps */