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

Timestamp:

Dec 9, 2005, 6:07:05 PM (18 years ago)

Author:

hdavid

Message:

branches/avi_play: some init stuff

Location:

branches/avi_play/src/subprojects/importer

Files:

• importer.cc (modified) (2 diffs)
• multitex.cc (modified) (2 diffs)

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

@@ -22 +22 @@
 #include "objModel.h"
 #include "primitive_model.h"
+#include "media_container.h"
 #include <stdlib.h>
 
@@ -30 +31 @@
 void Framework::moduleInit(int argc, char** argv)
 {
+        //MediaContainer* test;
+        
+        //test = new MediaContainer(argv[1]);   
+
+
   ResourceManager::getInstance()->addImageDir("./");
 

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

@@ -56 +56 @@
 
 
-  obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
+  obj = new PrimitiveModel(PRIM_PLANE, 10.0);
 
   ResourceManager::getInstance()->debug();
@@ -73 +73 @@
       switch (event->key.keysym.sym)
         {
-        case SDLK_i:
+        case SDLK_1:
+                                        obj = new PrimitiveModel(PRIM_CUBE, 10.0);
+          break;
+                                case SDLK_2:
+                                        obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
+          break;
+                                case SDLK_3:
+                                        obj = new PrimitiveModel(PRIM_PLANE, 10.0);
           break;
         }