Changeset 2768 in orxonox.OLD for orxonox/branches

Timestamp:

Nov 9, 2004, 5:31:28 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/importer: works again for everything. added methode addGLElement

Location:

orxonox/branches/importer/importer

Files:

• framework.cc (modified) (2 diffs)
• object.cc (modified) (5 diffs)
• object.h (modified) (1 diff)

orxonox/branches/importer/importer/framework.cc

@@ -9 +9 @@
 void DrawGLScene()
 {
-  rotator +=.01;
+  rotator +=.001;
   
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -17 +17 @@
   glLoadIdentity();     
   gluPerspective(45.0f,500/375,0.1f,100.0f);
-  gluLookAt (10*sin(rotator),15,10*cos(rotator), 0,0,0, 0,1,0);
+  gluLookAt (5*sin(rotator),7.5,5*cos(rotator), 0,0,0, 0,1,0);
   
   obj->draw();

orxonox/branches/importer/importer/object.cc

@@ -5 +5 @@
   initialize();
 
-  importFile ("sphere.obj");
+  importFile ("reaphigh.obj");
  
 
@@ -98 +98 @@
 {
   readVertices = true;
-  char subbuffer1[10];
-  char subbuffer2[10];
-  char subbuffer3[10];
+  char subbuffer1[20];
+  char subbuffer2[20];
+  char subbuffer3[20];
   sscanf (vertexString, "%s %s %s", subbuffer1, subbuffer2, subbuffer3);
   vertices->addEntry(atof(subbuffer1), atof(subbuffer2), atof(subbuffer3));
@@ -115 +115 @@
 
   readVertices = false;
-  char subbuffer1[10];
-  char subbuffer2[10];
-  char subbuffer3[10];
-  char subbuffer4[10] ="";
+  char subbuffer1[20];
+  char subbuffer2[20];
+  char subbuffer3[20];
+  char subbuffer4[20] ="";
   sscanf (faceString, "%s %s %s %s", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
   //      vertices->addEntry(atof(subbuffer1), atof(subbuffer2), atof(subbuffer3));
@@ -132 +132 @@
       faceMode = 3;
       //printf ("triag: %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3);
-      glArrayElement(atoi(subbuffer1));
-      glArrayElement(atoi(subbuffer2));
-      glArrayElement(atoi(subbuffer3));
-
+      addGLElement(subbuffer1);
+      addGLElement(subbuffer2);
+      addGLElement(subbuffer3);
       return true;
     }
@@ -147 +146 @@
         }
       faceMode = 4;
-      //printf ("quad: %s, %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
-      glArrayElement(atoi(subbuffer1));
-      glArrayElement(atoi(subbuffer2));
-      glArrayElement(atoi(subbuffer3));
-      glArrayElement(atoi(subbuffer4));
+      printf ("quad: %s, %s, %s, %s\n", subbuffer1, subbuffer2, subbuffer3, subbuffer4);
+      addGLElement(subbuffer1);
+      addGLElement(subbuffer2);
+      addGLElement(subbuffer3);
+      addGLElement(subbuffer4);
       return true;
     }
 }
+
+bool Object::addGLElement (char* elementString)
+{
+  char* pointTo;
+  pointTo = strstr (elementString, "/");
+  pointTo[0] = '\0';
+  printf ("f: %s\n", elementString);
+  glArrayElement(atoi(elementString)-1);
+
+}

orxonox/branches/importer/importer/object.h

@@ -35 +35 @@
   bool readVT (char* vtString);
 
+  bool addGLElement (char* elementString);
 };