Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/story_entities

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

Location:

orxonox/branches/levelloader/src/story_entities

Files:

• campaign.cc (modified) (7 diffs)
• campaign.h (modified) (2 diffs)
• story_entity.cc (modified) (2 diffs)
• story_entity.h (modified) (2 diffs)
• world.cc (modified) (21 diffs)
• world.h (modified) (6 diffs)

orxonox/branches/levelloader/src/story_entities/campaign.cc

@@ -18 +18 @@
 
 #include "campaign.h"
+
+#include "story_entity.h"
+
 #include "world.h"
 #include "camera.h"
-#include "story_entity.h"
 #include "factory.h"
 #include "game_loader.h"
 
+#include "list.h"
+
 using namespace std;
 
@@ -30 +34 @@
 Campaign::Campaign () 
 {
-  this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 }
+
 
 Campaign::~Campaign () {}
@@ -47 +52 @@
         GameLoader* loader = GameLoader::getInstance();
         
-  this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
   
@@ -106 +111 @@
     {
       se->displayLoadScreen();
+      se->preLoad();
       se->load();
       se->init();
@@ -232 +238 @@
   if( storyID == WORLD_ID_GAMEEND)
     return NULL;
-  ListTemplate<StoryEntity>* l;
+
+  /*
+  tList<StoryEntity>* l;
   StoryEntity* entity = NULL;
   l = this->entities->getNext();  
@@ -239 +247 @@
       entity = l->getObject();
       l = l->getNext();
+
       int id = entity->getStoryID();
       //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
@@ -246 +255 @@
           return entity;
         }
-    }
+
+    }
+  */
+
+
+
+  StoryEntity* entity = this->entities->enumerate();
+  while( entity != NULL) 
+    { 
+      int id = entity->getStoryID();
+      //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
+      if(id == storyID)
+        {
+          //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
+          return entity;
+        }
+      entity = this->entities->nextElement();
+    }
+
+
+
   return NULL;
 }

orxonox/branches/levelloader/src/story_entities/campaign.h

@@ -8 +8 @@
 
 class World;
