Changeset 4363 in orxonox.OLD for orxonox/trunk

Timestamp:

May 28, 2005, 3:06:47 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: finished work on the event dispatcher, now implementing the event reaction

Location:

orxonox/trunk/src/util/event

Files:

• event_def.h (modified) (1 diff)
• event_handler.cc (modified) (3 diffs)

orxonox/trunk/src/util/event/event_def.h

@@ -8 +8 @@
 #define _EVENT_DEF_H
 
+#include "SDL_keysym.h"
+
 #define CMD_LENGHT 16
+
+typedef enum extEventTyes
+  {
+    EV_MOUSE_MOTION = SDLK_LAST,
+    EV_MOUSE_BUTTON,
+    EV_JOY_AXIS_MOTION,
+    EV_JOY_BALL_MOTION,
+    EV_JOY_HAT_MOTION,
+    EV_JOY_BUTTON
+  };
 
 

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

@@ -12 +12 @@
    main-programmer: Patrick Boenzli
    co-programmer: 
+
+   This code is inspired by Christian Meyers CommandNode code (in Orxonox v0.2.3)
 */
 
@@ -23 +25 @@
 #include "keynames.h"
 
-#include "SDL_keysym.h"
 
 using namespace std;
@@ -230 +231 @@
           break;
         case SDL_MOUSEMOTION:
-          /*
-          strcpy( cmd.cmd, "cursor");
-          cmd.x = event.motion.x;
-          cmd.y = event.motion.y;
-          cmd.xrel = event.motion.xrel;
-          cmd.yrel = event.motion.yrel;
-          if( strlen (cmd.cmd) > 0) relay(&cmd);
-          */
+          ev.bPressed = false;
+          ev.type = EV_MOUSE_MOTION;
+          ev.x = event.motion.x;
+          ev.y = event.motion.y;
+          ev.xRel = event.motion.xrel;
+          ev.yRel = event.motion.yrel;
           break;
         case SDL_MOUSEBUTTONUP:
-          /*
-          strcpy( cmd.cmd, aliases->buttons[event.button.button]);
-          cmd.bUp = true;
-          if( strlen (cmd.cmd) > 0) relay(&cmd);
-          */
+          ev.bPressed = false;
+          ev.type = EV_MOUSE_BUTTON;
           break;
         case SDL_MOUSEBUTTONDOWN:
-          /*
-          strcpy( cmd.cmd, aliases->buttons[event.button.button]);
-          cmd.bUp = false;
-          if( strlen (cmd.cmd) > 0) relay(&cmd);
-          */
+          ev.bPressed = true;
+          ev.type = EV_MOUSE_BUTTON;
           break;
         case SDL_JOYAXISMOTION:
+          ev.bPressed = false;
+          ev.type = EV_JOY_AXIS_MOTION;
+          break;
         case SDL_JOYBALLMOTION:
+          ev.bPressed = false;
+          ev.type = EV_JOY_BALL_MOTION;
+          break;
         case SDL_JOYHATMOTION:
+          ev.bPressed = false;
+          ev.type = EV_JOY_HAT_MOTION;
+          break;
         case SDL_JOYBUTTONDOWN:
+          ev.bPressed = true;
+          ev.type = EV_JOY_BUTTON;
+          break;
         case SDL_JOYBUTTONUP:
+          ev.bPressed = true;
+          ev.type = EV_JOY_BUTTON;
           break;
         default: