Changeset 9371 in orxonox.OLD for branches/proxy/src/lib/graphics/importer

Timestamp:

Jul 20, 2006, 11:08:16 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ORXONOX is now completely std::stringed

Location:

branches/proxy/src/lib/graphics/importer

Files:

• material.cc (modified) (7 diffs)
• static_model.cc (modified) (6 diffs)
• texture.cc (modified) (1 diff)
• texture_sequence.cc (modified) (1 diff)
• vertex_array_model.cc (modified) (3 diffs)

branches/proxy/src/lib/graphics/importer/material.cc

@@ -88 +88 @@
 Material::~Material()
 {
-  PRINTF(5)("delete Material %s.\n", this->getName());
+  PRINTF(5)("delete Material %s.\n", this->getCName());
 
   if (this->ambientTexture != NULL)
@@ -217 +217 @@
 void Material::setIllum (int illum)
 {
-  PRINTF(4)("setting illumModel of Material %s to %i\n", this->getName(), illum);
+  PRINTF(4)("setting illumModel of Material %s to %i\n", this->getCName(), illum);
   this->illumModel = illum;
 }
@@ -229 +229 @@
 void Material::setDiffuse (float r, float g, float b)
 {
-  PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
+  PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->getCName(), r, g, b);
   this->diffuse = Color(r, g, b, this->diffuse.a() );
 }
@@ -242 +242 @@
 void Material::setAmbient (float r, float g, float b)
 {
-  PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
+  PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->getCName(), r, g, b);
   this->ambient = Color(r, g, b, 1.0);
 }
@@ -254 +254 @@
 void Material::setSpecular (float r, float g, float b)
 {
-  PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
+  PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->getCName(), r, g, b);
   this->specular = Color (r, g, b, 1.0);
 }
@@ -273 +273 @@
 void Material::setTransparency (float trans)
 {
-  PRINTF(4)("setting Transparency of Material %s to %f.\n", this->getName(), trans);
+  PRINTF(4)("setting Transparency of Material %s to %f.\n", this->getCName(), trans);
   this->diffuse.a() = trans;
 }
@@ -455 +455 @@
 void Material::debug() const
 {
-  PRINT(0)("Debug Material: %s\n", this->getName());
+  PRINT(0)("Debug Material: %s\n", this->getCName());
   PRINT(0)("illumModel: %d ; ShiniNess %f\n", this->illumModel, shininess);
   PRINT(0)("diffuseColor: "); diffuse.debug();

branches/proxy/src/lib/graphics/importer/static_model.cc

@@ -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
@@ -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;
 }
@@ -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;
         }

branches/proxy/src/lib/graphics/importer/texture.cc

@@ -230 +230 @@
   if (this->data->getStoredImage() != NULL)
   {
-    PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
+    PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassCName(), this->getCName());
     this->setTexture(Texture::loadTexToGL(this->data->getStoredImage()));
   }

branches/proxy/src/lib/graphics/importer/texture_sequence.cc

@@ -225 +225 @@
 bool TextureSequence::rebuild()
 {
-  PRINTF(3)("Reloading TextureSequence of %s '%s'\n", this->getClassName(), this->getName());
+  PRINTF(3)("Reloading TextureSequence of %s '%s'\n", this->getClassCName(), this->getCName());
 
   for (unsigned int i = 0; i < this->textures.size(); i++)

branches/proxy/src/lib/graphics/importer/vertex_array_model.cc

@@ -116 +116 @@
 VertexArrayModel::~VertexArrayModel()
 {
-  PRINTF(4)("Deleting VertexArrayModel %s\n", this->getName());
+  PRINTF(4)("Deleting VertexArrayModel %s\n", this->getCName());
 }
 
@@ -127 +127 @@
 void VertexArrayModel::draw() const
 {
-  PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
+  PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getCName());
   glEnableClientState(GL_VERTEX_ARRAY );
   glEnableClientState(GL_TEXTURE_COORD_ARRAY );
@@ -343 +343 @@
 void VertexArrayModel::debug() const
 {
-  PRINT(0)("VertexArrayModel (%s): debug\n", this->getName());
+  PRINT(0)("VertexArrayModel (%s): debug\n", this->getCName());
   PRINT(0)("Stripes: %d; Indices: %d; Vertices: %d; Normals %d; TextCoords %d; Colors %d\n",
             this->stripes.size(),