Changeset 6695 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Jan 25, 2006, 2:39:53 PM (18 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

File:

• trunk/src/world_entities/world_entity.cc (modified) (3 diffs)

trunk/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, "") )
@@ -515 +518 @@
   //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);
+    PRINTF(0)("modelfilename: %s\n", getModel( 0 )->getName());
   }
   delete[] modelFileName;