Changeset 3729 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Apr 5, 2005, 11:51:15 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: simple animation is moving, but not realy what it should

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (6 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -35 +35 @@
 #include "track_manager.h"
 #include "garbage_collector.h"
+#include "simple_animation.h"
 
 #include "command_node.h"
@@ -155 +156 @@
   delete this->lightMan;
   delete this->trackManager;
+
+  //delete garbagecollecor
+  //delete animator
 }
 
@@ -188 +192 @@
   wi->init(this);
   this->garbageCollector = GarbageCollector::getInstance();
+  this->simpleAnimation = SimpleAnimation::getInstance();
 }
 
@@ -394 +399 @@
         case DEBUG_WORLD_2:
           {
+            lightMan->setAmbientColor(.1,.1,.1);
+            lightMan->addLight();
             lightMan->setPosition(-5.0, 10.0, -40.0);
             this->nullParent = NullParent::getInstance ();
@@ -434 +441 @@
             this->glmis->step();
 
-            
-            WorldEntity* env = new Environment();
-            env->setName ("env");
-            this->spawn(env);
-
+
+            WorldEntity* a = new Environment();
+            this->spawn(a, new Vector(200.0, -35.0, 5.0), new Quaternion());
+
+            WorldEntity* b = new Environment();
+            this->localPlayer->addChild(b);
+            b->setRelCoor(new Vector(10.0, 0.0, 0.0));
+            this->spawn(b);
            
+            this->simpleAnimation = SimpleAnimation::getInstance();
+
+            /*
+              frame->position = point;
+              frame->orientation = orientation;
+              frame->time = time;
+              frame->mode = DEFAULT_ANIMATION_MODE;
+            */
+
+            KeyFrame* f1 = new KeyFrame;
+            f1->position = new Vector(10.0, 1.0, 1.0);
+            f1->direction = new Quaternion();
+            f1->time = 1.0;
+            f1->mode = LINEAR;
+
+
+            KeyFrame* f2 = new KeyFrame;
+            f2->position = new Vector(10.0, 1.0, -1.0);
+            f2->direction = new Quaternion();
+            f2->time = 1.0;
+            f2->mode = LINEAR;
+
+            this->simpleAnimation->animatorBegin();
+            this->simpleAnimation->selectObject(b);
+            this->simpleAnimation->addKeyFrame(f1);
+            this->simpleAnimation->addKeyFrame(f2);
+            this->simpleAnimation->animatorEnd();
+
+            this->simpleAnimation->start();
+
             /*
             Vector* es = new Vector (10, 5, 0);
@@ -850 +890 @@
       this->localCamera->tick(this->dt);
       this->garbageCollector->tick(seconds);
+      this->simpleAnimation->tick(seconds);
     }
   this->lastFrame = currentFrame;