Changeset 2833 in orxonox.OLD for orxonox

Timestamp:

Nov 12, 2004, 11:55:07 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: check if mtl exists, vn, vt do not have to be defined. Scaling ablility.

Location:

orxonox/trunk/importer

Files:

• object.cc (modified) (5 diffs)
• object.h (modified) (2 diffs)

orxonox/trunk/importer/object.cc

@@ -35 +35 @@
 }
 
+Object::Object(char* fileName, float scaling)
+{
+  initialize();
+  scaleFactor = scaling;
+
+  importFile (fileName);
+
+  finalize();
+}
+
+bool Object::initialize (void)
+{
+  if (verbose >=3)
+    printf("new 3D-Object is being created\n"); 
+  faceMode = -1;
+  if ( (listNumber = glGenLists(1)) == 0 )
+    {
+      printf ("list could not be created for this Object\n");
+      return false;
+    }
+
+  mtlFileName = "";
+  scaleFactor = 1;
+  vertices = new Array();
+  normals = new Array();
+  vTexture = new Array();
+
+  glNewList (listNumber, GL_COMPILE);
+  glEnableClientState (GL_VERTEX_ARRAY);
+  glEnableClientState (GL_NORMAL_ARRAY);
+  //  glEnableClientState (GL_TEXTURE_COORD_ARRAY);
+
+  return true;
+}
+
 bool Object::importFile (char* fileName)
 {
@@ -41 +76 @@
   objFileName = fileName;
   this->readFromObjFile (objFileName);
-  return true;
-}
-
-bool Object::initialize (void)
-{
-  if (verbose >=3)
-    printf("new 3D-Object is being created\n"); 
-  faceMode = -1;
-  if ( (listNumber = glGenLists(1)) == 0 )
-    {
-      printf ("list could not be created for this Object\n");
-      return false;
-    }
-  vertices = new Array();
-  normals = new Array();
-  vTexture = new Array();
-
-  glNewList (listNumber, GL_COMPILE);
-  glEnableClientState (GL_VERTEX_ARRAY);
-  glEnableClientState (GL_NORMAL_ARRAY);
-  //  glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-
   return true;
 }
@@ -155 +168 @@
   if (verbose >= 3)
     printf ("reading in a vertex: %s %s %s\n", subbuffer1, subbuffer2, subbuffer3);
-  vertices->addEntry(atof(subbuffer1), atof(subbuffer2), atof(subbuffer3));
+  vertices->addEntry(atof(subbuffer1)*scaleFactor, atof(subbuffer2)*scaleFactor, atof(subbuffer3)*scaleFactor);
   return true;
 }
@@ -214 +227 @@
 bool Object::addGLElement (char* elementString)
 {
+  if (verbose >=3)
+    printf ("importing grafical Element.... including to openGL\n");
   char* vertex = elementString;
+
   char* texture;
-  char* normal;
   texture = strstr (vertex, "/");
   texture[0] = '\0';
   texture ++;
-  normal = strstr (texture, "/");
-  normal[0] = '\0';
-  normal ++;
-  if (verbose >= 4)
-    printf ("importing grafical Element.... including to openGL\n");
-  //glArrayElement(atoi(vertex)-1);
-  glNormal3fv(normals->getArray() +(atoi(normal)-1)*3);
   glTexCoord2fv(vTexture->getArray()+(atoi(texture)-1)*2);
+
+  char* normal;
+  if ((normal = strstr (texture, "/")) !=NULL)
+    {
+      normal[0] = '\0';
+      normal ++;
+      //glArrayElement(atoi(vertex)-1);
+      glNormal3fv(normals->getArray() +(atoi(normal)-1)*3);
+    }
   glVertex3fv(vertices->getArray() +(atoi(vertex)-1)*3);
 
@@ -315 +332 @@
 bool Object::readUseMtl (char* matString)
 {
+  if (!strcmp (mtlFileName, ""))
+    {
+      if (verbose >= 1)
+        printf ("Not using new defined material, because no mtlFile found yet\n");
+      return false;
+    }
+      
   if (faceMode != -1)
     glEnd();

orxonox/trunk/importer/object.h

@@ -23 +23 @@
   Object ();
   Object (char* fileName);
+  Object(char* fileName, float scaling);
   ~Object ();
   
@@ -45 +46 @@
   bool readVertices;
   Material* material;
+  float scaleFactor;
 
   ifstream* OBJ_FILE;