Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/lib/graphics/importer/material.cc

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/lib/graphics/importer/material.cc (modified) (4 diffs)

orxonox/branches/physics/src/lib/graphics/importer/material.cc

@@ -34 +34 @@
    \param mtlName Name of the Material to be added to the Material List
 */
-Material::Material (char* mtlName)
+Material::Material (const char* mtlName)
 {
    PRINTF(4)("initializing new Material.\n");
-  this->nextMat = NULL;
-  this->name ="";
+  this->name = NULL;
   this->setIllum(3);
   this->setDiffuse(0,0,0);
@@ -55 +54 @@
   this->specularTextureSet = false;
 
-  if (mtlName)
-    this->setName (mtlName);
-  else
-    this->setName("");
+  this->setName(mtlName);
 }
 
@@ -71 +67 @@
   if (this->diffuseTexture)
     ResourceManager::getInstance()->unload(this->diffuseTexture);
-  if (this->nextMat)
-    delete this->nextMat;
-}
-
-/**
-   \brief adds a new Material to the List.
-   this Function will append a new Material to the end of a Material List.
-   \param mtlName The name of the Material to be added.
-*/
-Material* Material::addMaterial(char* mtlName)
-{
-  PRINTF(4)("adding Material %s.\n", mtlName);
-   Material* tmpMat = this;
-  while (tmpMat->nextMat != NULL)
-    {
-      tmpMat = tmpMat->nextMat;
-    }
-  tmpMat->nextMat = new Material(mtlName);
-  return tmpMat->nextMat;
-  
-}
-
-/**
-   \brief Search for a Material called mtlName
-   \param mtlName the Name of the Material to search for
-   \returns Material named mtlName if it is found. NULL otherwise.
-*/
-Material* Material::search(char* mtlName)
-{
-  PRINTF(5)("Searching for material %s", mtlName);
-  Material* searcher = this;
-  while (searcher != NULL)
-    {
-      PRINT(5)(".");
-      if (!strcmp (searcher->getName(), mtlName))
-        {
-          PRINT(5)("found.\n");
-          return searcher;
-        }
-      searcher = searcher->nextMat;
-    }
-  PRINT(2)("material %s not found\n", mtlName);
-  return NULL;
 }
 
@@ -168 +121 @@
    \param mtlName the Name of the Material to be set.
 */ 
-void Material::setName (char* mtlName)
-{
-  PRINTF(4)("setting Material Name to %s.\n", this->name);
-  this->name = new char [strlen(mtlName)+1];
-  strcpy(this->name, mtlName);
+void Material::setName (const char* mtlName)
+{
+  if (this->name)
+    delete this->name;
+  if (mtlName)
+    {
+      this->name = new char [strlen(mtlName)+1];
+      strcpy(this->name, mtlName);
+    }
+  else
+    {
+      this->name = new char[2];
+      strcpy(this->name, "");
+    }
 }