Changeset 8014 in orxonox.OLD

Timestamp:

May 31, 2006, 8:21:07 AM (18 years ago)

Author:

rennerc

Message:

new NetworkGameManager works now

Location:

branches/network/src

Files:

• lib/graphics/importer/height_map.cc (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (4 diffs)
• lib/network/player_stats.cc (modified) (2 diffs)
• lib/network/player_stats.h (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (3 diffs)
• story_entities/multi_player_world_data.cc (modified) (5 diffs)

branches/network/src/lib/graphics/importer/height_map.cc

@@ -134 +134 @@
     w = yOffset;
 
-    PRINTF(0)("Values: i = %i, w = %i\n", i, w);
+//    PRINTF(0)("Values: i = %i, w = %i\n", i, w);
 
     // add a vertex to the list
@@ -599 +599 @@
   float c = normalVectorField [(xInt)][yInt].y;
 
-  PRINTF(0)("a: %f \n" ,a);
-  PRINTF(0)("b: %f \n" ,b);
-  PRINTF(0)("c: %f \n" ,c);
+//  PRINTF(0)("a: %f \n" ,a);
+//  PRINTF(0)("b: %f \n" ,b);
+//  PRINTF(0)("c: %f \n" ,c);
 
 

branches/network/src/lib/network/network_game_manager.cc

@@ -57 +57 @@
 
   this->setSynchronized(true);
+
 }
 
@@ -74 +75 @@
 bool NetworkGameManager::signalNewPlayer( int userId )
 {
+  assert( SharedNetworkData::getInstance()->isGameServer() );
+  assert( State::getGameRules() );
   assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );
   
@@ -84 +87 @@
   BaseObject * bo = Factory::fabricate( playableClassId );
   
+  assert( bo != NULL );
   assert( bo->isA( CL_PLAYABLE ) );
   
@@ -89 +93 @@
   
   playable.loadModel( playableModel );
+  playable.setOwner( userId );
+  playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
+  playable.setSynchronized( true );
   
   PlayerStats * stats = rules.getNewPlayerStats( userId );
+  
+  stats->setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
+  stats->setSynchronized( true );
+  stats->setOwner( getHostID() );
   
   stats->setTeamId( team );

branches/network/src/lib/network/player_stats.cc

@@ -59 +59 @@
   playableUniqueId_handle = registerVarId( new SynchronizeableInt( &playableUniqueId, &playableUniqueId, "playableUniqueId" ) );
   modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
+  
+  PRINTF(0)("PlayerStats created\n");
 }
 
@@ -80 +82 @@
   {
     this->setPlayableUniqueId( this->playableUniqueId );
+    
+    PRINTF(0)("uniqueID changed %d %d\n", userId, getHostID());
     
     if ( userId == getHostID() )

branches/network/src/lib/network/player_stats.h

@@ -24 +24 @@
     virtual void varChangeHandler( std::list<int> & id );
     
-    PlayerStats * getStats( int userId );
+    static PlayerStats * getStats( int userId );
     
     inline int getUserId(){ return userId; }

branches/network/src/lib/network/synchronizeable.cc

@@ -36 +36 @@
 {
   this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
-  this->owner = -1;
+  this->owner = 0;
   this->hostID = SharedNetworkData::getInstance()->getHostID();
   this->setIsServer(this->hostID == 0);
@@ -333 +333 @@
 void Synchronizeable::registerVar( SynchronizeableVar * var )
 {
-  PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
+  //PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
   syncVarList.push_back( var );
 }
@@ -345 +345 @@
 int Synchronizeable::registerVarId( SynchronizeableVar * var )
 {
-  PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
+  //PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
   syncVarList.push_back( var );
   var->setWatched( true );

branches/network/src/story_entities/multi_player_world_data.cc

@@ -45 +45 @@
 #include "network_manager.h"
 #include "network_game_manager.h"
+#include "player_stats.h"
 
 
@@ -203 +204 @@
       this->localPlayer = new Player();
 
+#if 0
       Playable* playable;
       const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
@@ -215 +217 @@
         playable->setPlayDirection(Quaternion(M_PI, Vector(0.0, 1.0, 0.0)));
       }
+#endif
     }
     else
@@ -244 +247 @@
   
   State::setPlayer(this->localPlayer);
+ 
 }
 
@@ -265 +269 @@
   /* call underlying function */
   GameWorldData::loadScene(root);
+  
+  if ( NetworkManager::getInstance()->isGameServer() )
+  {
+    NetworkGameManager::getInstance()->signalNewPlayer( 0 );
+    State::getPlayer()->setPlayable( PlayerStats::getStats( 0 )->getPlayable() );
+  }
 }