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

Timestamp:

Jan 7, 2006, 11:07:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

File:

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

trunk/src/world_entities/world_entity.cc

@@ -35 +35 @@
     ->defaultValues(2, "models/ships/fighter.obj", 1.0);
 
+SHELL_COMMAND(debugEntity, WorldEntity, debugWE);
 
 /**
@@ -48 +49 @@
 
   this->obbTree = NULL;
+
+  this->md2TextureFileName = NULL;
 
   if (root != NULL)
@@ -105 +108 @@
 void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
 {
+  this->scaling = scaling;
   if ( fileName != NULL && strcmp(fileName, "") )
   {
@@ -123 +127 @@
       return;
     }
-
+    if (scaling == 0.0)
+    {
+      scaling = 1.0;
+      PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1\n");
+    }
     if(strstr(fileName, ".obj"))
     {
@@ -343 +351 @@
 }
 
+
+/**
+ * Debug the WorldEntity
+ */
+void WorldEntity::debugEntity() const
+{
+  PRINT(0)("WorldEntity %s::%s  (DEBUG)\n", this->getClassName(), this->getName());
+  this->debugNode();
+  PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber) , this->models.size());
+  for (unsigned int i = 0; i < this->models.size(); i++)
+  {
+    if (models[i] != NULL)
+      PRINT(0)(" : %d:%s", i, this->models[i]->getName());
+  }
+  PRINT(0)("\n");
+
+}
+
+
 /**
  * Writes data from network containing information about the state
@@ -359 +386 @@
   SYNCHELP_READ_FLOAT( scaling );
   //check if modelFileName is relative to datadir or absolute
-  if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
-  {
-    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
-  }
-  else
-  {
-    loadModel( modelFileName, scaling );
+
+  if ( strcmp(modelFileName, "") )
+  {
+
+    if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
+    {
+      loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
+    }
+    else
+    {
+      loadModel( modelFileName, scaling );
+    }
   }
   delete[] modelFileName;
+
+  SYNCHELP_READ_STRINGM( modelFileName );
+  if ( strcmp(modelFileName, "") )
+    this->md2TextureFileName = modelFileName;
 
   return SYNCHELP_READ_N;
@@ -386 +422 @@
   SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
   SYNCHELP_WRITE_FLOAT( scaling );
+  if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") )
+  {
+    SYNCHELP_WRITE_STRING(this->md2TextureFileName);
+  }
+  else
+  {
+    SYNCHELP_WRITE_STRING("");
+  }
+
   return SYNCHELP_WRITE_N;
 }