Changeset 2846 in orxonox.OLD for orxonox

Timestamp:

Nov 12, 2004, 9:33:01 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: bug-fix. closed file at the wrong position

Location:

orxonox/trunk/importer

Files:

• framework.cc (modified) (1 diff)
• object.cc (modified) (3 diffs)

orxonox/trunk/importer/framework.cc

@@ -46 +46 @@
     return 0;
   }
-  if (argc >=3)
+  if (argc>=3)
     obj = new Object (argv[1], atof(argv[2]));
-  else
+  else if (argc>=2)
     obj = new Object(argv[1]);
-
+  else obj = new Object();
   GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
   glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);

orxonox/trunk/importer/object.cc

@@ -24 +24 @@
 
   initialize();
-  
-  importFile ("");
+  //  importFile ("");
+  BoxObject();
 
   finalize();
@@ -109 +109 @@
   if (verbose >=3)
     printf("finalizing the 3D-Object\n"); 
-  OBJ_FILE->close();
   glEnd();
   glEndList();
@@ -183 +182 @@
         readVertexTexture(Buffer+3);
       }
-          
-
-    }
-  
-
-  
-  
+    }
+  OBJ_FILE->close();
+
 }