Changeset 2794 in orxonox.OLD for orxonox

Timestamp:

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

Author:

bensch

Message:

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

Location:

orxonox/branches/importer/importer

Files:

• framework.cc (modified) (3 diffs)
• object.cc (modified) (7 diffs)
• object.h (modified) (2 diffs)

orxonox/branches/importer/importer/framework.cc

@@ -15 +15 @@
   glLoadIdentity(); // Reset the view
   
-  glMatrixMode(GL_PROJECTION);                                          // Select The Projection Matrix
+  glMatrixMode(GL_PROJECTION);
   glLoadIdentity();     
   gluPerspective(45.0f,500/375,0.1f,100.0f);
@@ -21 +21 @@
   whiteLight[1] = .5+.5*sin(rotator*10);
   whiteLight[2] = .5+.5*sin(rotator*10);
+
+  GLfloat lightPosition[] = {10.0*sin(rotator*10), 10, 19.0, 0.0};
+  glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+
   glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
   obj->draw();
@@ -46 +50 @@
   obj = new Object (argv[1]);
 
-  GLfloat lightPosition[] = {10.0, 5.0, 19.0, 0.0};
   GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
-  glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
   glLightfv(GL_LIGHT0, GL_SPECULAR, whiteLight);

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;

orxonox/branches/importer/importer/object.h

@@ -29 +29 @@
   int verticesCount;
   Array* colors;
-  Array* faces;
+  Array* normals;
   char* objFile;
   int faceMode;
@@ -41 +41 @@
   bool readFace (char* faceString);
   bool readVT (char* vtString);
+  bool readVertexNormal (char* normalString);
   bool readMtlLib (char* matFile);
   bool readUseMtl (char* mtlString);