Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4398 in orxonox.OLD for orxonox


Ignore:
Timestamp:
May 30, 2005, 5:01:25 PM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: moved the keynames strucure to a place closer to util/event, some small tests

Location:
orxonox/trunk/src
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r4386 r4398  
    4848
    4949orxonox_SOURCES= orxonox.cc \
    50                  defs/keynames.cc \
    5150                 command_node.cc \
    5251                 util/loading/game_loader.cc \
    … …  
    6059                 util/event/event_listener.cc \
    6160                 util/event/key_mapper.cc \
     61                 util/event/key_names.cc \
    6262                 util/object_manager.cc \
    6363                 util/garbage_collector.cc \
    … …  
    111111noinst_HEADERS = orxonox.h \
    112112                 ability.h \
    113                  defs/keynames.h \
    114113                 command_node.h \
    115114                 action_listener.h \
    … …  
    126125                 util/event/event_handler.h \
    127126                 util/event/key_mapper.h \
     127                 util/event/key_names.h \
    128128                 util/object_manager.h \
    129129                 util/garbage_collector.h \

  • orxonox/trunk/src/Makefile.in

    r4392 r4398  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) keynames.$(OBJEXT) \
    56         command_node.$(OBJEXT) game_loader.$(OBJEXT) \
    57         track_manager.$(OBJEXT) track_node.$(OBJEXT) \
    58         animation.$(OBJEXT) animation3d.$(OBJEXT) \
     55am_orxonox_OBJECTS = orxonox.$(OBJEXT) command_node.$(OBJEXT) \
     56        game_loader.$(OBJEXT) track_manager.$(OBJEXT) \
     57        track_node.$(OBJEXT) animation.$(OBJEXT) animation3d.$(OBJEXT) \
    5958        animation_player.$(OBJEXT) event.$(OBJEXT) \
    6059        event_handler.$(OBJEXT) event_listener.$(OBJEXT) \
    61         key_mapper.$(OBJEXT) object_manager.$(OBJEXT) \
    62         garbage_collector.$(OBJEXT) list.$(OBJEXT) \
    63         resource_manager.$(OBJEXT) factory.$(OBJEXT) \
     60        key_mapper.$(OBJEXT) key_names.$(OBJEXT) \
     61        object_manager.$(OBJEXT) garbage_collector.$(OBJEXT) \
     62        list.$(OBJEXT) resource_manager.$(OBJEXT) factory.$(OBJEXT) \
    6463        load_param.$(OBJEXT) state.$(OBJEXT) story_entity.$(OBJEXT) \
    6564        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
    … …  
    10099@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    101100@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po \
    102 @AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/keynames.Po \
     101@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po \
    103102@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    104103@AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
    … …  
    263262
    264263orxonox_SOURCES = orxonox.cc \
    265                  defs/keynames.cc \
    266264                 command_node.cc \
    267265                 util/loading/game_loader.cc \
    … …  
    275273                 util/event/event_listener.cc \
    276274                 util/event/key_mapper.cc \
     275                 util/event/key_names.cc \
    277276                 util/object_manager.cc \
    278277                 util/garbage_collector.cc \
    … …  
    326325noinst_HEADERS = orxonox.h \
    327326                 ability.h \
    328                  defs/keynames.h \
    329327                 command_node.h \
    330328                 action_listener.h \
    … …  
    341339                 util/event/event_handler.h \
    342340                 util/event/key_mapper.h \
     341                 util/event/key_names.h \
    343342                 util/object_manager.h \
    344343                 util/garbage_collector.h \
    … …  
    433432          esac; \
    434433        done; \
    435         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     434        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    436435        cd $(top_srcdir) && \
    437           $(AUTOMAKE) --gnu  src/Makefile
     436          $(AUTOMAKE) --foreign  src/Makefile
    438437.PRECIOUS: Makefile
    439438Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    509508@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    510509@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
    511 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
     510@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
    512511@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    513512@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    … …  
    564563@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    565564
    566 keynames.o: defs/keynames.cc
    567 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keynames.o -MD -MP -MF "$(DEPDIR)/keynames.Tpo" -c -o keynames.o `test -f 'defs/keynames.cc' || echo '$(srcdir)/'`defs/keynames.cc; \
    568 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/keynames.Tpo" "$(DEPDIR)/keynames.Po"; else rm -f "$(DEPDIR)/keynames.Tpo"; exit 1; fi
    569 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='defs/keynames.cc' object='keynames.o' libtool=no @AMDEPBACKSLASH@
    570 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/keynames.Po' tmpdepfile='$(DEPDIR)/keynames.TPo' @AMDEPBACKSLASH@
    571 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    572 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o keynames.o `test -f 'defs/keynames.cc' || echo '$(srcdir)/'`defs/keynames.cc
    573 
    574 keynames.obj: defs/keynames.cc
    575 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keynames.obj -MD -MP -MF "$(DEPDIR)/keynames.Tpo" -c -o keynames.obj `if test -f 'defs/keynames.cc'; then $(CYGPATH_W) 'defs/keynames.cc'; else $(CYGPATH_W) '$(srcdir)/defs/keynames.cc'; fi`; \
    576 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/keynames.Tpo" "$(DEPDIR)/keynames.Po"; else rm -f "$(DEPDIR)/keynames.Tpo"; exit 1; fi
    577 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='defs/keynames.cc' object='keynames.obj' libtool=no @AMDEPBACKSLASH@
    578 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/keynames.Po' tmpdepfile='$(DEPDIR)/keynames.TPo' @AMDEPBACKSLASH@
    579 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    580 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o keynames.obj `if test -f 'defs/keynames.cc'; then $(CYGPATH_W) 'defs/keynames.cc'; else $(CYGPATH_W) '$(srcdir)/defs/keynames.cc'; fi`
    581 
    582565game_loader.o: util/loading/game_loader.cc
    583566@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT game_loader.o -MD -MP -MF "$(DEPDIR)/game_loader.Tpo" -c -o game_loader.o `test -f 'util/loading/game_loader.cc' || echo '$(srcdir)/'`util/loading/game_loader.cc; \
    … …  
    739722@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    740723@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_mapper.obj `if test -f 'util/event/key_mapper.cc'; then $(CYGPATH_W) 'util/event/key_mapper.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/key_mapper.cc'; fi`
     724
     725key_names.o: util/event/key_names.cc
     726@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT key_names.o -MD -MP -MF "$(DEPDIR)/key_names.Tpo" -c -o key_names.o `test -f 'util/event/key_names.cc' || echo '$(srcdir)/'`util/event/key_names.cc; \
     727@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_names.Tpo" "$(DEPDIR)/key_names.Po"; else rm -f "$(DEPDIR)/key_names.Tpo"; exit 1; fi
     728@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/key_names.cc' object='key_names.o' libtool=no @AMDEPBACKSLASH@
     729@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_names.Po' tmpdepfile='$(DEPDIR)/key_names.TPo' @AMDEPBACKSLASH@
     730@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     731@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_names.o `test -f 'util/event/key_names.cc' || echo '$(srcdir)/'`util/event/key_names.cc
     732
     733key_names.obj: util/event/key_names.cc
     734@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT key_names.obj -MD -MP -MF "$(DEPDIR)/key_names.Tpo" -c -o key_names.obj `if test -f 'util/event/key_names.cc'; then $(CYGPATH_W) 'util/event/key_names.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/key_names.cc'; fi`; \
     735@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_names.Tpo" "$(DEPDIR)/key_names.Po"; else rm -f "$(DEPDIR)/key_names.Tpo"; exit 1; fi
     736@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/key_names.cc' object='key_names.obj' libtool=no @AMDEPBACKSLASH@
     737@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_names.Po' tmpdepfile='$(DEPDIR)/key_names.TPo' @AMDEPBACKSLASH@
     738@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     739@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o key_names.obj `if test -f 'util/event/key_names.cc'; then $(CYGPATH_W) 'util/event/key_names.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/key_names.cc'; fi`
    741740
    742741object_manager.o: util/object_manager.cc

  • orxonox/trunk/src/orxonox.cc

    r4390 r4398  
    166166  localinput = new CommandNode(configfilename);
    167167
    168   //EventHandler::getInstance()->test();
     168  EventHandler::getInstance()->test();
    169169 
    170170  return 0;

  • orxonox/trunk/src/util/event/event_handler.cc

    r4390 r4398  
    198198  PRINT(0)("\n==========================| EventHandler::test () |===\n"); 
    199199  PRINT(0)("Eventhandler init successfuly\n");
    200   //KeyMapper km;
     200  KeyMapper km;
    201201  PRINT(0)("KeyMapper loaded\n");
    202   //km.loadKeyBindings();
    203   //km.debug();
     202  km.loadKeyBindings();
     203  km.debug();
    204204
    205205  PRINT(0)("=======================================================\n");     

  • orxonox/trunk/src/util/event/key_mapper.cc

    r4389 r4398  
    101101  while( parser.nextVar (namebuf, valuebuf) != -1)
    102102    {
    103       //index = nameToIndex (valuebuf);
    104       int c;
    105       if( (c = keynameToSDLK (valuebuf)) != -1)
    106         {
    107           index[1] = c; index[0] = 0;
    108         }
    109       if( (c = buttonnameToSDLB (valuebuf)) != -1)
    110         {
    111           index[1] = c; index[0] = 1;
    112         }
     103      PRINTF(0)("Keys: Parsing %s, %s now.\n", namebuf, valuebuf);
     104      index = nameToIndex (valuebuf);
    113105
    114106      switch( index[0])
    … …  
    139131  while( parser.nextVar (namebuf, valuebuf) != -1)
    140132    {
     133      PRINTF(0)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
    141134      index = nameToIndex (valuebuf);     
    142135
    … …  
    183176{
    184177  //PRINT(0)("\n==========================| KeyMapper::debug() |===\n"); 
    185   PRINT(0)("Command 'up' got SDL key-ref nr %i \n", (this->nameToIndex("UP"))[0]);
    186   PRINT(0)("Command 'down' got SDL key-ref nr %i \n", (this->nameToIndex("DOWN"))[0]);
    187   PRINT(0)("Command 'right' got SDL key-ref nr %i \n", (this->nameToIndex("RIGHT"))[0]);
    188   PRINT(0)("Command 'left' got SDL key-ref nr %i \n", (this->nameToIndex("LEFT"))[0]);
     178  PRINT(0)("Command 'up' got SDL key-ref nr %i \n", keynameToSDLK("UP"));
     179  PRINT(0)("Command 'down' got SDL key-ref nr %i \n", (this->nameToIndex("DOWN"))[1]);
     180  PRINT(0)("Command 'right' got SDL key-ref nr %i \n", (this->nameToIndex("RIGHT"))[1]);
     181  PRINT(0)("Command 'left' got SDL key-ref nr %i \n", (this->nameToIndex("LEFT"))[1]);
    189182
    190183  //PRINT(0)("=======================================================\n");       
Note: See TracChangeset for help on using the changeset viewer.