Changeset 6368 in orxonox.OLD

Timestamp:

Dec 31, 2005, 1:40:55 PM (18 years ago)

Author:

patrick

Message:

network: digging deeper to bring more sense into the framework

Location:

branches/network/src/story_entities

Files:

• campaign.cc (modified) (7 diffs)
• game_world.cc (modified) (3 diffs)
• game_world.h (modified) (2 diffs)
• multi_player_world.cc (modified) (1 diff)

branches/network/src/story_entities/campaign.cc

@@ -52 +52 @@
 
 
+/**
+ *  initializes the class
+ */
 ErrorMessage Campaign::init()
 {
@@ -57 +60 @@
 }
 
-/**
-  \brief loads the Parameters of a Campaign
-* @param root: The XML-element to load from
+
+/**
+ *  loads the Parameters of a Campaign
+ * @param root: The XML-element to load from
  */
 void Campaign::loadParams(const TiXmlElement* root)
@@ -72 +76 @@
 }
 
-/**
-  \brief loads a WorldList
-* @param root: the XML-element to load from
+
+/**
+ *  loads a WorldList
+ * @param root: the XML-element to load from
  */
 void Campaign::loadWorldListParams(const TiXmlElement* root)
@@ -93 +98 @@
 }
 
+/**
+ *  starts the campaing
+ */
 ErrorMessage Campaign::start()
 {
@@ -98 +106 @@
 }
 
-//! @todo boky -> fix it
+
+/**
+ *  starts the campaing with a specific ID
+ * @param storyID the id of the StoryEntity
+ */
 ErrorMessage Campaign::start(int storyID = 0)
 {
@@ -127 +139 @@
       se = this->getStoryEntity(nextWorldID);
       this->currentEntity = se;
-      if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) )
+      if( ( nextWorldID == WORLD_ID_GAMEEND) || ( se == NULL) )
         {
           PRINTF(4)("Quitting campaing story loop\n");
@@ -148 +160 @@
 
 
+/**
+ *  pauses the campaing
+ */
 ErrorMessage Campaign::pause()
 {

branches/network/src/story_entities/game_world.cc

@@ -83 +83 @@
 GameWorld::GameWorld(const TiXmlElement* root)
 {
-  this->constuctorInit("", -1);
+  this->setClassID(CL_GAME_WORLD, "GameWorld");
+  this->setName("Preloaded World - no name yet");
+
+  this->gameTime = 0.0f;
+  this->setSpeed(1.0);
+  this->music = NULL;
+  this->shell = NULL;
+  this->localPlayer = NULL;
+  this->localCamera = NULL;
+
+  this->showPNodes = false;
+  this->showBV = false;
+
   this->path = NULL;
 
@@ -130 +142 @@
 }
 
-/**
- *  initializes the world.
- * @param name the name of the world
- * @param worldID the ID of this 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 GameWorld::constuctorInit(const char* name, int worldID)
-{
-  this->setClassID(CL_GAME_WORLD, "GameWorld");
-  this->setName(name);
-
-  this->gameTime = 0.0f;
-  this->setSpeed(1.0);
-  this->music = NULL;
-  this->shell = NULL;
-  this->localPlayer = NULL;
-  this->localCamera = NULL;
-
-  this->showPNodes = false;
-  this->showBV = false;
-}
+
 
 /**
@@ -174 +161 @@
     .describe("The Filename of this GameWorld (relative from the data-dir)");
 }
+
 
 /**

branches/network/src/story_entities/game_world.h

@@ -35 +35 @@
     void loadParams(const TiXmlElement* root);
 
-
     /* classes from story-entity */
     virtual ErrorMessage preLoad();
@@ -70 +69 @@
 
   protected:
-    virtual void constuctorInit(const char* name, int worldID);
-
     /* world - running functions */
     virtual void mainLoop ();

branches/network/src/story_entities/multi_player_world.cc

@@ -116 +116 @@
  */
 ErrorMessage MultiPlayerWorld::load()
-{}
+{
+
+  ////////////////////////////
+  // Loading Spawning Point //
+  ////////////////////////////
+//   element = root->FirstChildElement("SpawningPoints");
+//   if( element == NULL)
+//   {
+//     PRINTF(1)("NetworkWorld is missing 'SpawningPoints'\n");
+//   }
+//   else
+//   {
+//     element = element->FirstChildElement();
+//       // load Players/Objects/Whatever
+//     PRINTF(4)("Loading Spawning Points\n");
+//     while( element != NULL)
+//     {
+//       BaseObject* created = Factory::fabricate(element);
+//       if( created != NULL )
+//       {
+// //        if(created->isA(CL_SPAWNING_POINT))
+// //          this->spawn(dynamic_cast<WorldEntity*>(created));
+//         printf("Created a Spawning Point %s: %s\n", created->getClassName(), created->getName());
+//       }
+//
+//
+//       element = element->NextSiblingElement();
+//       glmis->step(); //! @todo temporary
+//     }
+//     PRINTF(4)("Done loading NetworkWorldEntities\n");
+//   }
+//
+//
+//   ////////////////////////
+//   // find WorldEntities //
+//   ////////////////////////
+//   element = root->FirstChildElement("WorldEntities");
+//   if( element == NULL)
+//   {
+//     PRINTF(1)("NetworkWorld is missing 'WorldEntities'\n");
+//   }
+//   else
+//   {
+//     element = element->FirstChildElement();
+//       // load Players/Objects/Whatever
+//     PRINTF(4)("Loading NetworkWorldEntities\n");
+//     while( element != NULL)
+//     {
+//       if( NetworkManager::getInstance()->isGameServer())
+//       {
+//
+//         BaseObject* created = NetworkGameManager::getInstance()->createEntity(element);
+//         if( created != NULL )
+//         {
+// //          if(created->isA(CL_WORLD_ENTITY))
+// //            this->spawn(dynamic_cast<WorldEntity*>(created));
+//           printf("Created a %s: %s\n", created->getClassName(), created->getName());
+//         }
+//         else
+//           PRINTF(1)("NetworkWorld: could not create this entity\n");
+//
+//           // if we load a 'Player' we use it as localPlayer
+//
+//
+//           //todo do this more elegant
+//         if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
+//           sky = dynamic_cast<WorldEntity*>(created);
+//         if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+//         {
+//           terrain = dynamic_cast<Terrain*>(created);
+//           CDEngine::getInstance()->setTerrain(terrain);
+//
+//         }
+//
+//       }
+//       else if( /* !strcmp( element->Value(), "SkyBox") || */ /* !strcmp( element->Value(), "Terrain") || */ !strcmp( element->Value(), "SpaceShip"))
+//       {
+//         BaseObject* created = Factory::fabricate(element);
+//         if( created != NULL )
+//         {
+// //          if(created->isA(CL_WORLD_ENTITY))
+// //            this->spawn(dynamic_cast<WorldEntity*>(created));
+//           printf("Created a %s: %s\n", created->getClassName(), created->getName());
+//         }
+//         else
+//           PRINTF(1)("NetworkWorld: could not create this entity\n");
+//
+//           // if we load a 'Player' we use it as localPlayer
+//
+//
+//           //todo do this more elegant
+//         if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
+//           sky = dynamic_cast<WorldEntity*>(created);
+//         if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+//         {
+//           terrain = dynamic_cast<Terrain*>(created);
+//           CDEngine::getInstance()->setTerrain(terrain);
+//         }
+//       }
+//       element = element->NextSiblingElement();
+//       glmis->step(); //! @todo temporary
+//       PRINTF(4)("Done loading NetworkWorldEntities\n");
+//     }
+  }
+
+
+
+