Changeset 9396 in orxonox.OLD for branches/proxy/src/story_entities

Timestamp:

Jul 23, 2006, 10:07:23 PM (19 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

Location:

branches/proxy/src/story_entities

Files:

• game_world.cc (modified) (2 diffs)
• menu/game_menu.cc (modified) (3 diffs)
• menu/game_menu.h (modified) (1 diff)
• multi_player_world_data.cc (modified) (6 diffs)

branches/proxy/src/story_entities/game_world.cc

@@ -512 +512 @@
 void GameWorld::display ()
 {
+
+    // if this server is a dedicated server the game workd does not need to be drawn
+  if( !GraphicsEngine::getInstance()->isDedicated())
+  {
   // render the reflection texture
   this->renderPassReflection();
   // redner the refraction texture
   this->renderPassRefraction();
+  }
   // render all
   this->renderPassAll();
@@ -643 +648 @@
   LightManager::getInstance()->draw();
 
-  /* Draw the BackGround */
-  this->drawEntityList(State::getObjectManager()->getObjectList(OM_BACKGROUND));
-  engine->drawBackgroundElements();
-
-  /* draw all WorldEntiy groups */
-  for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-    this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
-
-  AtmosphericEngine::getInstance()->draw();
-
-  if( unlikely( this->showBV))
-  {
-    CDEngine* engine = CDEngine::getInstance();
+  // only render the world if its not dedicated mode
+  if( !GraphicsEngine::getInstance()->isDedicated())
+  {
+    /* Draw the BackGround */
+    this->drawEntityList(State::getObjectManager()->getObjectList(OM_BACKGROUND));
+    engine->drawBackgroundElements();
+
+    /* draw all WorldEntiy groups */
     for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
-      engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]), this->showBVLevel);
-  }
-
-  if( unlikely(this->showPNodes))
-    PNode::getNullParent()->debugDraw(0);
+      this->drawEntityList(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]));
+
+    AtmosphericEngine::getInstance()->draw();
+
+    if( unlikely( this->showBV))
+    {
+      CDEngine* engine = CDEngine::getInstance();
+      for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)
+        engine->drawBV(State::getObjectManager()->getObjectList(this->dataTank->drawLists[i]), this->showBVLevel);
+    }
+
+    if( unlikely(this->showPNodes))
+      PNode::getNullParent()->debugDraw(0);
+
+    // draw the game ruls
+    if( likely(this->dataTank->gameRule != NULL))
+      this->dataTank->gameRule->draw();
+  }
 
   engine->draw();
-
-  // draw the game ruls
-  if( likely(this->dataTank->gameRule != NULL))
-    this->dataTank->gameRule->draw();
 }
 

branches/proxy/src/story_entities/menu/game_menu.cc

@@ -574 +574 @@
       OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
       serverNetworkBox->pack(createButton);
-      createButton->released.connect(this, &GameMenu::createServer);
+      createButton->released.connect(this, &GameMenu::createMasterServer);
     }
   }
@@ -593 +593 @@
 
   State::setOnline(true);
-  NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
+  NetworkManager::getInstance()->createClient( this->ipInputLine->_getText(), 9999 );
 
   Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
@@ -600 +600 @@
 }
 
-void GameMenu::createServer( )
+void GameMenu::createMasterServer( )
 {
   PRINTF(0)("Create server\n" );
 
   State::setOnline(true);
-  NetworkManager::getInstance()->createServer( 9999 );
+  NetworkManager::getInstance()->createMasterServer( 9999 );
 
   this->startLevel( 5 );

branches/proxy/src/story_entities/menu/game_menu.h

@@ -50 +50 @@
     
     void showServerMenu();
-    void createServer();
+    void createMasterServer();
 
 

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -47 +47 @@
 #include "player_stats.h"
 
-#include "proxy/proxy_settings.h"
+#include "proxy/network_settings.h"
 
 #include "glmenu_imagescreen.h"
@@ -112 +112 @@
   const TiXmlElement* element = NULL;
 
-  if( NetworkManager::getInstance()->isMasterServer() )
+  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
   {
     /* load the spawning points */
@@ -148 +148 @@
     element = element->FirstChildElement();
 
-    if( NetworkManager::getInstance()->isMasterServer() )
+    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
     {
       while( element != NULL)
@@ -206 +206 @@
 
 
-    if( NetworkManager::getInstance()->isMasterServer())
+    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
     {
       this->localPlayer = new Player();
@@ -281 +281 @@
   GameWorldData::loadScene(root);
 
-//   LoadParamXML(root, "ProxySettings", ProxySettings::getInstance(), ProxySettings, loadProxySettings);
+//   LoadParamXML(root, "NetworkSettings", NetworkSettings::getInstance(), NetworkSettings, loadNetworkSettings);
 
   // create server playable
-  if ( NetworkManager::getInstance()->isMasterServer() )
+  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer())
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );
@@ -300 +300 @@
 {
   // delete the proxy settings
-  delete ProxySettings::getInstance();
+  delete NetworkSettings::getInstance();
 
   /* call underlying function */