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

Timestamp:

Dec 30, 2005, 11:25:05 PM (19 years ago)

Author:

patrick

Message:

network: cleaned up some stuff in the camera class

Location:

branches/network/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• multi_player_world.cc (modified) (5 diffs)
• multi_player_world.h (modified) (2 diffs)

branches/network/src/story_entities/game_world.cc

@@ -144 +144 @@
 {
   this->setClassID(CL_GAME_WORLD, "GameWorld");
-
   this->setName(name);
+
   this->gameTime = 0.0f;
   this->setSpeed(1.0);

branches/network/src/story_entities/multi_player_world.cc

@@ -25 +25 @@
 
 
-
-
-SHELL_COMMAND(speed, MultiPlayerWorld, setSpeed);
-SHELL_COMMAND(togglePNodeVisibility, MultiPlayerWorld, togglePNodeVisibility);
-SHELL_COMMAND(toggleBVVisibility, MultiPlayerWorld, toggleBVVisibility);
-
 using namespace std;
 
 //! This creates a Factory to fabricate a MultiPlayerWorld
-CREATE_FACTORY(MultiPlayerWorld, CL_WORLD);
+CREATE_FACTORY(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
+
 
 MultiPlayerWorld::MultiPlayerWorld(const TiXmlElement* root)
@@ -44 +39 @@
 }
 
+
 /**
  *  remove the MultiPlayerWorld from memory
@@ -52 +48 @@
 MultiPlayerWorld::~MultiPlayerWorld ()
 {
-  delete this->shell;
   PRINTF(3)("MultiPlayerWorld::~MultiPlayerWorld() - deleting current world\n");
+}
 
-  delete this->localPlayer;
-
-  // delete all the initialized Engines.
-  FastFactory::flushAll(true);
-  delete LightManager::getInstance();
-  delete ParticleEngine::getInstance();
-  delete AnimationPlayer::getInstance();
-  delete PhysicsEngine::getInstance();
-
-  // external engines initialized by the orxonox-class get deleted
-  SoundEngine::getInstance()->flushAllBuffers();
-  SoundEngine::getInstance()->flushAllSources();
-
-  if (State::getObjectManager() == &this->objectManager)
-    State::setObjectManager(NULL);
-  // erease everything that is left.
-  delete PNode::getNullParent();
-
-  //secondary cleanup of PNodes;
-  const std::list<BaseObject*>* nodeList = ClassList::getList(CL_PARENT_NODE);
-  if (nodeList != NULL)
-    while (!nodeList->empty())
-      delete nodeList->front();
-
-  Shader::suspendShader();
-
-  // unload the resources !!
-  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
-}
 
 /**
@@ -98 +65 @@
 void MultiPlayerWorld::constuctorInit(const char* name, int worldID)
 {
-  this->setClassID(CL_WORLD, "MultiPlayerWorld");
-  PRINTF(0)("START\n");
+  this->setClassID(CL_MULTI_PLAYER_WORLD, "MultiPlayerWorld");
+  this->setName(name);
 
-  this->setName(name);
   this->gameTime = 0.0f;
   this->setSpeed(1.0);
@@ -149 +115 @@
 
   /* 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/multi_player_world.h

@@ -12 +12 @@
 class TiXmlElement;
 
+
 //! The multiplayer game world
 /**
-   this class initializes everything that should be displayed inside of the current level.
-   it is the main driving factor during gameplay.
-*/
+ *  this class initializes everything that should be displayed inside of the current level.
+ *  it is the main driving factor during gameplay.
+ */
 class MultiPlayerWorld : public GameWorld {
 
@@ -28 +29 @@
   ErrorMessage load ();
   ErrorMessage postLoad();
+
+  private:
+    void constuctorInit(const char* name, int worldID);
+
 };