Changeset 9119 in orxonox.OLD

Timestamp:

Jul 4, 2006, 1:35:11 PM (18 years ago)

Author:

rennerc

Message:

added scling for playables

Location:

branches/presentation/src

Files:

• lib/network/network_game_manager.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -112 +112 @@
   playable.loadMD2Texture( playableTexture );
   
-  playable.loadModel( playableModel, playableScale );
+  playable.loadModel( playableModel, 100.0f );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );

branches/presentation/src/util/multiplayer_team_deathmatch.cc

@@ -456 +456 @@
   std::string playableModel = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
   std::string playableTexture = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
+  float       playableScale = getPlayableScale( userId, stats.getPreferedTeamId(), playableClassId );
 
   BaseObject * bo = Factory::fabricate( playableClassId );
@@ -464 +465 @@
   Playable & playable = *(dynamic_cast<Playable*>(bo));
 
-  if ( playableTexture != "" )
-    playable.loadMD2Texture( playableTexture );
-  if ( playableModel != "" )
-    playable.loadModel( playableModel );
+  playable.loadMD2Texture( playableTexture );
+  playable.loadModel( playableModel, playableScale );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );

branches/presentation/src/world_entities/world_entity.cc

@@ -156 +156 @@
   this->modelLODName = fileName;
   this->scaling = scaling;
+  
+  if ( isA( CL_FPS_PLAYER ) )
+    PRINTF(0)("\n\n\n\n\n\n\n\n\n\n%f\n\n\n\n\n\n\n\n\n\n", scaling);
 
   std::string name = fileName;