Changeset 6687 in orxonox.OLD

Timestamp:

Jan 25, 2006, 11:27:35 AM (18 years ago)

Author:

patrick

Message:

network: war of the model names

Location:

branches/network/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (1 diff)

branches/network/src/world_entities/world_entity.cc

@@ -54 +54 @@
   this->energyMax = 1.0f;
   this->energy = 1.0f;
+  this->scaling = 1.0f;
+
+  /* OSOLETE */
+  this->bVisible = true;
+  this->bCollide = true;
 
   this->md2TextureFileName = NULL;
-
-
-  this->setVisibiliy(true);
 
   this->objectListNumber = OM_INIT;
@@ -122 +124 @@
 void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
 {
+  this->modelLODName = fileName;
   this->scaling = scaling;
   if ( fileName != NULL && strcmp(fileName, "") )
@@ -511 +514 @@
   SYNCHELP_READ_FKT( PNode::writeState );
 
-  SYNCHELP_READ_STRINGM( modelFileName );
+  SYNCHELP_READ_STRINGM( this->modelLODName );
   SYNCHELP_READ_FLOAT( scaling );
   //check if modelFileName is relative to datadir or absolute
 
+
+  PRINTF(0)("================ LOADING MODEL %s, %f\n", modelFileName, scaling);
+
   if ( strcmp(modelFileName, "") )
   {
-    loadModel( modelFileName, scaling );
+    loadModel( modelFileName, scaling);
   }
   delete[] modelFileName;

branches/network/src/world_entities/world_entity.h

@@ -111 +111 @@
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
   const char*             md2TextureFileName; //!< the file name of the md2 model texture, only if this
+  const char*             modelLODName;       //!< the name of the model lod file
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection