Changeset 6404 in orxonox.OLD for branches/network/src/story_entities

Timestamp:

Jan 4, 2006, 1:49:20 AM (19 years ago)

Author:

patrick

Message:

network: working on the last steps, completion is in reach. sadly the world isn't loaded anymore at the moment. continue work later. work flush

Location:

branches/network/src/story_entities

Files:

• campaign_data.cc (modified) (1 diff)
• campaign_data.h (modified) (3 diffs)
• game_world.cc (modified) (3 diffs)
• game_world_data.cc (modified) (3 diffs)
• game_world_data.h (modified) (3 diffs)
• multi_player_world.cc (modified) (4 diffs)
• multi_player_world.h (modified) (2 diffs)
• multi_player_world_data.cc (added)
• multi_player_world_data.h (added)
• single_player_world.cc (modified) (3 diffs)
• single_player_world.h (modified) (2 diffs)
• single_player_world_data.cc (added)
• single_player_world_data.h (added)

branches/network/src/story_entities/campaign_data.cc

@@ -58 +58 @@
  * @param root: The XML-element to load from
  */
-void CampaignData::loadParams(const TiXmlElement* root)
+void CampaignData::loadData(const TiXmlElement* root)
 {
   LoadParamXML(root, "WorldList", this, CampaignData, loadParamsWorldList)
       .describe("A List of Worlds to be loaded in this Campaign");
-
 }
 

branches/network/src/story_entities/campaign_data.h

@@ -8 +8 @@
 
 
-#include "base_object.h"
+#include "data_tank.h"
 #include <list>
 
@@ -14 +14 @@
 
 //! A class that contains the data of the Campaign object
-class CampaignData : public BaseObject
+class CampaignData : public DataTank
 {
 
@@ -21 +21 @@
     virtual ~CampaignData();
 
-    void loadParams(const TiXmlElement* root);
+    void loadData(const TiXmlElement* root);
 
     void addStoryEntity(StoryEntity* se);

branches/network/src/story_entities/game_world.cc

@@ -20 +20 @@
 #include "game_world_data.h"
 
-#include "shell_command.h"
 #include "resource_manager.h"
 #include "state.h"
+#include "class_list.h"
+#include "substring.h"
+
+#include "game_loader.h"
 
 #include "p_node.h"
@@ -30 +33 @@
 #include "environment.h"
 #include "terrain.h"
-
 #include "test_entity.h"
 #include "terrain.h"
+#include "md2Model.h"
+#include "weapons/projectile.h"
+#include "npcs/npc_test1.h"
+#include "playable.h"
+
 #include "light.h"
+
+#include "factory.h"
+#include "fast_factory.h"
 #include "load_param.h"
-#include "shell.h"
-
-#include "fast_factory.h"
-#include "animation_player.h"
+#include "shell_command.h"
+
 #include "particle_engine.h"
 #include "graphics_engine.h"
+#include "event_handler.h"
+#include "sound_engine.h"
+#include "cd_engine.h"
+#include "network_manager.h"
 #include "physics_engine.h"
 #include "fields.h"
 
-#include "md2Model.h"
-
 #include "glmenu_imagescreen.h"
-#include "game_loader.h"
-
+#include "shell.h"
+
+#include "animation_player.h"
 #include "animation3d.h"
 
-#include "substring.h"
-
-#include "factory.h"
-
-#include "weapons/projectile.h"
-#include "event_handler.h"
-#include "sound_engine.h"
 #include "ogg_player.h"
-
-#include "class_list.h"
-
-#include "cd_engine.h"
-#include "npcs/npc_test1.h"
 #include "shader.h"
 
-#include "playable.h"
-#include "network_manager.h"
-#include "playable.h"
+
+using namespace std;
 
 
@@ -74 +72 @@
 SHELL_COMMAND(togglePNodeVisibility, GameWorld, togglePNodeVisibility);
 SHELL_COMMAND(toggleBVVisibility, GameWorld, toggleBVVisibility);
-
-using namespace std;
-
-//! This creates a Factory to fabricate a GameWorld
-//CREATE_FACTORY(GameWorld, CL_GAME_WORLD);
 
 

branches/network/src/story_entities/game_world_data.cc

@@ -92 +92 @@
  */
 GameWorldData::~GameWorldData()
-{
-}
+{}
 
 
@@ -180 +179 @@
 
 /**
- *  loads the GUI data
+ *  unloads the GUI data
  */
 ErrorMessage GameWorldData::unloadGUI()
@@ -242 +241 @@
 
 /**
- *  unloads the world entities from the xml file
+ *  unloads the world entities
  */
 ErrorMessage GameWorldData::unloadWorldEntities()

branches/network/src/story_entities/game_world_data.h

@@ -8 +8 @@
 
 #include "sdlincl.h"
-#include "base_object.h"
+#include "data_tank.h"
 #include "error.h"
 
@@ -29 +29 @@
  * the game start/stop process is not contained here and can be found in the GameWorld class.
  */
-class GameWorldData : public BaseObject
+class GameWorldData : public DataTank
 {
 
@@ -41 +41 @@
 
 
-  private:
+  protected:
     virtual ErrorMessage loadGUI(TiXmlElement* root);
     virtual ErrorMessage loadWorldEntities(TiXmlElement* root);

branches/network/src/story_entities/multi_player_world.cc

@@ -16 +16 @@
 
 #include "multi_player_world.h"
+#include "multi_player_world_data.h"
 
-#include "state.h"
-#include "class_list.h"
-
+#include "factory.h"
 #include "load_param.h"
-#include "fast_factory.h"
-#include "factory.h"
-
-
-#include "shell_command.h"
-#include "resource_manager.h"
-#include "state.h"
-
-#include "game_loader.h"
-#include "glmenu_imagescreen.h"
-
-#include "p_node.h"
-#include "world_entity.h"
-#include "player.h"
-#include "camera.h"
-#include "environment.h"
-#include "terrain.h"
-
-
 
 
 using namespace std;
+
 
 //! This creates a Factory to fabricate a MultiPlayerWorld
@@ -53 +34 @@
   this->setClassID(CL_MULTI_PLAYER_WORLD, "MultiPlayerWorld");
 
-  this->path = NULL;
-
+  this->multiPlayerWorldData = new MultiPlayerWorldData();
   this->loadParams(root);
 }
@@ -68 +48 @@
 {
   PRINTF(3)("MultiPlayerWorld::~MultiPlayerWorld() - deleting current world\n");
-}
-
-
-/**
- * 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 MultiPlayerWorld::constuctorInit(const char* name, int worldID)
-{
-  this->gameTime = 0.0f;
-  this->setSpeed(1.0);
-  this->shell = NULL;
-
-  this->showPNodes = false;
-  this->showBV = false;
+  if( this->multiPlayerWorldData)
+    delete this->multiPlayerWorldData;
 }
 
@@ -107 +67 @@
 
 
-/**
- *  loads the GameWorld by initializing all resources, and set their default values.
- */
-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");
-//     }
-  }
 
 
-
-

