Changeset 3065 in orxonox.OLD for orxonox

Timestamp:

Dec 3, 2004, 2:54:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: Material now working.

Location:

orxonox/trunk/importer

Files:

• object.cc (modified) (4 diffs)
• object.h (modified) (1 diff)

orxonox/trunk/importer/object.cc

@@ -377 +377 @@
     }
 
-  currentGroup->faceCount++;
+  currentGroup->faceCount += currentGroup->currentFace->vertexCount -2;
 }
 
@@ -483 +483 @@
   face->firstElem = NULL;
   
-  face->material = NULL;
+  face->materialString = NULL;
   
   face->next = NULL;
@@ -515 +515 @@
       while (tmpFace != NULL)
         {
-          if (tmpFace->vertexCount == 3)
+          if (tmpFace->vertexCount == 0 && tmpFace->materialString != NULL)
+            {
+              if (currentGroup->faceMode != -1)
+                glEnd();
+              currentGroup->faceMode = 0;
+              if (verbose >= 2)
+                printf ("using material %s for coming Faces.\n", tmpFace->materialString);
+              material->search(tmpFace->materialString)->select();
+
+            }
+
+          else if (tmpFace->vertexCount == 3)
             {
               if (currentGroup->faceMode != 3)
@@ -655 +666 @@
     }
       
-  if (currentGroup->faceMode != -1)
-    glEnd();
-  currentGroup->faceMode = 0;
-  if (verbose >= 2)
-    printf ("using material %s for coming Faces.\n", matString);
-  material->search(matString)->select();
+  if (currentGroup->faceCount >0)
+    currentGroup->currentFace = currentGroup->currentFace->next = new Face;
+  initFace (currentGroup->currentFace);
+  
+  currentGroup->currentFace->materialString = new char[strlen(matString)];
+  strcpy (currentGroup->currentFace->materialString, matString);
+  
+  if (currentGroup->faceCount == 0)
+    currentGroup->faceCount ++;
+
 }
 

orxonox/trunk/importer/object.h

@@ -51 +51 @@
     FaceElement* firstElem;
 
-    char* material;
+    char* materialString;
 
     Face* next;