Changeset 9406 in orxonox.OLD for trunk/src/lib/graphics/importer/static_model.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/graphics/importer/static_model.cc (modified) (9 diffs)

trunk/src/lib/graphics/importer/static_model.cc

@@ -23 +23 @@
 #include <stdarg.h>
 
-using namespace std;
+
 
 
@@ -161 +161 @@
 {
   PRINTF(4)("Deleting Model ");
-  if (this->getName())
-  {
-    PRINT(4)("%s\n", this->getName());
+  if (!this->getName().empty())
+  {
+    PRINT(4)("%s\n", this->getCName());
   }
   else
@@ -178 +178 @@
 
   //! @todo do we really have to delete this material??
-  list<ModelMaterial*>::iterator modMat;
+  std::list<ModelMaterial*>::iterator modMat;
   for(modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
   {
@@ -214 +214 @@
 void StaticModel::rebuild()
 {
-  PRINTF(3)("Rebuilding Model '%s'\n", this->getName());
+  PRINTF(3)("Rebuilding Model '%s'\n", this->getCName());
   this->finalize();
 }
@@ -266 +266 @@
     tmpGroup = tmpGroup->next;
   }
-  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->getName());
+  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->getCName());
   return;
 }
@@ -291 +291 @@
     tmpGroup = tmpGroup->next;
   }
-  PRINTF(2)("Model Named %s in %s not Found.\n", groupName.c_str(), this->getName());
+  PRINTF(2)("Model Named %s in %s not Found.\n", groupName.c_str(), this->getCName());
   return;
 }
@@ -358 +358 @@
 Material* StaticModel::findMaterialByName(const std::string& materialName)
 {
-  list<ModelMaterial*>::iterator modMat;
+  std::list<ModelMaterial*>::iterator modMat;
   for  (modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
     if (materialName == (*modMat)->material->getName())
@@ -748 +748 @@
         {
           tmpFace->material->select();
-          PRINTF(5)("using material %s for coming Faces.\n", tmpFace->material->getName());
+          PRINTF(5)("using material %s for coming Faces.\n", tmpFace->material->getCName());
         }
       }
@@ -840 +840 @@
       else if( tmpFace->vertexCount > 4) {
         if (!warned)        {
-          PRINTF(2)("This model (%s) got over 4 vertices per face <=> conflicts in the CD engine!\n", this->getName());
+          PRINTF(2)("This model (%s) got over 4 vertices per face <=> conflicts in the CD engine!\n", this->getCName());
           warned = true;
         }