branches/network/src/story_entities/multi_player_world.h

@@ -11 +11 @@
 
 class TiXmlElement;
+class MultiPlayerWorldData;
 
 
@@ -26 +27 @@
   void loadParams(const TiXmlElement* root);
 
-  virtual ErrorMessage load();
-
   private:
-    void constuctorInit(const char* name, int worldID);
-
+    MultiPlayerWorldData*    multiPlayerWorldData;    //!< reference to the datatank
 };
 

branches/network/src/story_entities/single_player_world.cc

@@ -16 +16 @@
 
 #include "single_player_world.h"
+#include "single_player_world_data.h"
 
 #include "state.h"
@@ -42 +43 @@
 
   this->loadParams(root);
+
+  this->singlePlayerWorldData = new SinglePlayerWorldData();
 }
 
@@ -68 +71 @@
 }
 
-
-
-
-// ErrorMessage SinglePlayerWorld::load()
-// {
-//   static_cast<GameWorld*>(this)->load();
-//
-//   /* the the single player specific stuff here */
-//
-//   /* some static world entities */
-//   for(int i = 0; i < 100; i++)
-//   {
-//     WorldEntity* tmp = new NPCTest1();
-//     char npcChar[10];
-//     sprintf (npcChar, "NPC_%d", i);
-//     tmp->setName(npcChar);
-//     tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *30);
-//     this->spawn(tmp);
-//   }
-// }
-

branches/network/src/story_entities/single_player_world.h

@@ -11 +11 @@
 
 class TiXmlElement;
+class SinglePlayerWorldData;
 
 
@@ -28 +29 @@
 
   private:
-
+    SinglePlayerWorldData*        singlePlayerWorldData;             //!< reference to the data tank
 };