Changeset 4398 in orxonox.OLD

Timestamp:

May 30, 2005, 5:01:25 PM (19 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:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (10 diffs)
• orxonox.cc (modified) (1 diff)
• util/event/event_handler.cc (modified) (1 diff)
• util/event/key_mapper.cc (modified) (3 diffs)
• util/event/key_names.cc (added)
• util/event/key_names.h (added)

orxonox/trunk/src/Makefile.am

@@ -48 +48 @@
 
 orxonox_SOURCES= orxonox.cc \
-                 defs/keynames.cc \
                  command_node.cc \
                  util/loading/game_loader.cc \
@@ -60 +59 @@
                  util/event/event_listener.cc \
                  util/event/key_mapper.cc \
+                 util/event/key_names.cc \
                  util/object_manager.cc \
                  util/garbage_collector.cc \
@@ -111 +111 @@
 noinst_HEADERS = orxonox.h \
                  ability.h \
-                 defs/keynames.h \
                  command_node.h \
                  action_listener.h \
@@ -126 +125 @@
                  util/event/event_handler.h \
                  util/event/key_mapper.h \
+                 util/event/key_names.h \
                  util/object_manager.h \
                  util/garbage_collector.h \

orxonox/trunk/src/Makefile.in

@@ -53 +53 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_orxonox_OBJECTS = orxonox.$(OBJEXT) keynames.$(OBJEXT) \
-        command_node.$(OBJEXT) game_loader.$(OBJEXT) \
-        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
-        animation.$(OBJEXT) animation3d.$(OBJEXT) \
+am_orxonox_OBJECTS = orxonox.$(OBJEXT) command_node.$(OBJEXT) \
+        game_loader.$(OBJEXT) track_manager.$(OBJEXT) \
+        track_node.$(OBJEXT) animation.$(OBJEXT) animation3d.$(OBJEXT) \
         animation_player.$(OBJEXT) event.$(OBJEXT) \
         event_handler.$(OBJEXT) event_listener.$(OBJEXT) \
-        key_mapper.$(OBJEXT) object_manager.$(OBJEXT) \
-        garbage_collector.$(OBJEXT) list.$(OBJEXT) \
-        resource_manager.$(OBJEXT) factory.$(OBJEXT) \
+        key_mapper.$(OBJEXT) key_names.$(OBJEXT) \
+        object_manager.$(OBJEXT) garbage_collector.$(OBJEXT) \
+        list.$(OBJEXT) resource_manager.$(OBJEXT) factory.$(OBJEXT) \
         load_param.$(OBJEXT) state.$(OBJEXT) story_entity.$(OBJEXT) \
         campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
@@ -100 +99 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/keynames.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
@@ -263 +262 @@
 
 orxonox_SOURCES = orxonox.cc \
-                 defs/keynames.cc \
                  command_node.cc \
                  util/loading/game_loader.cc \
@@ -275 +273 @@
                  util/event/event_listener.cc \
                  util/event/key_mapper.cc \
+                 util/event/key_names.cc \
                  util/object_manager.cc \
                  util/garbage_collector.cc \
@@ -326 +325 @@
 noinst_HEADERS = orxonox.h \
                  ability.h \
-                 defs/keynames.h \
                  command_node.h \
                  action_listener.h \
@@ -341 +339 @@
                  util/event/event_handler.h \
                  util/event/key_mapper.h \
+                 util/event/key_names.h \
                  util/object_manager.h \
                  util/garbage_collector.h \
@@ -433 +432 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/Makefile
+          $(AUTOMAKE) --foreign  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -509 +508 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
@@ -564 +563 @@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-keynames.o: defs/keynames.cc
-@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; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/keynames.Tpo" "$(DEPDIR)/keynames.Po"; else rm -f "$(DEPDIR)/keynames.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='defs/keynames.cc' object='keynames.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/keynames.Po' tmpdepfile='$(DEPDIR)/keynames.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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
-
-keynames.obj: defs/keynames.cc
-@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`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/keynames.Tpo" "$(DEPDIR)/keynames.Po"; else rm -f "$(DEPDIR)/keynames.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='defs/keynames.cc' object='keynames.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/keynames.Po' tmpdepfile='$(DEPDIR)/keynames.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@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`
-
 game_loader.o: util/loading/game_loader.cc
 @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; \
@@ -739 +722 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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`
+
+key_names.o: util/event/key_names.cc
+@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; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_names.Tpo" "$(DEPDIR)/key_names.Po"; else rm -f "$(DEPDIR)/key_names.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/key_names.cc' object='key_names.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_names.Po' tmpdepfile='$(DEPDIR)/key_names.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
+key_names.obj: util/event/key_names.cc
+@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`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/key_names.Tpo" "$(DEPDIR)/key_names.Po"; else rm -f "$(DEPDIR)/key_names.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/key_names.cc' object='key_names.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/key_names.Po' tmpdepfile='$(DEPDIR)/key_names.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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`
 
 object_manager.o: util/object_manager.cc

orxonox/trunk/src/orxonox.cc

@@ -166 +166 @@
   localinput = new CommandNode(configfilename);
 
-  //EventHandler::getInstance()->test();
+  EventHandler::getInstance()->test();
   
   return 0;

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

@@ -198 +198 @@
   PRINT(0)("\n==========================| EventHandler::test () |===\n");  
   PRINT(0)("Eventhandler init successfuly\n");
-  //KeyMapper km;
+  KeyMapper km;
   PRINT(0)("KeyMapper loaded\n");
-  //km.loadKeyBindings();
-  //km.debug();
+  km.loadKeyBindings();
+  km.debug();
 
   PRINT(0)("=======================================================\n");      

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

@@ -101 +101 @@
   while( parser.nextVar (namebuf, valuebuf) != -1)
     {
-      //index = nameToIndex (valuebuf);
-      int c;
-      if( (c = keynameToSDLK (valuebuf)) != -1)
-        {
-          index[1] = c; index[0] = 0;
-        }
-      if( (c = buttonnameToSDLB (valuebuf)) != -1)
-        {
-          index[1] = c; index[0] = 1;
-        }
+      PRINTF(0)("Keys: Parsing %s, %s now.\n", namebuf, valuebuf);
+      index = nameToIndex (valuebuf);
 
       switch( index[0])
@@ -139 +131 @@
   while( parser.nextVar (namebuf, valuebuf) != -1)
     {
+      PRINTF(0)("MISC: Parsing %s, %s now.\n", namebuf, valuebuf);
       index = nameToIndex (valuebuf);     
 
@@ -183 +176 @@
 {
   //PRINT(0)("\n==========================| KeyMapper::debug() |===\n");  
-  PRINT(0)("Command 'up' got SDL key-ref nr %i \n", (this->nameToIndex("UP"))[0]);
-  PRINT(0)("Command 'down' got SDL key-ref nr %i \n", (this->nameToIndex("DOWN"))[0]);
-  PRINT(0)("Command 'right' got SDL key-ref nr %i \n", (this->nameToIndex("RIGHT"))[0]);
-  PRINT(0)("Command 'left' got SDL key-ref nr %i \n", (this->nameToIndex("LEFT"))[0]);
+  PRINT(0)("Command 'up' got SDL key-ref nr %i \n", keynameToSDLK("UP"));
+  PRINT(0)("Command 'down' got SDL key-ref nr %i \n", (this->nameToIndex("DOWN"))[1]);
+  PRINT(0)("Command 'right' got SDL key-ref nr %i \n", (this->nameToIndex("RIGHT"))[1]);
+  PRINT(0)("Command 'left' got SDL key-ref nr %i \n", (this->nameToIndex("LEFT"))[1]);
 
   //PRINT(0)("=======================================================\n");