Changeset 3914 in orxonox.OLD

Timestamp:

Apr 21, 2005, 1:46:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: materialList is now a property of model not material, makes more sense

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• material.cc (modified) (2 diffs)
• material.h (modified) (2 diffs)
• model.cc (modified) (2 diffs)
• objModel.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -37 +37 @@
 {
    PRINTF(4)("initializing new Material.\n");
-  this->nextMat = NULL;
   this->name = NULL;
   this->setIllum(3);
@@ -68 +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(const 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(const 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;
 }
 

orxonox/trunk/src/lib/graphics/importer/material.h

@@ -27 +27 @@
  public:
   Material (const char* mtlName = NULL);
-  Material* addMaterial(const char* mtlName);
   ~Material ();
 
-  Material* search(const char* mtlName);
   bool select (void);
 
@@ -74 +72 @@
   bool specularTextureSet;//!< Chekcs if the specular texture is Set.
 
-  Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
-
-
 };
 #endif

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -345 +345 @@
 }
 
+/**
+   \brief finds a Material by its name and returns it
+   \param materialName the Name of the material to search for.
+   \returns the Material if found, NULL otherwise
+*/
 Material* Model::findMaterialByName(const char* materialName)
 {
@@ -589 +594 @@
   this->initFace (this->currentGroup->currentFace);
   
-  this->currentGroup->currentFace->material = material->search(matString);
+  this->currentGroup->currentFace->material = this->findMaterialByName(matString);
 
   if (this->currentGroup->faceCount == 0)

orxonox/trunk/src/lib/graphics/importer/objModel.cc

@@ -221 +221 @@
       if (!strncmp(buffer, "newmtl ", 7))
         {
-          tmpMat = tmpMat->addMaterial(buffer+7);
+          tmpMat = this->addMaterial(buffer+7);//tmpMat->addMaterial(buffer+7);
         }
       // setting a illumMode