Changeset 1361Tweet

Timestamp:

May 10, 2012, 1:33:51 PM (11 years ago)

Author:

sam

Message:

win32: add an Xinput class for Xbox360 controllers, because they're not
properly detected using the generic SDL driver.

Location:

trunk

Files:

• src/Makefile.am (modified) (2 diffs)
• src/platform/d3d9 (added)
• src/platform/d3d9/d3d9input.cpp (added)
• src/platform/d3d9/d3d9input.h (added)
• src/platform/sdl/sdlapp.cpp (modified) (2 diffs)
• src/platform/sdl/sdlinput.cpp (modified) (2 diffs)
• win32/Lol.Vars.props (modified) (1 diff)
• win32/lolcore.vcxproj (modified) (2 diffs)
• win32/lolcore.vcxproj.filters (modified) (3 diffs)

trunk/src/Makefile.am

@@ -23 +23 @@
     $(nacl_sources) \
     $(sdl_sources) \
+    $(d3d9_sources) \
     $(android_sources) \
     \
@@ -52 +53 @@
     platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h
 
+d3d9_sources = \
+    platform/xbox/xboxinput.cpp platform/xbox/xboxinput.h
+
 if USE_NACL
 nacl_sources = \

trunk/src/platform/sdl/sdlapp.cpp

@@ -25 +25 @@
 #include "platform/sdl/sdlapp.h"
 #include "platform/sdl/sdlinput.h"
+#if defined USE_D3D9
+#   include "platform/d3d9/d3d9input.h"
+#endif
 
 #if defined USE_SDL && defined USE_D3D9
@@ -87 +90 @@
 
     /* Autoreleased objects */
+#   if defined USE_D3D9
+    /* Prefer D3d9 for joysticks on Windows, because the X360 pads are not
+     * advertised with the proper number of axes. */
+    new D3d9Input();
+#   endif
     new SdlInput();
 #endif

trunk/src/platform/sdl/sdlinput.cpp

@@ -59 +59 @@
         /* Blacklist HDAPS, it's not a real joystick */
         char const *name = SDL_JoystickName(i);
-        if (strstr(name, "HDAPS"))
+        if (strstr(name, "HDAPS")
+#   if !defined USE_D3D9
+             || strstr(name, "XBOX 360 For Windows")
+#   endif
+             || true)
         {
             SDL_JoystickClose(sdlstick);
@@ -70 +74 @@
 
         /* It's possible to remap axes */
-        if (strstr(name, "XBOX 360 For Windows"))
-        {
-            //stick->RemapAxis(4, 2);
-            //stick->RemapAxis(2, 4);
-        }
+        //stick->RemapAxis(4, 2);
+        //stick->RemapAxis(2, 4);
 
         m_data->m_joysticks.Push(sdlstick, stick);

trunk/win32/Lol.Vars.props

@@ -36 +36 @@
     <D3d9Libs Condition="'$(Platform)'=='Win32'">$(DXSDK_DIR)\Lib\x86</D3d9Libs>
     <D3d9Libs Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)\Lib\x64</D3d9Libs>
-    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib</D3d9Deps>
-    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib</D3d9Deps>
+    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib;xinput.lib</D3d9Deps>
+    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib;xinput.lib</D3d9Deps>
 
     <Win32Defines>HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9</Win32Defines>

trunk/win32/lolcore.vcxproj

@@ -109 +109 @@
     <ClCompile Include="..\src\math\vector.cpp" />
     <ClCompile Include="..\src\platform.cpp" />
+    <ClCompile Include="..\src\platform\d3d9\d3d9input.cpp" />
     <ClCompile Include="..\src\platform\sdl\sdlapp.cpp" />
     <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" />
@@ -168 +169 @@
     <ClInclude Include="..\src\numeric.h" />
     <ClInclude Include="..\src\platform.h" />
+    <ClInclude Include="..\src\platform\d3d9\d3d9input.h" />
     <ClInclude Include="..\src\platform\sdl\sdlapp.h" />
     <ClInclude Include="..\src\platform\sdl\sdlinput.h" />

trunk/win32/lolcore.vcxproj.filters

@@ -45 +45 @@
       <UniqueIdentifier>{94992c0e-ebc5-4185-b766-323b06547dcf}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\platform\d3d9">
+      <UniqueIdentifier>{a914e15d-3201-467a-a9c9-d7c5244b13ee}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -206 +209 @@
       <Filter>src\input</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\platform\d3d9\d3d9input.cpp">
+      <Filter>src\platform\d3d9</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -388 +394 @@
       <Filter>src\input</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\platform\d3d9\d3d9input.h">
+      <Filter>src\platform\d3d9</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>