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

Timestamp:

Dec 17, 2005, 5:56:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: cleanup of the world begin

File:

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

trunk/src/story_entities/world.cc

@@ -20 +20 @@
 
 #include "shell_command.h"
-
+#include "resource_manager.h"
 #include "state.h"
 
 #include "p_node.h"
-#include "pilot_node.h"
 #include "world_entity.h"
 #include "player.h"
 #include "camera.h"
 #include "environment.h"
-#include "skysphere.h"
-#include "skybox.h"
-#include "satellite.h"
+
 #include "test_entity.h"
 #include "terrain.h"
@@ -91 +88 @@
 
 /**
-  *  create a new World
-
-    This creates a new empty world!
-*/
-World::World (const char* name)
-{
-  this->path = NULL;
-  this->constuctorInit(name, -1);
-}
-
-/**
- *  creates a new World...
- * @param worldID with this ID
-*/
-World::World (int worldID)
-{
-  this->path = NULL;
-  this->constuctorInit(NULL, worldID);
-}
-
-/**
  *  remove the World from memory
-
-    delete everything explicitly, that isn't contained in the parenting tree!
-    things contained in the tree are deleted automaticaly
+ *
+ *  delete everything explicitly, that isn't contained in the parenting tree!
+ *  things contained in the tree are deleted automaticaly
  */
 World::~World ()
@@ -150 +126 @@
   // unload the resources !!
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
-
-  delete[] this->path;
 }
 
@@ -170 +144 @@
 
   this->setName(name);
-  this->debugWorldNr = worldID;
   this->gameTime = 0.0f;
   this->setSpeed(1.0);
@@ -232 +205 @@
 /**
  *  loads the World by initializing all resources, and set their default values.
-*/
+ */
 ErrorMessage World::load()
 {
@@ -242 +215 @@
     {
       PRINTF(1)("World has no path specified for loading");
-      this->loadDebugWorld(this->getStoryID());
       return (ErrorMessage){213,"Path not specified","World::load()"};
     }
@@ -330 +302 @@
           //todo do this more elegant
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
-            sky = dynamic_cast<SkyBox*>(created);
+            this->sky = dynamic_cast<WorldEntity*>(created);
           if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
           {
@@ -382 +354 @@
   }
 
-  // initialize debug coord system
-  objectList = glGenLists(1);
-  glNewList (objectList, GL_COMPILE);
-
-  glEndList();
-
   SoundEngine::getInstance()->setListener(this->localCamera);
 
@@ -418 +384 @@
 
 
-
-/**
- * creates a debug world: only for experimental stuff
-*/
-void World::loadDebugWorld(int worldID)
-{
-  /*monitor progress*/
-  this->glmis->step();
-  // stuff beyond this point remains to be loaded properly
-
-  // LIGHT initialisation
-  LightManager::getInstance()->setAmbientColor(.1,.1,.1);
-//  LightManager::getInstance()->addLight();
-  LightManager::getInstance()->debug();
-
-  switch(this->debugWorldNr)
-    {
-      /*
-        this loads the hard-coded debug world. this only for simplicity and will be
-        removed by a reald world-loader, which interprets a world-file.
-        if you want to add an own debug world, just add a case DEBUG_WORLD_[nr] and
-        make whatever you want...
-      */
-    case DEBUG_WORLD_0:
-      {
-        LightManager::getInstance()->getLight()->setAbsCoor(-5.0, 10.0, -40.0);
-        /*monitor progress*/
-        this->glmis->step();
-
-        // bind camera
-        this->localCamera = new Camera();
-        this->localCamera->setName ("camera");
-        /*monitor progress*/
-        this->glmis->step();
-
-
-        // Create SkySphere
-        this->sky = new Skysphere("pictures/sky-replace.jpg");
-        this->sky->setName("SkySphere");
-        this->spawn(this->sky);
-        this->localCamera->addChild(this->sky);
-        this->sky->setParentMode(PNODE_MOVEMENT);
-        /*monitor progress*/
-        this->glmis->step();
-
-
-        terrain = new Terrain("worlds/newGround.obj");
-        terrain->setRelCoor(Vector(0,-10,0));
-        this->spawn(terrain);
-        /*monitor progress*/
-        this->glmis->step();
-
-        this->glmis->step();
-        break;
-      }
-    case DEBUG_WORLD_1:
-      {
-
-        break;
-      }
-    case DEBUG_WORLD_2:
-      {
-
-        break;
-      }
-    default:
-      break;
-    }
-}
-
 /**
  *  initializes a new World shortly before start
@@ -501 +397 @@
   PNode::getNullParent()->updateNode (0.001f);
   PNode::getNullParent()->updateNode (0.001f);
-
 }
 
@@ -507 +402 @@
 /**
  *  starts the World
-*/
+ */
 ErrorMessage World::start()
 {
-  PRINTF(3)("World::start() - starting current World: nr %i\n", this->debugWorldNr);
   this->bQuitOrxonox = false;
   this->bQuitCurrentGame = false;
@@ -566 +460 @@
 
 /**
- *  removes the loadscreen, and changes over to the game
-
-   @todo take out the delay
+ * @brief removes the loadscreen, and changes over to the game
+ *
+ * @todo take out the delay
 */
 void World::releaseLoadScreen ()
@@ -588 +482 @@
 }
 
-/**
-  \brief main loop of the world: executing all world relevant function
-
-  in this loop we synchronize (if networked), handle input events, give the heart-beat to
-  all other member-entities of the world (tick to player, enemies etc.), checking for
-  collisions drawing everything to the screen.
-*/
-void World::mainLoop()
-{
-  this->lastFrame = SDL_GetTicks ();
-  PRINTF(3)("World::mainLoop() - Entering main loop\n");
-
-  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* @todo implement pause */
-    {
-      ++this->cycle;
-      // Network
-      this->synchronize ();
-      // Process input
-      this->handleInput ();
-      if( this->bQuitCurrentGame || this->bQuitOrxonox)
-          break;
-      // Process time
-      this->tick ();
-      // Process collision
-      this->collide ();
-      // Update the state
-      this->update ();
-      // Draw
-      this->display ();
-    }
-
-  PRINTF(3)("World::mainLoop() - Exiting the main loop\n");
-}
 
 
@@ -786 +647 @@
 //   }
 
-  glCallList (objectList);
-
   ParticleEngine::getInstance()->draw();
 
@@ -797 +656 @@
 }
 
