TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-09 13:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1783 from Azaezel/alpha41/ButtonBumper
Some checks failed
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Details
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
Details
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
Details
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Details
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Details
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Details
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled
Details

Browse source 
correct getButtonBitmap() display for some dpads
This commit is contained in:
Brian Roberts 2026-07-05 16:27:25 -05:00 • committed by GitHub
commit 2c022f5fac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Templates/BaseGame/game/data/UI/scripts/utility.tscript
View file

@ -17,6 +17,7 @@ function ActionMap::getCommandButtonBitmap(%this, %device, %command)
}
%assetId = getButtonBitmap(%device, %button);
return %assetId;
}
@ -47,11 +48,11 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Triangle";
else if(%button $= "LB" || %button $= "btn_l")
%assetId = %assetId @ "L1";
else if(%button $= "LT" || %button $= "btn_lt")
else if(%button $= "LT" || %button $= "btn_lt" || %button $= "triggerl")
%assetId = %assetId @ "L2";
else if(%button $= "RB" || %button $= "btn_r")
%assetId = %assetId @ "R1";
else if(%button $= "RT" || %button $= "btn_rt")
else if(%button $= "RT" || %button $= "btn_rt" || %button $= "triggerr")
%assetId = %assetId @ "R2";
else if(%button $= "thumbrx" || %button $= "thumbry")
%assetId = %assetId @ "Right_Stick";
@ -61,13 +62,13 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Options";
else if(%button $= "back"|| %button $= "btn_back")
%assetId = %assetId @ "Share";
else if(%button $= "dpadu")
else if(%button $= "dpadu" || %button $= "upov")
%assetId = %assetId @ "Dpad_Up";
else if(%button $= "dpadd")
else if(%button $= "dpadd" || %button $= "dpov")
%assetId = %assetId @ "Dpad_Down";
else if(%button $= "dpadl")
else if(%button $= "dpadl" || %button $= "lpov")
%assetId = %assetId @ "Dpad_Left";
else if(%button $= "dpadr")
else if(%button $= "dpadr" || %button $= "rpov")
%assetId = %assetId @ "Dpad_Right";
%assetId = %assetId @ "_image";
@ -86,11 +87,11 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "X";
else if(%button $= "LB" || %button $= "btn_l")
%assetId = %assetId @ "LB";
else if(%button $= "LT" || %button $= "btn_lt")
else if(%button $= "LT" || %button $= "btn_lt" || %button $= "triggerl")
%assetId = %assetId @ "LT";
else if(%button $= "RB" || %button $= "btn_r")
%assetId = %assetId @ "RB";
else if(%button $= "RT" || %button $= "btn_rt")
else if(%button $= "RT" || %button $= "btn_rt" || %button $= "triggerr")
%assetId = %assetId @ "RT";
else if(%button $= "thumbrx" || %button $= "thumbry")
%assetId = %assetId @ "Right_Stick";
@ -100,13 +101,13 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Plus";
else if(%button $= "back" || %button $= "btn_back" )
%assetId = %assetId @ "Minus";
else if(%button $= "dpadu")
else if(%button $= "dpadu" || %button $= "upov")
%assetId = %assetId @ "Dpad_Up";
else if(%button $= "dpadd")
else if(%button $= "dpadd" || %button $= "dpov")
%assetId = %assetId @ "Dpad_Down";
else if(%button $= "dpadl")
else if(%button $= "dpadl" || %button $= "lpov")
%assetId = %assetId @ "Dpad_Left";
else if(%button $= "dpadr")
else if(%button $= "dpadr" || %button $= "rpov")
%assetId = %assetId @ "Dpad_Right";
%assetId = %assetId @ "_image";
@ -134,11 +135,11 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Y";
else if(%button $= "LB" || %button $= "btn_l")
%assetId = %assetId @ "LB";
else if(%button $= "LT" || %button $= "btn_lt")
else if(%button $= "LT" || %button $= "btn_lt" || %button $= "triggerl")
%assetId = %assetId @ "LT";
else if(%button $= "RB" || %button $= "btn_r")
%assetId = %assetId @ "RB";
else if(%button $= "RT" || %button $= "btn_rt")
else if(%button $= "RT" || %button $= "btn_rt" || %button $= "triggerr")
%assetId = %assetId @ "RT";
else if(%button $= "thumbrx" || %button $= "thumbry")
%assetId = %assetId @ "Right_Stick";
@ -148,13 +149,13 @@ function getButtonBitmap(%device, %button)
%assetId = %assetId @ "Menu";
else if(%button $= "back" || %button $= "btn_back" )
%assetId = %assetId @ "Windows";
else if(%button $= "dpadu")
else if(%button $= "dpadu" || %button $= "upov")
%assetId = %assetId @ "Dpad_Up";
else if(%button $= "dpadd")
else if(%button $= "dpadd" || %button $= "dpov")
%assetId = %assetId @ "Dpad_Down";
else if(%button $= "dpadl")
else if(%button $= "dpadl" || %button $= "lpov")
%assetId = %assetId @ "Dpad_Left";
else if(%button $= "dpadr")
else if(%button $= "dpadr" || %button $= "rpov")
%assetId = %assetId @ "Dpad_Right";
%assetId = %assetId @ "_image";