Renamed testgamepad to testcontroller

The program does more than just test gamepads, and will eventually map them as well.
This commit is contained in:
Sam Lantinga 2023-07-11 14:21:35 -07:00
parent d2d26c7b1e
commit ca492dff18
11 changed files with 37 additions and 37 deletions

View File

@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite", "tests\testspr
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamepad", "tests\testgamepad\testgamepad.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08305}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcontroller", "tests\testcontroller\testcontroller.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08305}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgdk", "tests\testgdk\testgdk.vcxproj", "{1C9A3F71-35A5-4C56-B292-F4375B3C3649}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgdk", "tests\testgdk\testgdk.vcxproj", "{1C9A3F71-35A5-4C56-B292-F4375B3C3649}"
EndProject EndProject

View File

@ -1,6 +1,6 @@
<Package> <Package>
<Chunk Id="1000" Marker="Launch"> <Chunk Id="1000" Marker="Launch">
<FileGroup DestinationPath="." SourcePath="." Include="testgamepad.exe" /> <FileGroup DestinationPath="." SourcePath="." Include="testcontroller.exe" />
<FileGroup DestinationPath="." SourcePath="." Include="MicrosoftGame.config" /> <FileGroup DestinationPath="." SourcePath="." Include="MicrosoftGame.config" />
<FileGroup DestinationPath="." SourcePath="." Include="*.bmp" /> <FileGroup DestinationPath="." SourcePath="." Include="*.bmp" />
<FileGroup DestinationPath="." SourcePath="." Include="*.png" /> <FileGroup DestinationPath="." SourcePath="." Include="*.png" />

View File

@ -28,7 +28,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{55812185-D13C-4022-9C81-32E0F4A08305}</ProjectGuid> <ProjectGuid>{55812185-D13C-4022-9C81-32E0F4A08305}</ProjectGuid>
<RootNamespace>testgamepad</RootNamespace> <RootNamespace>testcontroller</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -124,7 +124,7 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TypeLibraryName>.\Release/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -147,7 +147,7 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TypeLibraryName>.\Release/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -170,7 +170,7 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TypeLibraryName>.\Release/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -193,7 +193,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TypeLibraryName>.\Debug/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -219,7 +219,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TypeLibraryName>.\Debug/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -245,7 +245,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TypeLibraryName>.\Debug/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -276,7 +276,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\test\gamepadutils.c" /> <ClCompile Include="..\..\..\test\gamepadutils.c" />
<ClCompile Include="..\..\..\test\testgamepad.c" /> <ClCompile Include="..\..\..\test\testcontroller.c" />
<ClCompile Include="..\..\..\test\testutils.c" /> <ClCompile Include="..\..\..\test\testutils.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\test\testgamepad.c" /> <ClCompile Include="..\..\..\test\testcontroller.c" />
<ClCompile Include="..\..\..\test\testutils.c" /> <ClCompile Include="..\..\..\test\testutils.c" />
<ClCompile Include="..\..\..\test\gamepadutils.c" /> <ClCompile Include="..\..\..\test\gamepadutils.c" />
</ItemGroup> </ItemGroup>

View File

@ -7,7 +7,7 @@
Publisher="CN=Publisher"/> Publisher="CN=Publisher"/>
<ExecutableList> <ExecutableList>
<Executable Name="testgamepad.exe" <Executable Name="testcontroller.exe"
TargetDeviceFamily="PC" TargetDeviceFamily="PC"
Id="Game" /> Id="Game" />
</ExecutableList> </ExecutableList>
@ -22,12 +22,12 @@
<MSAAppId>PleaseChangeMe</MSAAppId> <MSAAppId>PleaseChangeMe</MSAAppId>
<TitleId>FFFFFFFF</TitleId> <TitleId>FFFFFFFF</TitleId>
<ShellVisuals DefaultDisplayName="testgamepad" <ShellVisuals DefaultDisplayName="testcontroller"
PublisherDisplayName="SDL" PublisherDisplayName="SDL"
Square480x480Logo="Logo480x480.png" Square480x480Logo="Logo480x480.png"
Square150x150Logo="Logo150x150.png" Square150x150Logo="Logo150x150.png"
Square44x44Logo="Logo44x44.png" Square44x44Logo="Logo44x44.png"
Description="testgamepad" Description="testcontroller"
ForegroundText="light" ForegroundText="light"
BackgroundColor="#000000" BackgroundColor="#000000"
StoreLogo="Logo100x100.png"/> StoreLogo="Logo100x100.png"/>

View File

@ -7,7 +7,7 @@
Publisher="CN=Publisher"/> Publisher="CN=Publisher"/>
<ExecutableList> <ExecutableList>
<Executable Name="testgamepad.exe" <Executable Name="testcontroller.exe"
TargetDeviceFamily="XboxOne" TargetDeviceFamily="XboxOne"
Id="Game" /> Id="Game" />
</ExecutableList> </ExecutableList>
@ -16,13 +16,13 @@
<MSAAppId>PleaseChangeMe</MSAAppId> <MSAAppId>PleaseChangeMe</MSAAppId>
<TitleId>FFFFFFFF</TitleId> <TitleId>FFFFFFFF</TitleId>
<ShellVisuals DefaultDisplayName="testgamepad" <ShellVisuals DefaultDisplayName="testcontroller"
PublisherDisplayName="SDL" PublisherDisplayName="SDL"
Square480x480Logo="Logo480x480.png" Square480x480Logo="Logo480x480.png"
Square150x150Logo="Logo150x150.png" Square150x150Logo="Logo150x150.png"
Square44x44Logo="Logo44x44.png" Square44x44Logo="Logo44x44.png"
SplashScreenImage="SplashScreenImage.png" SplashScreenImage="SplashScreenImage.png"
Description="testgamepad" Description="testcontroller"
ForegroundText="light" ForegroundText="light"
BackgroundColor="#000000" BackgroundColor="#000000"
StoreLogo="Logo100x100.png"/> StoreLogo="Logo100x100.png"/>

