Changeset 3801 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Apr 13, 2005, 6:54:35 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: some more functionality to material
now it is possible to add an external Material, and it handles pointers instead of char-arrays

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• model.cc (modified) (5 diffs)
• model.h (modified) (2 diffs)

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

@@ -236 +236 @@
   face->firstElem = NULL;
   
-  face->materialString = NULL;
+  face->material = NULL;
   
   face->next = NULL;
@@ -288 +288 @@
   PRINTF(5)("Cleaning up Face\n");
 
-  if (face->materialString != NULL)
-      delete []face->materialString;
   if (face->firstElem != NULL)
     {
@@ -549 +547 @@
     }
   */      
-  if (this->currentGroup->faceCount >0)
+  if (this->currentGroup->faceCount > 0)
     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
   this->initFace (this->currentGroup->currentFace);
   
-  this->currentGroup->currentFace->materialString = new char[strlen(matString)+1];
-  strcpy (this->currentGroup->currentFace->materialString, matString);
-  
+  this->currentGroup->currentFace->material = material->search(matString);
+
   if (this->currentGroup->faceCount == 0)
     this->currentGroup->faceCount ++;
-
+}
+
+/**
+   \brief Function that selects a material, if changed in the obj file.
+   \param mtl the Material that will be set.
+*/
+bool Model::addUseMtl (Material* mtl)
+{
+  if (this->currentGroup->faceCount > 0)
+    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
+  this->initFace (this->currentGroup->currentFace);
+  
+  this->currentGroup->currentFace->material = mtl;
+
+  if (this->currentGroup->faceCount == 0)
+    this->currentGroup->faceCount ++;
 }
 
@@ -591 +603 @@
       while (tmpFace != NULL)
         {
-          if (tmpFace->vertexCount == 0 && tmpFace->materialString != NULL)
+          if (tmpFace->vertexCount == 0 && tmpFace->material != NULL)
             {
               if (this->currentGroup->faceMode != -1)
@@ -597 +609 @@
               this->currentGroup->faceMode = 0;
               Material* tmpMat;
-              if ((tmpMat = material->search(tmpFace->materialString)) != NULL)
+              if (tmpFace->material != NULL)
                 {
-                  tmpMat->select();
-                  PRINTF(5)("using material %s for coming Faces.\n", tmpFace->materialString);
+                  tmpFace->material->select();
+                  PRINTF(5)("using material %s for coming Faces.\n", tmpFace->material->getName());
                 }
-              else 
-                PRINTF(2)("material %s not found.\n", tmpFace->materialString);
-
-
             }
 

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

@@ -54 +54 @@
     FaceElement* firstElem; //!< Points to the first Vertex (FaceElement) of this Face.
 
-    char* materialString;   //!< The Name of the Material to which to Change.
+    Material* material;     //!< The Material to use.
 
     Face* next;             //!< Pointer to the next Face.
@@ -106 +106 @@
   bool addVertexTexture(const float u, const float v);
   bool addUseMtl(char* mtlString);
+  bool addUseMtl(Material* mtl);
   void finalize(void);