+
+/**
+ * \brief main loop of the world: executing all world relevant function
+ *
+ * in this loop we synchronize (if networked), handle input events, give the heart-beat to
+ * all other member-entities of the world (tick to player, enemies etc.), checking for
+ * collisions drawing everything to the screen.
+ */
+void World::mainLoop()
+{
+  this->lastFrame = SDL_GetTicks ();
+  PRINTF(3)("World::mainLoop() - Entering main loop\n");
+
+  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* @todo implement pause */
+  {
+    ++this->cycle;
+      // Network
+    this->synchronize ();
+      // Process input
+    this->handleInput ();
+    if( this->bQuitCurrentGame || this->bQuitOrxonox)
+      break;
+      // Process time
+    this->tick ();
+      // Process collision
+    this->collide ();
+      // Update the state
+    this->update ();
+      // Draw
+    this->display ();
+  }
+
+  PRINTF(3)("World::mainLoop() - Exiting the main loop\n");
+}
+
+
+
 /**
  *  add and spawn a new entity to this world
@@ -805 +701 @@
 //   this->entities->add (entity);
   entity->postSpawn ();
-}
-
-
-/**
- *  add and spawn a new entity to this world
- * @param entity to be added
- * @param absCoor At what coordinates to add this entity.
- * @param absDir In which direction should it look.
-*/
-void World::spawn(WorldEntity* entity, Vector* absCoor, Quaternion* absDir)
-{
-//   this->entities->add (entity);
-
-  entity->setAbsCoor (*absCoor);
-  entity->setAbsDir (*absDir);
-
-  entity->postSpawn ();
-}
-
-
-/**
- *  add and spawn a new entity to this world
- * @param entity to be added
- * @param entity to be added to (PNode)
- * @param At what relative  coordinates to add this entity.
- * @param In which relative direction should it look.
-*/
-void World::spawn(WorldEntity* entity, PNode* parentNode,
-                  Vector* relCoor, Quaternion* relDir)
-{
-  if( parentNode != NULL)
-    {
-      parentNode->addChild (entity);
-
-      entity->setRelCoor (*relCoor);
-      entity->setRelDir (*relDir);
-
-//       this->entities->add (entity);
-
-      entity->postSpawn ();
-    }
 }