Changeset 1358Tweet

Timestamp:

May 9, 2012, 6:40:56 PM (11 years ago)

Author:

sam

Message:

input: support Xbox input system for gamepads.

Location:

trunk

Files:

• src/Makefile.am (modified) (1 diff)
• src/platform/xbox/xboxapp.cpp (modified) (2 diffs)
• src/platform/xbox/xboxinput.cpp (added)
• src/platform/xbox/xboxinput.h (added)
• win32/lolcore.vcxproj (modified) (2 diffs)
• win32/lolcore.vcxproj.filters (modified) (2 diffs)
• win32/lolengine.sln (modified) (1 diff)

trunk/src/Makefile.am

@@ -71 +71 @@
 if HAVE_XBOX
 xbox_sources = \
-    platform/xbox/xboxapp.cpp platform/xbox/xboxapp.h
+    platform/xbox/xboxapp.cpp platform/xbox/xboxapp.h \
+    platform/xbox/xboxinput.cpp platform/xbox/xboxinput.h
 endif
 

trunk/src/platform/xbox/xboxapp.cpp

@@ -18 +18 @@
 
 #include "core.h"
-#include "lolgl.h"
 #include "xboxapp.h"
+#include "xboxinput.h"
 
 #if defined _XBOX
@@ -51 +51 @@
     Ticker::Setup(fps);
     Video::Setup(res);
+
+    /* Autoreleased objects */
+    new XboxInput();
 #endif
 }

trunk/win32/lolcore.vcxproj

@@ -112 +112 @@
     <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" />
     <ClCompile Include="..\src\platform\xbox\xboxapp.cpp" />
+    <ClCompile Include="..\src\platform\xbox\xboxinput.cpp" />
     <ClCompile Include="..\src\profiler.cpp" />
     <ClCompile Include="..\src\sample.cpp" />
@@ -170 +171 @@
     <ClInclude Include="..\src\platform\sdl\sdlinput.h" />
     <ClInclude Include="..\src\platform\xbox\xboxapp.h" />
+    <ClInclude Include="..\src\platform\xbox\xboxinput.h" />
     <ClInclude Include="..\src\profiler.h" />
     <ClInclude Include="..\src\sample.h" />

trunk/win32/lolcore.vcxproj.filters

@@ -194 +194 @@
       <Filter>src\platform\xbox</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\platform\xbox\xboxinput.cpp">
+      <Filter>src\platform\xbox</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\gpu\indexbuffer.cpp">
       <Filter>src\gpu</Filter>
@@ -367 +370 @@
       <Filter>src\platform\xbox</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\platform\xbox\xboxinput.h">
+      <Filter>src\platform\xbox</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\gpu\indexbuffer.h">
       <Filter>src\gpu</Filter>

trunk/win32/lolengine.sln

@@ -260 +260 @@
                 {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
                 {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
-                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
                 {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}