View File

@ -7,7 +7,7 @@
Publisher="CN=Publisher"/> Publisher="CN=Publisher"/>
<ExecutableList> <ExecutableList>
<Executable Name="testgamepad.exe" <Executable Name="testcontroller.exe"
TargetDeviceFamily="Scarlett" TargetDeviceFamily="Scarlett"
Id="Game" /> Id="Game" />
</ExecutableList> </ExecutableList>
@ -16,13 +16,13 @@
<MSAAppId>PleaseChangeMe</MSAAppId> <MSAAppId>PleaseChangeMe</MSAAppId>
<TitleId>FFFFFFFF</TitleId> <TitleId>FFFFFFFF</TitleId>
<ShellVisuals DefaultDisplayName="testgamepad" <ShellVisuals DefaultDisplayName="testcontroller"
PublisherDisplayName="SDL" PublisherDisplayName="SDL"
Square480x480Logo="Logo480x480.png" Square480x480Logo="Logo480x480.png"
Square150x150Logo="Logo150x150.png" Square150x150Logo="Logo150x150.png"
Square44x44Logo="Logo44x44.png" Square44x44Logo="Logo44x44.png"
SplashScreenImage="SplashScreenImage.png" SplashScreenImage="SplashScreenImage.png"
Description="testgamepad" Description="testcontroller"
ForegroundText="light" ForegroundText="light"
BackgroundColor="#000000" BackgroundColor="#000000"
StoreLogo="Logo100x100.png"/> StoreLogo="Logo100x100.png"/>

View File

@ -36,7 +36,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite", "tests\testspr
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgamepad", "tests\testgamepad\testgamepad.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08305}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcontroller", "tests\testcontroller\testcontroller.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08305}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgles2", "tests\testgles2\testgles2.vcxproj", "{E9558DFE-1961-4DD4-B09B-DD0EEFD5C315}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgles2", "tests\testgles2\testgles2.vcxproj", "{E9558DFE-1961-4DD4-B09B-DD0EEFD5C315}"
EndProject EndProject

View File

@ -20,7 +20,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{55812185-D13C-4022-9C81-32E0F4A08305}</ProjectGuid> <ProjectGuid>{55812185-D13C-4022-9C81-32E0F4A08305}</ProjectGuid>
<RootNamespace>testgamepad</RootNamespace> <RootNamespace>testcontroller</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -89,7 +89,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\Release/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -112,7 +112,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
<TypeLibraryName>.\Release/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Release/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -135,7 +135,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment> <TargetEnvironment>Win32</TargetEnvironment>
<TypeLibraryName>.\Debug/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -161,7 +161,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible> <MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
<TypeLibraryName>.\Debug/testgamepad.tlb</TypeLibraryName> <TypeLibraryName>.\Debug/testcontroller.tlb</TypeLibraryName>
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -197,7 +197,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\test\gamepadutils.c" /> <ClCompile Include="..\..\..\test\gamepadutils.c" />
<ClCompile Include="..\..\..\test\testgamepad.c" /> <ClCompile Include="..\..\..\test\testcontroller.c" />
<ClCompile Include="..\..\..\test\testutils.c" /> <ClCompile Include="..\..\..\test\testutils.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View File

@ -209,7 +209,7 @@ if(SDL3_TESTS_SUBPROJECT)
endif() endif()
add_sdl_test_executable(testfile NONINTERACTIVE SOURCES testfile.c) add_sdl_test_executable(testfile NONINTERACTIVE SOURCES testfile.c)
add_sdl_test_executable(testgamepad TESTUTILS SOURCES testgamepad.c gamepadutils.c) add_sdl_test_executable(testcontroller TESTUTILS SOURCES testcontroller.c gamepadutils.c)
add_sdl_test_executable(testgeometry TESTUTILS SOURCES testgeometry.c) add_sdl_test_executable(testgeometry TESTUTILS SOURCES testgeometry.c)
add_sdl_test_executable(testgl SOURCES testgl.c) add_sdl_test_executable(testgl SOURCES testgl.c)
add_sdl_test_executable(testgles SOURCES testgles.c) add_sdl_test_executable(testgles SOURCES testgles.c)

View File

@ -10,7 +10,7 @@
freely. freely.
*/ */
/* Simple program to test the SDL gamepad routines */ /* Simple program to test the SDL controller routines */
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#include <SDL3/SDL_main.h> #include <SDL3/SDL_main.h>
@ -931,7 +931,7 @@ int main(int argc, char *argv[])
} }
screen_width = (int)SDL_ceilf(SCREEN_WIDTH * content_scale); screen_width = (int)SDL_ceilf(SCREEN_WIDTH * content_scale);
screen_height = (int)SDL_ceilf(SCREEN_HEIGHT * content_scale); screen_height = (int)SDL_ceilf(SCREEN_HEIGHT * content_scale);
window = SDL_CreateWindow("Gamepad Test", screen_width, screen_height, 0); window = SDL_CreateWindow("SDL Controller Test", screen_width, screen_height, 0);
if (window == NULL) { if (window == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError()); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create window: %s\n", SDL_GetError());
return 2; return 2;