Changeset 3073 in orxonox.OLD for orxonox

Timestamp:

Dec 3, 2004, 11:08:20 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: better numbering (previously it was not clear why you should read vertexNumber -1.

File:

• orxonox/trunk/importer/object.cc (modified) (2 diffs)

orxonox/trunk/importer/object.cc

@@ -479 +479 @@
         }
       if (vertex)
-        tmpElem->vertexNumber = atoi(vertex);
+        tmpElem->vertexNumber = atoi(vertex)-1;
       else
-        tmpElem->vertexNumber = 0;
+        tmpElem->vertexNumber = -1;
       if (texture)
-        tmpElem->texCoordNumber = atoi(texture);
+        tmpElem->texCoordNumber = atoi(texture)-1;
       else
-        tmpElem->texCoordNumber = 0;
+        tmpElem->texCoordNumber = -1;
       if (normal)
-        tmpElem->normalNumber = atoi(normal);
+        tmpElem->normalNumber = atoi(normal)-1;
       else
-        tmpElem->normalNumber = 0;
+        tmpElem->normalNumber = -1;
 
       faceString += tmpLen;
@@ -756 +756 @@
     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);
+  if (elem->texCoordNumber != -1)
+    glTexCoord2fv(vTexture->getArray() + elem->texCoordNumber * 2);
+  if (elem->normalNumber != -1)
+    glNormal3fv(normals->getArray() + elem->normalNumber * 3);
+  if (elem->vertexNumber != -1)
+    glVertex3fv(vertices->getArray() + elem->vertexNumber * 3);
 
 }