+template<class T> class tList;
 
 class Campaign : public StoryEntity {
@@ -34 +35 @@
 
  private:
-  ListTemplate<StoryEntity>* entities;
+  //ListTemplate<StoryEntity>* entities;
+  tList<StoryEntity>* entities;
   bool running;
 

orxonox/branches/levelloader/src/story_entities/story_entity.cc

@@ -72 +72 @@
 
 
+/**
+   \brief stuff that will have to be initialized before load
+
+   this gives all storyentities the possibility to init stuff before the
+   load function, where all the stuff is been made ready for start
+*/
+ErrorMessage StoryEntity::preLoad()
+{}
+
+/** 
+    \brief loads the current entity
+
+    this is here to enable you loading maps into the entities. for all other actions you
+    should take the init() function.
+    load() is exec before init()
+*/
+ErrorMessage StoryEntity::load()
+{}
+
+
 /** 
     \brief initialize the entity before use. 
@@ -78 +98 @@
     After execution of this function, the Entity is ready to be played/executed, 
     this shifts the initialisation work before the execution - very important...
+    init() is exec shortly before start()
 */
 ErrorMessage StoryEntity::init()
 {}
 
-
-/** 
-    \brief loads the current entity
-
-    this is here to enable you loading maps into the entities. for all other actions you
-    should take the init() function.
-*/
-ErrorMessage StoryEntity::load()
-{}
 
 /** 

orxonox/branches/levelloader/src/story_entities/story_entity.h

@@ -8 +8 @@
 #define _STORY_ENTITY_H
 
-#include "stdincl.h"
+#include "base_object.h"
 
 #include "story_def.h"
+#include "error.h"
+
 
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...
@@ -23 +25 @@
   bool isPaused; //! is true if the entity is paused
 
+  virtual ErrorMessage preLoad();
   virtual ErrorMessage load();
   virtual ErrorMessage init();

orxonox/branches/levelloader/src/story_entities/world.cc

@@ -18 +18 @@
 
 #include "world.h"
-#include "world_entity.h"
-#include "track_manager.h"
-#include "player.h"
-#include "command_node.h"
-#include "camera.h"
-#include "environment.h"
-#include "primitive.h"
+
+#include "orxonox.h"
+
 #include "p_node.h"
 #include "null_parent.h"
 #include "helper_parent.h"
+#include "track_node.h"
+#include "world_entity.h"
+#include "player.h"
+#include "camera.h"
+#include "environment.h"
+#include "skysphere.h"
+#include "terrain.h"
+#include "light.h"
+
+#include "track_manager.h"
+#include "garbage_collector.h"
+#include "simple_animation.h"
+
+#include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "skysphere.h"
-#include "light.h"
 #include "fontset.h"
+#include "list.h"
 #include "factory.h"
 #include "game_loader.h"
@@ -37 +46 @@
 #include "terrain.h"
 
+
+
 using namespace std;
 
 CREATE_FACTORY(World);
+
+WorldInterface* WorldInterface::singletonRef = 0;
+
+
+/**
+   \brief private constructor because of singleton
+*/
+WorldInterface::WorldInterface()
+{
+  this->worldIsInitialized = false;
+  this->worldReference = NULL;
+}
+
+/**
+   \brief public deconstructor
+*/
+WorldInterface::~WorldInterface()
+{
+  this->singletonRef = NULL;
+  this->worldIsInitialized = false;
+  this->worldReference = NULL;
+}
+
+/**
+   \brief gets the singleton instance
+   \returns singleton instance
+*/
+WorldInterface* WorldInterface::getInstance()
+{
+  if( singletonRef == NULL)
+    singletonRef = new WorldInterface();
+  return singletonRef;
+}
+
+
+/**
+   \brief initializes the interface
+   \param reference to the world
+
+   if the worldinterface is not initilizes, there wont be any 
+   useable interface
+*/
+void WorldInterface::init(World* world)
+{
+  this->worldReference = world;
+  if( world != NULL)
+    {
+      this->worldIsInitialized = true;
+      PRINTF(3)("WorldInterface up and running\n");
+    }
+}
+
+
+/**
+   \brief gets the entity list from the world
+   \return entity list
+*/
+tList<WorldEntity>* WorldInterface::getEntityList()
+{
+  if( this->worldIsInitialized)
+    return this->worldReference->getEntities();
+  PRINT(1)("Someone tried to use the WorldInterface before it has been initizlized! this can result in SEGFAULTs!\n");
+  return NULL;
+}
+
+
 
 World::World( TiXmlElement* root)
@@ -110 +187 @@
   cn->reset();
 
+  ResourceManager::getInstance()->debug();
+  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
+  ResourceManager::getInstance()->debug();
+
+  delete WorldInterface::getInstance();
+
   delete this->nullParent;
   delete this->entities;
@@ -116 +199 @@
   if( this->worldName) delete this->worldName;
   if( this->path) delete this->path;
-}
-
-/**
-   \brief initializes a new World
+
+  //delete garbagecollecor
+  //delete animator
+}
+
+/**
+   \brief initializes the world. 
+
+   set all stuff here that is world generic and does not use to much memory
+   because the real init() function StoryEntity::init() will be called
+   shortly before start of the game.  
+   since all worlds are initiated/referenced before they will be started.
+   NO LEVEL LOADING HERE - NEVER!
 */
 void World::init(char* name, int worldID)
@@ -128 +220 @@
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
-
-  // Enable default GL stuff
-  glEnable(GL_DEPTH_TEST);
-
+}
+
+
+/**
+   \brief this is executed before load
+
+   since the load function sometimes needs data, that has been init before
+   the load and after the proceeding storyentity has finished
+*/
+ErrorMessage World::preLoad()
+{
+  /* init the world interface */
+  WorldInterface* wi = WorldInterface::getInstance();
+  wi->init(this);
+  this->garbageCollector = GarbageCollector::getInstance();
+  this->simpleAnimation = SimpleAnimation::getInstance();
 }
 
@@ -153 +257 @@
         // load the campaign document
         if( !XMLDoc->LoadFile())
+      this->glmis->step();
 
         {
@@ -257 +362 @@
     
         // bind camera
-    this->localCamera = new Camera(this);
+    this->localCamera = new Camera();
     this->localCamera->setName ("camera");
-    this->localCamera->bind (localPlayer);
+    //this->localCamera->bind (localPlayer);
     this->localPlayer->addChild (this->localCamera);
 
@@ -267 +372 @@
       /*monitor progress*/
   //  this->glmis->step();
+
+      // LIGHT initialisation
+      lightMan = LightManager::getInstance();
+      lightMan->setAmbientColor(.1,.1,.1);
+      lightMan->addLight();
+      //      lightMan->setAttenuation(1.0, .01, 0.0);
+      //      lightMan->setDiffuseColor(1,1,1);
+      //  lightMan->addLight(1);
+      //  lightMan->setPosition(20, 10, -20);
+      //  lightMan->setDiffuseColor(0,0,0);
+      lightMan->debug();
+            lightMan->setPosition(-5.0, 10.0, -40.0);
+
 
             // Create SkySphere
@@ -274 +392 @@
             this->skySphere->setMode(PNODE_MOVEMENT);
 
-            /*monitor progress*/
-          //  this->glmis->step();
-          
-          //  trackManager->setBindSlave(env);
+
+            //      trackManager->setBindSlave(env);
+            PNode* tn = trackManager->getTrackNode();
+            tn->addChild(this->localPlayer);
+
+            //localCamera->setParent(TrackNode::getInstance());
+            tn->addChild(this->localCamera);
+            //      localCamera->lookAt(tn);
+            this->localPlayer->setMode(PNODE_ALL);
+            //Vector* cameraOffset = new Vector (0, 5, -10);
+            //trackManager->condition(2, LEFTRIGHT, this->localPlayer);
 
   // initialize debug coord system
@@ -290 +415 @@
   terrain->setRelCoor(new Vector(0,-10,0));
   this->spawn(terrain);
-
-}
-
-/**
-   \brief initializes a new World
+}
+
+
+/**
+   \brief initializes a new World shortly before start
+
+   this is the function, that will be loaded shortly before the world is 
+   started
 */
 ErrorMessage World::init()
