Changeset 6013 in orxonox.OLD for branches/avi_play/src/subprojects

Timestamp:

Dec 10, 2005, 5:56:36 PM (19 years ago)

Author:

hdavid

Message:

branches/avi_play

Location:

branches/avi_play/src/subprojects/importer

Files:

• importer.cc (modified) (1 diff)
• multitex.cc (modified) (1 diff)

branches/avi_play/src/subprojects/importer/importer.cc

@@ -31 +31 @@
 void Framework::moduleInit(int argc, char** argv)
 {
-        //MediaContainer* test;
+  MediaContainer* test;
         
-        //test = new MediaContainer(argv[1]);   
+  test = new MediaContainer(argv[1]);   
 
 

branches/avi_play/src/subprojects/importer/multitex.cc

@@ -74 +74 @@
         {
         case SDLK_1:
-                                        obj = new PrimitiveModel(PRIM_CUBE, 10.0);
+          obj = new PrimitiveModel(PRIM_CUBE, 10.0);
           break;
-                                case SDLK_2:
-                                        obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
+        case SDLK_2:
+          obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
           break;
-                                case SDLK_3:
-                                        obj = new PrimitiveModel(PRIM_PLANE, 10.0);
+        case SDLK_3:
+          obj = new PrimitiveModel(PRIM_PLANE, 10.0);
           break;
         }