Changeset 3072 in orxonox.OLD for orxonox

Timestamp:

Dec 3, 2004, 10:25:20 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: improved FaceElement-Read-function. Now not strings, but ints are passed along

Location:

orxonox/trunk/importer

Files:

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

orxonox/trunk/importer/object.cc

@@ -302 +302 @@
 bool Object::cleanupFaceElement(FaceElement* faceElem)
 {
-  if (faceElem->value != NULL)
-    if (verbose>=4)
-      printf ("Cleaning up faceElement %s\n", faceElem->value);
-    //delete faceElem->value;
-
   if (faceElem->next != NULL)
     {
       cleanupFaceElement (faceElem->next);
-      //      delete faceElem->next;
+      delete faceElem->next;
     }
 }
@@ -456 +451 @@
   FaceElement* tmpElem = currentGroup->currentFace->firstElem = new FaceElement;
   tmpElem->next = NULL;
-  tmpElem->value = NULL;
   while(strcmp (faceString, "\0"))
     {
@@ -462 +456 @@
           tmpElem = tmpElem->next = new FaceElement;
       tmpElem->next = NULL;
-      tmpElem->value = NULL;
 
       char tmpValue [50];
+      int tmpLen;
+      char* vertex = NULL;
+      char* texture = NULL;
+      char* normal = NULL;
+
       sscanf (faceString, "%s", tmpValue);
-      tmpElem->value = new char [strlen(tmpValue)];
-      strcpy (tmpElem->value, tmpValue);
-
-      faceString += strlen(tmpElem->value);
+      tmpLen = strlen(tmpValue);
+      vertex = tmpValue;
+
+      if ((texture = strstr (vertex, "/")) != NULL)
+        {
+          texture[0] = '\0';
+          texture ++;
+          
+          if ((normal = strstr (texture, "/")) !=NULL)
+            {
+              normal[0] = '\0';
+              normal ++;
+            }     
+        }
+      if (vertex)
+        tmpElem->vertexNumber = atoi(vertex);
+      else
+        tmpElem->vertexNumber = 0;
+      if (texture)
+        tmpElem->texCoordNumber = atoi(texture);
+      else
+        tmpElem->texCoordNumber = 0;
+      if (normal)
+        tmpElem->normalNumber = atoi(normal);
+      else
+        tmpElem->normalNumber = 0;
+
+      faceString += tmpLen;
       if (strcmp (faceString, "\0"))
         faceString++;
@@ -709 +731 @@
             {
               //      printf ("%s\n", tmpElem->value);
-              addGLElement(tmpElem->value);
+              addGLElement(tmpElem);
               tmpElem = tmpElem->next;
             }
@@ -729 +751 @@
 
 */
-bool Object::addGLElement (char* elementString)
+bool Object::addGLElement (FaceElement* elem)
 {
   if (verbose >=3)
-    printf ("importing grafical Element to openGL: %s\n", elementString);
-  char vertex [100];
-  strcpy (vertex, elementString);
-
-  char* texture;
-  if ((texture = strstr (vertex, "/")) != NULL)
-    {
-      texture[0] = '\0';
-      texture ++;
-      glTexCoord2fv(vTexture->getArray()+(atoi(texture)-1)*2);
-
-      char* normal;
-      if ((normal = strstr (texture, "/")) !=NULL)
-        {
-          normal[0] = '\0';
-          normal ++;
-          //glArrayElement(atoi(vertex)-1);
-          glNormal3fv(normals->getArray() +(atoi(normal)-1)*3);
-        }
-    }
-  glVertex3fv(vertices->getArray() +(atoi(vertex)-1)*3);
+    printf ("importing grafical Element to openGL.\n");
+
+  if (elem->texCoordNumber)
+    glTexCoord2fv(vTexture->getArray()+(elem->texCoordNumber-1)*2);
+  if (elem->normalNumber)
+    glNormal3fv(normals->getArray() +(elem->normalNumber-1)*3);
+  if (elem->vertexNumber)
+    glVertex3fv(vertices->getArray() +(elem->vertexNumber-1)*3);
 
 }

orxonox/trunk/importer/object.h

@@ -37 +37 @@
   struct FaceElement
   {
-    char* value;
+    int vertexNumber;
+    int normalNumber;
+    int texCoordNumber;
     FaceElement* next;
   };
@@ -108 +110 @@
 
   bool importToGL (void);
-  bool addGLElement (char* elementString);
+  bool addGLElement (FaceElement* elem);
 
   void BoxObject (void);