Changeset 3731 in orxonox.OLD

Timestamp:

Apr 6, 2005, 12:44:49 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: animation player now works for two keyframes.

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• simple_animation.cc (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)

orxonox/trunk/src/orxonox.cc

@@ -723 +723 @@
       printf(" Removing 1st reference from list:\t%11.2f\n", mi);
       
-      
+
+      printf("\nList operations tests: \t\t\t\t\t%i\n", LIST_MAX);
+      list = new tList<char>();
+      printf(" Adding[1..10] elements to list, found:\n");
+      list->add("1");
+      list->add("2");
+      list->add("3");
+      list->add("4");
+      list->add("5");
+      list->add("6");
+      list->add("7");
+      list->add("8");
+      list->add("9");
+      list->add("10");
+      
+      /*give list out */
+      iterator = list->getIterator();
+      name = iterator->nextElement();
+      printf("  List Elements: \t\t");
+      while( name != NULL)
+        {
+          printf("%s,", name);
+          name = iterator->nextElement();
+        }
+      delete iterator;
+      printf("\n");
+      
+      
+      int c = 0;
+      printf(" Going trough list with nextElement(el) func: ");
+      name = list->firstElement();
+      while(c < 20)
+        {
+          printf("%s,", name);
+          name = list->nextElement(name);
+          c++;
+        }
+      printf("\n");
+      
+
       
     }

orxonox/trunk/src/simple_animation.cc

@@ -275 +275 @@
     case LINEAR:
 
-      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
+      *this->tmpVect = *this->lastFrame->position - *this->currentFrame->position;
       *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
-      this->currentFrame->object->shiftCoor(*this->tmpVect - *this->lastPosition);
+      //this->currentFrame->object->shiftCoor(*this->tmpVect - *this->lastPosition);
+      this->currentFrame->object->setRelCoor(*this->currentFrame->position + *this->tmpVect);
       *this->lastPosition = *this->tmpVect;
+      //printf("shift vector: ");this->lastPosition->debug();
       break;
     case EXP:

orxonox/trunk/src/story_entities/world.cc

@@ -443 +443 @@
 
 
+            /*
             WorldEntity* a = new Environment();
             this->localPlayer->addChild(a);
             a->setRelCoor(new Vector(10.0, 2.0, 1.0));
             this->spawn(a);
-
+            */
 
             WorldEntity* b = new Environment();
@@ -454 +455 @@
             this->spawn(b);
 
+            /*
             WorldEntity* c = new Environment();
             this->localPlayer->addChild(c);
             c->setRelCoor(new Vector(10.0, 2.0, -1.0));
             this->spawn(c);
-
+            */
            
             this->simpleAnimation = SimpleAnimation::getInstance();
@@ -482 +484 @@
             f2->mode = LINEAR;
 
+            KeyFrame* f3 = new KeyFrame;
+            f3->position = new Vector(10.0, 0.0, -1.0);
+            f3->direction = new Quaternion();
+            f3->time = 1.0;
+            f3->mode = LINEAR;
+
+
             this->simpleAnimation->animatorBegin();
             this->simpleAnimation->selectObject(b);
             this->simpleAnimation->addKeyFrame(f1);
             this->simpleAnimation->addKeyFrame(f2);
+            //this->simpleAnimation->addKeyFrame(f3);
+            //this->simpleAnimation->addKeyFrame(f2);
             this->simpleAnimation->animatorEnd();