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

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

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

orxonox/trunk/src/importer/framework.cc

@@ -52 +52 @@
 int main(int argc, char *argv[])
 {
-  int verbose = 3;
+  verbose = 2;
 
   PRINTF(2)("This is The big verbose-Test %i, %s\n", 1, "cool");
@@ -71 +71 @@
   PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
-    obj = new Object (argv[1], atof(argv[2]));
+    obj = new Model (argv[1], atof(argv[2]));
   else if (argc>=2)
-    obj = new Object(argv[1]);
+    obj = new Model(argv[1]);
   else 
-    obj = new Object();
+    obj = new Model();
   
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
@@ -215 +215 @@
           case SDLK_c:
             if (!obj)
-              obj = new Object(argv[1]);
+              obj = new Model(argv[1]);
             break;
           }