Changeset 4245 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

May 20, 2005, 11:28:43 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: merged back the md2_loader branche manualy (a full merge was impossible).

File:

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

orxonox/trunk/src/story_entities/world.cc

@@ -33 +33 @@
 #include "skybox.h"
 #include "satellite.h"
+#include "test_entity.h"
 #include "terrain.h"
 #include "light.h"
@@ -41 +42 @@
 #include "animation_player.h"
 #include "particle_engine.h"
+#include "graphics_engine.h"
 
 #include "command_node.h"
@@ -50 +52 @@
 
 #include "substring.h"
+
+
 
 using namespace std;
@@ -199 +203 @@
 
   delete WorldInterface::getInstance();
-
   delete this->nullParent;
   delete this->entities;
@@ -206 +209 @@
   delete this->particleEngine;
   TextEngine::getInstance()->flush();
-
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
   //delete garbagecollecor
@@ -258 +260 @@
   this->localCamera = new Camera();
   this->localCamera->setName ("camera");
+  
+  GraphicsEngine::getInstance()->displayFPS(true);
 }
 
@@ -388 +392 @@
   this->localPlayer->addChild (this->localCamera);
       
+
   lightMan->setAmbientColor(.1,.1,.1);
   lightMan->addLight();
@@ -395 +400 @@
   //  lightMan->setPosition(20, 10, -20);
   //  lightMan->setDiffuseColor(0,0,0);
-  lightMan->debug();
+  //lightMan->debug();
   lightMan->setPosition(-5.0, 10.0, -40.0);
   
@@ -416 +421 @@
   glNewList (objectList, GL_COMPILE);
   
-  trackManager->drawGraph(.01);
-  trackManager->debug(2);
+
+  //trackManager->drawGraph(.01);
+  //trackManager->debug(2);
   glEndList();
 
@@ -423 +429 @@
   terrain->setRelCoor(Vector(0,-10,0));
   this->spawn(terrain);
+
 
 
@@ -434 +441 @@
   
   particleEngine->addConnection(emitter, system);
-}
+
+  WorldEntity* testEntity = new TestEntity();
+  //testEntity->setRelCoor(Vector(570, 10, -15));
+  testEntity->setRelCoor(Vector(25, -10, -20));
+  testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
+  this->spawn(testEntity);
+  this->localPlayer->addChild(testEntity);
+}
+
 
 void World::loadDebugWorld(int worldID)
@@ -1136 +1151 @@
       this->trackManager->tick(this->dt);
       this->localCamera->tick(this->dt);
+      AnimationPlayer::getInstance()->tick(this->dtS);
+
+      particleEngine->tick(this->dtS);
       this->garbageCollector->tick(this->dtS);
-
-      AnimationPlayer::getInstance()->tick(this->dtS);
-      particleEngine->tick(this->dtS);
+          
+      /* actualy the Graphics Engine should tick the world not the other way around...
+         but since we like the things not too complicated we got it this way around
+         until there is need or time to do it the other way around.
+         \todo: GraphicsEngine ticks world: separation of processes and data...
+      */
+      GraphicsEngine::getInstance()->tick(this->dtS);
     }
   this->lastFrame = currentFrame;