Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Dec 9, 2005, 6:07:05 PM (19 years ago)
Author:
hdavid
Message:

branches/avi_play: some init stuff

Location:
branches/avi_play/src/subprojects/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/avi_play/src/subprojects/importer/importer.cc

    r4741 r6003  
    2222#include "objModel.h"
    2323#include "primitive_model.h"
     24#include "media_container.h"
    2425#include <stdlib.h>
    2526
     
    3031void Framework::moduleInit(int argc, char** argv)
    3132{
     33        //MediaContainer* test;
     34       
     35        //test = new MediaContainer(argv[1]);   
     36
     37
    3238  ResourceManager::getInstance()->addImageDir("./");
    3339
  • branches/avi_play/src/subprojects/importer/multitex.cc

    r5924 r6003  
    5656
    5757
    58   obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
     58  obj = new PrimitiveModel(PRIM_PLANE, 10.0);
    5959
    6060  ResourceManager::getInstance()->debug();
     
    7373      switch (event->key.keysym.sym)
    7474        {
    75         case SDLK_i:
     75        case SDLK_1:
     76                                        obj = new PrimitiveModel(PRIM_CUBE, 10.0);
     77          break;
     78                                case SDLK_2:
     79                                        obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
     80          break;
     81                                case SDLK_3:
     82                                        obj = new PrimitiveModel(PRIM_PLANE, 10.0);
    7683          break;
    7784        }
Note: See TracChangeset for help on using the changeset viewer.