@@ -302 +430 @@
   cn->addToWorld(this);
   cn->enable(true);
-
 PRINTF0("> Done Loading world: '%s'\n", getPath());
 }
@@ -363 +490 @@
   this->glmis = GLMenuImageScreen::getInstance();
   this->glmis->init();
-  this->glmis->setMaximum(10);
+  this->glmis->setMaximum(8);
   this->glmis->draw();
  
@@ -378 +505 @@
   PRINTF(3)("World::releaseLoadScreen - start\n"); 
   this->glmis->setValue(this->glmis->getMaximum());
-  SDL_Delay(500);
+  //SDL_Delay(500);
   PRINTF(3)("World::releaseLoadScreen - end\n"); 
+}
+
+
+/**
+   \brief gets the list of entities from the world
+   \returns entity list
+*/
+tList<WorldEntity>* World::getEntities()
+{
+  return this->entities;
+}
+
+
+/**
+   \brief this returns the current game time
+   \returns elapsed game time
+*/
+double World::getGameTime()
+{
+  return this->gameTime;
 }
 
@@ -435 +582 @@
   glLoadIdentity();
 
-  entity = this->entities->enumerate();
+  //entity = this->entities->enumerate();
+  tIterator<WorldEntity>* iterator = this->entities->getIterator();
+  entity = iterator->nextElement();
   while( entity != NULL ) 
     { 
       if( entity->bDraw ) entity->draw();
-      entity = this->entities->nextElement();
-    } 
+      //entity = this->entities->nextElement();
+      entity = iterator->nextElement();
+    }
+  delete iterator;
   
   glCallList (objectList);
@@ -477 +628 @@
   p4->debug ();
   
-  p1->update ();
+  p1->update (0);
 
   printf ("World::debug() - update\n");
@@ -486 +637 @@
 
   p2->shiftCoor (new Vector(-1, -1, -1));
-  p1->update ();
+  p1->update (0);
 
   p1->debug ();
@@ -496 +647 @@
 
 
- p1->update ();
+ p1->update (0);
 
   p1->debug ();
@@ -593 +744 @@
   if(!this->bPause)
     {
-      Uint32 dt = currentFrame - this->lastFrame;
+      this->dt = currentFrame - this->lastFrame;
       
-      if(dt > 0)
+      if( this->dt > 0)
         {
           float fps = 1000/dt;
@@ -607 +758 @@
           PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
           SDL_Delay(10);
-          dt = 10;
+          this->dt = 10;
         }
       //this->timeSlice (dt);
       
       /* function to let all entities tick (iterate through list) */
-      WorldEntity* entity;
-      float seconds = dt / 1000.0;  
-      assert( this->nullParent != NULL); 
-      entity = entities->enumerate(); 
+      float seconds = this->dt / 1000.0;      
+      this->gameTime += seconds;
+      //entity = entities->enumerate(); 
+      tIterator<WorldEntity>* iterator = this->entities->getIterator();
+      WorldEntity* entity = iterator->nextElement();
       while( entity != NULL) 
         { 
           entity->tick (seconds);
-          entity = entities->nextElement();
-        }
+          entity = iterator->nextElement();
+        }
+      delete iterator;
+      //skySphere->updatePosition(localCamera->absCoordinate);
+      
       /* update tick the rest */
+      this->trackManager->tick(this->dt);
       assert( this->localCamera != NULL); 
       assert( this->trackManager != NULL); 
-      this->localCamera->tick(dt);
-
-      this->trackManager->tick(dt);
+      this->localCamera->tick(this->dt);
+      this->garbageCollector->tick(seconds);
+      this->simpleAnimation->tick(seconds);
     }
   this->lastFrame = currentFrame;
@@ -640 +796 @@
 void World::update()
 {
-  this->nullParent->update ();
+  this->garbageCollector->update();
+  this->nullParent->update (dt);
 }
 
