Changeset 2967 in orxonox.OLD for orxonox/trunk

Timestamp:

Nov 24, 2004, 12:56:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: set first normal before, now it is correct. line-stepping corrected

File:

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

orxonox/trunk/importer/object.cc

@@ -48 +48 @@
    \param scaling The factor that the object will be scaled with.
 */
-
 Object::Object(char* fileName, float scaling)
 {
@@ -90 +89 @@
   groupCount = 0;
   
-  initGroup (currentGroup);
+  initGroup (firstGroup);
   mtlFileName = "";
   scaleFactor = 1;
   material = new Material();
 
-  glEnableClientState (GL_VERTEX_ARRAY);
+  //  glEnableClientState (GL_VERTEX_ARRAY);
   //  glEnableClientState (GL_NORMAL_ARRAY);
   //  glEnableClientState (GL_TEXTURE_COORD_ARRAY);
@@ -226 +225 @@
   group->name = "";
   group->faceMode = -1;
-  group->faceCount =0;  
+  group->faceCount = 0;  
   if ((group->listNumber = glGenLists(1)) == 0 )
     {
@@ -237 +236 @@
       group->firstVertex = 0;
       group->firstNormal = 0;
-      group->firstNormal = 0;
+      group->firstVertexTexture = 0;
     }
   else
@@ -265 +264 @@
   glEndList();
 }
+
 /**
    \brief deletes the Arrays of the Group to save space.
@@ -480 +480 @@
       texture ++;
       if (verbose>=3)
-        printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*3, currentGroup->vTexture->getCount());
+        printf ("includeing texture #%i, and mapping it to group texture #%i, textureArray has %i entries.\n", atoi(texture), (atoi(texture)-1 - currentGroup->firstVertexTexture)*2, currentGroup->vTexture->getCount());
       glTexCoord2fv(currentGroup->vTexture->getArray()+(atoi(texture)-1 - currentGroup->firstVertexTexture)*2);
 
@@ -638 +638 @@
    \param matString the Material that will be set.
 */
-
 bool Object::readUseMtl (char* matString)
 {
@@ -670 +669 @@
   readVertex ("-0.500000 -0.500000 -0.500000");
   readVertex ("0.500000 -0.500000 -0.500000");
+
   readVertexTexture ("0.000000 0.000000");
   readVertexTexture ("1.000000 0.000000");