Changeset 2794 in orxonox.OLD for orxonox/branches/importer/importer/object.cc

Timestamp:

Nov 10, 2004, 10:47:40 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: vertex normals are read in for real.

File:

• orxonox/branches/importer/importer/object.cc (modified) (7 diffs)

orxonox/branches/importer/importer/object.cc

@@ -37 +37 @@
   glNewList (listNumber, GL_COMPILE);
   glEnableClientState (GL_VERTEX_ARRAY);
+  glEnableClientState (GL_NORMAL_ARRAY);
+  //  glEnableClientState (GL_TEXTURE_COORD_ARRAY);
 
   return true;
@@ -64 +66 @@
   char Buffer[500];
   vertices = new Array();
-  faces = new Array();
+  normals = new Array();
   while(!OBJ_FILE->eof())
     {
@@ -92 +94 @@
           readUseMtl (Buffer+7);
         }
+
+      // case VertexNormal
+      else if (!strncmp(Buffer, "vn ", 2))
+      {
+        readVertexNormal(Buffer+3);
+      }
+
       // case vt
       else if (!strncmp(Buffer, "vt ", 2))
@@ -126 +135 @@
       vertices->finalizeArray();
       glVertexPointer(3, GL_FLOAT, 0, vertices->getArray());
+      normals->finalizeArray();
+      glNormalPointer(GL_FLOAT, 0, normals->getArray());
     }
 
@@ -134 +145 @@
   char subbuffer4[20] ="";
   sscanf (faceString, "%s %s %s %s", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
-  //      vertices->addEntry(atof(subbuffer1), atof(subbuffer2), atof(subbuffer3));
+  //  printf("%s, %s, %s\n", subbuffer1,subbuffer2,subbuffer3);
   if (!strcmp(subbuffer4, ""))
     {
@@ -171 +182 @@
 bool Object::addGLElement (char* elementString)
 {
-  char* pointTo;
-  pointTo = strstr (elementString, "/");
-  pointTo[0] = '\0';
-  //  printf ("f: %s\n", elementString);
-  glArrayElement(atoi(elementString)-1);
-
+  char* vertex = elementString;
+  char* texture;
+  char* normal;
+  texture = strstr (vertex, "/");
+  texture[0] = '\0';
+  texture ++;
+  normal = strstr (texture, "/");
+  normal[0] = '\0';
+  normal ++;
+  
+  //glArrayElement(atoi(vertex)-1);
+  glNormal3fv(normals->getArray() +(atoi(normal)-1)*3);
+  glVertex3fv(vertices->getArray() +(atoi(vertex)-1)*3);
+
+}
+
+bool Object::readVertexNormal (char* normalString)
+{
+  readVertices = true;
+  char subbuffer1[20];
+  char subbuffer2[20];
+  char subbuffer3[20];
+  sscanf (normalString, "%s %s %s", subbuffer1, subbuffer2, subbuffer3);
+  //  printf("%s, %s, %s\n", subbuffer1,subbuffer2,subbuffer3);
+  normals->addEntry(atof(subbuffer1), atof(subbuffer2), atof(subbuffer3));
+  return true;
 }
 
@@ -190 +221 @@
   char Buffer[500];
   vertices = new Array();
-  faces = new Array();
   material = new Material();
   Material* tmpMat = material;