@@ -728 +885 @@
 bool World::command(Command* cmd)
 {
+  if( !strcmp( cmd->cmd, "view0")) this->localCamera->setViewMode(VIEW_NORMAL);
+  else if( !strcmp( cmd->cmd, "view1")) this->localCamera->setViewMode(VIEW_BEHIND);
+  else if( !strcmp( cmd->cmd, "view2")) this->localCamera->setViewMode(VIEW_FRONT);
+  else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
+  else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
+  else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
+  
   return false;
 }

orxonox/branches/levelloader/src/story_entities/world.h

@@ -8 +8 @@
 
 #include "stdincl.h"
-
+#include "comincl.h"
 #include "story_entity.h"
 #include "p_node.h"
 
+
+class World;
+class WorldEntity;
 class TrackManager;
-class WorldEntity;
 class Camera;
 class PNode;
@@ -21 +23 @@
 class FontSet;
 class Terrain;
+class GarbageCollector;
+class SimpleAnimation;
 
+//! The game world Interface
+/**
+   this is a singleton interface, that enables world_entities to access the
+   world. for those objects, there is no easier way than over this interface!
+*/
+class WorldInterface : BaseObject {
+
+ public:
+  ~WorldInterface();
+  static WorldInterface* getInstance();
+  void init(World* world);
+  tList<WorldEntity>* getEntityList();
+
+ private:
+  WorldInterface();
+  static WorldInterface* singletonRef;    //!< singleton reference to this object
+  bool worldIsInitialized;                //!< true if the world has been initialized
+  World* worldReference;                  //!< this is a reference to the running world
+
+};
 
 //! The game world
@@ -39 +63 @@
   virtual ~World ();
 
+  double getGameTime();
 
   /* classes from story-entity */
+  virtual ErrorMessage preLoad();
   virtual ErrorMessage load ();
   virtual ErrorMessage init ();
@@ -55 +81 @@
   bool command (Command* cmd);
 
+  tList<WorldEntity>* getEntities();
+
   /* interface to world */
   void spawn (WorldEntity* entity);
@@ -68 +96 @@
   void init(char* name, int worldID);
 
-  Uint32 lastFrame;             //!< last time of frame
-  bool bQuitOrxonox;            //!< quit this application
-  bool bQuitCurrentGame;        //!< quit only the current game and return to menu
-  bool bPause;                  //!< pause mode
+  Uint32 lastFrame;                   //!< last time of frame
+  Uint32 dt;                          //!< time needed to calculate this frame
+  double gameTime;                    //!< this is where the game time is saved
+  bool bQuitOrxonox;                  //!< quit this application
+  bool bQuitCurrentGame;              //!< quit only the current game and return to menu
+  bool bPause;                        //!< pause mode
 
-  FontSet* testFont;            //!< A test Font. \todo fix this, so it is for real.
-  GLMenuImageScreen* glmis;     //!< The Level-Loader Display
+  FontSet* testFont;                  //!< A test Font. \todo fix this, so it is for real.
+  GLMenuImageScreen* glmis;           //!< The Level-Loader Display
 
   char* worldName;              //!< The name of this World
@@ -80 +110 @@
   int debugWorldNr;             //!< The Debug Nr. needed, if something goes wrong
 
-  PNode* nullParent;            //!< The zero-point, that everything has as its parent.
-  TrackManager* trackManager;   //!< The reference of the TrackManager that handles the course through the Level.
-  Camera* localCamera;          //!< The current Camera
-  Skysphere* skySphere;         //!< The Environmental Heaven of orxonox \todo insert this to environment insted
-  LightManager* lightMan;       //!< The Lights of the Level
-  Terrain* terrain;             //!< The Terrain of the World.
+  PNode* nullParent;                  //!< The zero-point, that everything has as its parent.
+  TrackManager* trackManager;         //!< The reference of the TrackManager that handles the course through the Level.
+  Camera* localCamera;                //!< The current Camera
+  Skysphere* skySphere;               //!< The Environmental Heaven of orxonox \todo insert this to environment insted
+  LightManager* lightMan;             //!< The Lights of the Level
+  Terrain* terrain;                   //!< The Terrain of the World.
 
-  GLuint objectList;            //!< temporary: \todo this will be ereased soon
-  tList<WorldEntity>* entities;//!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
-  WorldEntity* localPlayer;     //!< The Player, you fly through the level.
+  GLuint objectList;                  //!< temporary: \todo this will be ereased soon
+  tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
+  WorldEntity* localPlayer;           //!< The Player, you fly through the level.
+
+  GarbageCollector* garbageCollector; //!< reference to the garbage  collector
+
+  SimpleAnimation* simpleAnimation;   //!< reference to the SimpleAnimation object
  
   /* function for main-loop */