Changeset 4721 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jun 27, 2005, 3:00:53 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some md2 models jumping around the vulcano

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• subprojects/collision_detection/collision_detection.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -569 +569 @@
   //    new PhysicsConnection(this->localPlayer, gravity);
 
-  TestEntity* testEntity = new TestEntity();
-  testEntity->setRelCoor(Vector(570, 10, -15));
-  testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-  this->spawn(testEntity);
+//   TestEntity* testEntity = new TestEntity();
+//   testEntity->setRelCoor(Vector(570, 10, -15));
+//   testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
+//   this->spawn(testEntity);
 
   TestEntity* testEntity2 = new TestEntity();
   testEntity2->setAnim(RUN);
-  testEntity2->setRelCoor(Vector(570, 30, 15));
+  testEntity2->setRelCoor(Vector(2400, 25, 260));
   testEntity2->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
   this->spawn(testEntity2);
 
-
-  new PhysicsConnection(testEntity, gravity);
+  TestEntity* testEntity3 = new TestEntity();
+  testEntity3->setAnim(JUMP);
+  testEntity3->setRelCoor(Vector(2400, 25, 280));
+  testEntity3->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
+  this->spawn(testEntity3);
+
+  TestEntity* testEntity4 = new TestEntity();
+  testEntity4->setAnim(RUN);
+  testEntity4->setRelCoor(Vector(2430, 25, 250));
+  testEntity4->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
+  this->spawn(testEntity4);
+
+
+//   new PhysicsConnection(testEntity, gravity);
 
   // printing out some debug stuff

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -239 +239 @@
   while( entity != NULL)
   {
-    if(unlikely(animateModel))
+    if( unlikely(animateModel))
       entity->tick(dt);
     entity = iterator->nextElement();