Changeset 9068 in orxonox.OLD

Timestamp:

Jul 3, 2006, 8:55:53 PM (18 years ago)

Author:

rennerc

Message:

removed some bugs and added texture sync

Location:

branches/presentation/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/shared_network_data.cc (modified) (1 diff)
• lib/util/loading/game_loader.cc (modified) (1 diff)
• subprojects/framework.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• util/multiplayer_team_deathmatch.h (modified) (1 diff)
• util/network_game_rules.cc (modified) (1 diff)
• util/network_game_rules.h (modified) (1 diff)
• util/signal_handler.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -98 +98 @@
   ClassID playableClassId = rules.getPlayableClassId( userId, team );
   std::string playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
+  std::string playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
   
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -106 +107 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
   
-  if (  playableModel != "" )
+  if ( playableTexture != "" )
+    playable.loadMD2Texture( playableTexture );
+  if ( playableModel != "" )
     playable.loadModel( playableModel );
   playable.setOwner( userId );

branches/presentation/src/lib/network/shared_network_data.cc

@@ -44 +44 @@
  */
 SharedNetworkData::~SharedNetworkData()
-{}
+{
+  SharedNetworkData::singletonRef = NULL;
+}

branches/presentation/src/lib/util/loading/game_loader.cc

@@ -57 +57 @@
     delete this->currentCampaign;
   this->currentCampaign = NULL;
+  
+  GameLoader::singletonRef = NULL;
 }
 

branches/presentation/src/subprojects/framework.cc

@@ -317 +317 @@
   delete GraphicsEngine::getInstance();
 
+  Framework::singletonRef = NULL;
 }
 

branches/presentation/src/util/multiplayer_team_deathmatch.cc

@@ -455 +455 @@
   ClassID playableClassId = getPlayableClassId( userId, stats.getPreferedTeamId() );
   std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
+  std::string playableTexture = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
 
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -463 +464 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
 
-  playable.loadModel( playableModel );
+  if ( playableTexture != "" )
+    playable.loadMD2Texture( playableTexture );
+  if ( playableModel != "" )
+    playable.loadModel( playableModel );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );
@@ -797 +801 @@
 }
 
+std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
+{
+  if ( classId == CL_FPS_PLAYER )
+  {
+    return "maps/doom_guy.png";
+  }
+  
+  return "";
+}
+

branches/presentation/src/util/multiplayer_team_deathmatch.h

@@ -39 +39 @@
     virtual int getTeamForNewUser();
     virtual ClassID getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
 

branches/presentation/src/util/network_game_rules.cc

@@ -40 +40 @@
 }
 
+
+std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, ClassID classId )
+{
+  return "";
+}
+
 std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, ClassID classId )
 {

branches/presentation/src/util/network_game_rules.h

@@ -23 +23 @@
     virtual ClassID getPlayableClassId( int userId, int team );
     virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
     
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }

branches/presentation/src/util/signal_handler.h

@@ -44 +44 @@
   public:
     inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; }
+    ~SignalHandler(){ SignalHandler::singletonRef = NULL; }
 
     void registerCallback( SignalCallback cb, void * someData );

branches/presentation/src/world_entities/world_entity.cc

@@ -85 +85 @@
 
   this->toList(OM_NULL);
-
+  
+  registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName" ) );
   modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
   scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
   list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
+  
+  health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health" ) );
+  healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth" ) );
 }
 
@@ -837 +841 @@
     this->toList( (OM_LIST)list_write );
   }
+  
+  if ( std::find( id.begin(), id.end(), health_handle ) != id.end() )
+  {
+    this->setHealth( health_write );
+  }
+  
+  if ( std::find( id.begin(), id.end(), healthMax_handle ) != id.end() )
+  {
+    this->setHealthMax( healthMax_write );
+  }
 
   PNode::varChangeHandler( id );

branches/presentation/src/world_entities/world_entity.h

@@ -198 +198 @@
   int                     list_write;                      //!< entity's list
   int                     list_handle;                     //!< handle for list changes
+  
+  float                   health_write;
+  int                     health_handle;
+  
+  float                   healthMax_write;
+  int                     healthMax_handle;
 
   CollisionHandle*        collisionHandles[CREngine::CR_NUMBER];  //!< the list of the collision reactions