Changeset 338 for trunk

Timestamp:

09/22/14 23:54:01 (11 years ago)

Author:

epyon

Message:

• io_events for controllers

Location:

trunk

Files:

• nv/core/io_event.hh (modified) (3 diffs)
• nv/detail/io_event_list.inc (modified) (1 diff)
• src/core/io_event.cc (modified) (2 diffs)
• src/sdl/sdl_input.cc (modified) (3 diffs)

trunk/nv/core/io_event.hh

@@ -102 +102 @@
         };
 
+        struct pad_button_event
+        {
+                /// Pad ID
+                sint32 id;
+                /// Button that is affected
+                uint8 button;
+                /// True if pressed
+                bool pressed;
+        };
+
+        struct pad_axis_event
+        {
+                /// Pad ID
+                sint32 id;
+                /// Axis ID
+                uint8 axis;
+                /// Value
+                sint16 value;
+        };
+
         struct joy_button_event
         {
@@ -174 +194 @@
                         mouse_move_event   mmove;
                         mouse_wheel_event  mwheel;
+                        pad_button_event   pbutton;
+                        pad_axis_event     paxis;
                         joy_button_event   jbutton;
                         joy_axis_event     jaxis;
@@ -214 +236 @@
          */
         //void register_io_types( type_database* db );
+
+        void log_event( const io_event& e );
 }
 

trunk/nv/detail/io_event_list.inc

@@ -3 +3 @@
 NV_IO_EVENT( EV_MOUSE_MOVE )
 NV_IO_EVENT( EV_MOUSE_WHEEL )
+NV_IO_EVENT( EV_PAD_BUTTON )
+NV_IO_EVENT( EV_PAD_AXIS )
 NV_IO_EVENT( EV_JOY_BUTTON )
 NV_IO_EVENT( EV_JOY_AXIS )

trunk/src/core/io_event.cc

@@ -6 +6 @@
 
 #include "nv/core/io_event.hh"
+
+#include "nv/core/logging.hh"
 
 using namespace nv;
@@ -40 +42 @@
         NV_RETURN_COVERED_DEFAULT( "EV_UNKNOWN" );
         };
+}
+
+void nv::log_event( const io_event& e )
+{
+        NV_LOG( LOG_INFO, "Event: " << get_io_event_name( e.type ) );
 }
 

trunk/src/sdl/sdl_input.cc

@@ -15 +15 @@
 {
         if ( ! SDL_WasInit( SDL_INIT_JOYSTICK ) ) SDL_InitSubSystem( SDL_INIT_JOYSTICK );
+        if ( ! SDL_WasInit( SDL_INIT_GAMECONTROLLER ) ) SDL_InitSubSystem( SDL_INIT_GAMECONTROLLER );
 }
 
@@ -140 +141 @@
 }
 
+static bool sdl_pad_button_event_to_io_event( const SDL_ControllerButtonEvent& cb, io_event& cevent )
+{
+        cevent.type            = EV_PAD_BUTTON;
+        cevent.pbutton.id      = cb.which;
+        cevent.pbutton.button  = cb.button;
+        cevent.pbutton.pressed = (cb.type == SDL_PRESSED);
+        return true;
+}
+
+static bool sdl_pad_axis_event_to_io_event( const SDL_ControllerAxisEvent& ca, io_event& cevent )
+{
+        cevent.type          = EV_PAD_AXIS;
+        cevent.paxis.id      = ca.which;
+        cevent.paxis.axis    = ca.axis;
+        cevent.paxis.value   = ca.value;
+        return true;
+}
+
+
 static bool sdl_joy_button_event_to_io_event( const SDL_JoyButtonEvent& jb, io_event& jevent )
 {
@@ -202 +222 @@
         case SDL_SYSWMEVENT      : ioevent.type = EV_SYSTEM; return true;
         case SDL_QUIT            : ioevent.type = EV_QUIT;   return true;
+        case SDL_CONTROLLERAXISMOTION : return sdl_pad_axis_event_to_io_event( e.caxis, ioevent ); 
+        case SDL_CONTROLLERBUTTONDOWN : return sdl_pad_button_event_to_io_event( e.cbutton, ioevent ); 
+        case SDL_CONTROLLERBUTTONUP   :
         case SDL_JOYAXISMOTION   : return sdl_joy_axis_event_to_io_event( e.jaxis, ioevent ); 
         case SDL_JOYBALLMOTION   : return sdl_joy_ball_event_to_io_event( e.jball, ioevent );