Changeset 3396 in orxonox.OLD for orxonox/trunk/src/importer/framework.cc

Timestamp:

Feb 6, 2005, 3:58:40 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: splitted obj-loader out of the model-class: this will enable different kinds of Filetypes to be included with the importer.
Althought there is a name-field error, the Model gets loaded and unloaded as good as previously

File:

• orxonox/trunk/src/importer/framework.cc (modified) (2 diffs)

orxonox/trunk/src/importer/framework.cc

@@ -71 +71 @@
   PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
-    obj = new Model (argv[1], atof(argv[2]));
+    obj = new OBJModel (argv[1], atof(argv[2]));
   else if (argc>=2)
-    obj = new Model(argv[1]);
+    obj = new OBJModel(argv[1]);
   else 
-    obj = new Model();
+    obj = (OBJModel*) new Model();
   
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
@@ -215 +215 @@
           case SDLK_c:
             if (!obj)
-              obj = new Model(argv[1]);
+              obj = new OBJModel(argv[1]);
             break;
           }