TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Ran importer on UI module to ensure guis and images are converted to latest standards

Browse source 
Updated all UI module controls to utilize a more standard structure with stack controls instead of the GameMenu ctrls, as well as more standardization of gamepad input handling
This commit is contained in:
JeffR 2022-02-22 20:12:39 -06:00
parent 6a357d8dfb
commit 01de818503
80 changed files with 590 additions and 673 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Templates/BaseGame/game/data/UI/scripts/controlsMenu.tscript
View file

@ -130,7 +130,7 @@ function fillRemapList()
{
%device = $remapListDevice;
OptionsMenuSettingsList.clearRows();
OptionsMenuSettingsList.clear();
//build out our list of action maps
%actionMapCount = ActionMapGroup.getCount();
@ -158,7 +158,7 @@ function fillRemapList()
if($activeRemapControlSet $= "")
$activeRemapControlSet = getField(%actionMapList, 0);
OptionsMenuSettingsList.addOptionRow("Control Set", %actionMapList, false, "controlSetChanged", -1, -30, true, "Which keybind control set to edit", $activeRemapControlSet);
OptionsMenuSettingsList.addOptionRow("Control Set", "$activeRemapControlSet", %actionMapList, false, "controlSetChanged", true, "Which keybind control set to edit", $activeRemapControlSet);
for ( %i = 0; %i < $RemapCount; %i++ )
{
@ -173,7 +173,9 @@ function fillRemapList()
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
%description = $RemapDescription[%i];
OptionsMenuSettingsList.addKeybindRow(getField(%keyMap, 0), getButtonBitmap(%device, getField(%keyMap, 1)), "doKeyRemap", -1, -15, true, %description);
%buttonImageAsset = getButtonBitmap(%device, getField(%keyMap, 1));
OptionsMenuSettingsList.addKeybindRow(getField(%keyMap, 0), %buttonImageAsset, "doKeyRemap", true, %description);
}
//OptionsMenuSettingsList.refresh();
@ -182,7 +184,7 @@ function fillRemapList()
function controlSetChanged()
{
$activeRemapControlSet = OptionsMenuSettingsList.getCurrentOption(0);
$activeRemapControlSet = OptionsMenuSettingsList.getCurrentOption();
fillRemapList();
}
@ -194,6 +196,11 @@ function doKeyRemap( %rowIndex )
RemapDlg-->OptRemapText.setValue( "Re-bind \"" @ %name @ "\" to..." );
OptRemapInputCtrl.index = %rowIndex;
Canvas.pushDialog( RemapDlg );
//Let the options menu know
%actionMap = $RemapActionMap[%rowIndex];
OptionsMenu.onKeybindChanged(%actionMap, %name);
}
function ControlsMenuRebindButton::onClick(%this)
@ -327,4 +334,4 @@ function redoMapping( %device, %actionMap, %action, %cmd, %oldIndex, %newIndex )
%actionMap.bind( %device, %action, %cmd );
fillRemapList();
}
}

2
Templates/BaseGame/game/data/UI/scripts/cursors.tscript
View file

@ -37,4 +37,4 @@ else
renderOffset = "0 0";
bitmapName = "data/ui/images/defaultCursor";
};
}
}

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

@ -10,117 +10,123 @@ function getButtonBitmap(%device, %button)
%device = "Xbox";
}
%path = "";
%assetId = "";
if(%device $= "PS4")
{
%path = "data/ui/images/inputs/PS4/PS4_";
%assetId = "UI:PS4_";
if(%button $= "A" || %button $= "btn_a")
%path = %path @ "Cross";
%assetId = %assetId @ "Cross";
else if(%button $= "B" || %button $= "btn_b")
%path = %path @ "Circle";
%assetId = %assetId @ "Circle";
else if(%button $= "X" || %button $= "btn_x")
%path = %path @ "Square";
%assetId = %assetId @ "Square";
else if(%button $= "Y" || %button $= "btn_y")
%path = %path @ "Triangle";
%assetId = %assetId @ "Triangle";
else if(%button $= "LB")
%path = %path @ "L1";
%assetId = %assetId @ "L1";
else if(%button $= "LT")
%path = %path @ "L2";
%assetId = %assetId @ "L2";
else if(%button $= "RB")
%path = %path @ "R1";
%assetId = %assetId @ "R1";
else if(%button $= "RT")
%path = %path @ "R2";
%assetId = %assetId @ "R2";
else if(%button $= "thumbrx" || %button $= "thumbry")
%path = %path @ "Right_Stick";
%assetId = %assetId @ "Right_Stick";
else if(%button $= "thumblx" || %button $= "thumbly")
%path = %path @ "Left_Stick";
%assetId = %assetId @ "Left_Stick";
else if(%button $= "start")
%path = %path @ "Options";
%assetId = %assetId @ "Options";
else if(%button $= "back")
%path = %path @ "Share";
%assetId = %assetId @ "Share";
else if(%button $= "dpadu")
%path = %path @ "Dpad_Up";
%assetId = %assetId @ "Dpad_Up";
else if(%button $= "dpadd")
%path = %path @ "Dpad_Down";
%assetId = %assetId @ "Dpad_Down";
else if(%button $= "dpadl")
%path = %path @ "Dpad_Left";
%assetId = %assetId @ "Dpad_Left";
else if(%button $= "dpadr")
%path = %path @ "Dpad_Right";
%assetId = %assetId @ "Dpad_Right";
%assetId = %assetId @ "_image";
}
else if(%device $= "Switch")
{
%path = "data/ui/images/inputs/Switch/Switch_";
%assetId = "UI:Switch_";
if(%button $= "A" || %button $= "btn_a")
%path = %path @ "B";
%assetId = %assetId @ "B";
else if(%button $= "B" || %button $= "btn_b")
%path = %path @ "A";
%assetId = %assetId @ "A";
else if(%button $= "X" || %button $= "btn_x")
%path = %path @ "Y";
%assetId = %assetId @ "Y";
else if(%button $= "Y" || %button $= "btn_y")
%path = %path @ "X";
%assetId = %assetId @ "X";
else if(%button $= "LB")
%path = %path @ "LB";
%assetId = %assetId @ "LB";
else if(%button $= "LT")
%path = %path @ "LT";
%assetId = %assetId @ "LT";
else if(%button $= "RB")
%path = %path @ "RB";
%assetId = %assetId @ "RB";
else if(%button $= "RT")
%path = %path @ "RT";
%assetId = %assetId @ "RT";
else if(%button $= "thumbrx" || %button $= "thumbry")
%path = %path @ "Right_Stick";
%assetId = %assetId @ "Right_Stick";
else if(%button $= "thumblx" || %button $= "thumbly")
%path = %path @ "Left_Stick";
%assetId = %assetId @ "Left_Stick";
else if(%button $= "start")
%path = %path @ "Plus";
%assetId = %assetId @ "Plus";
else if(%button $= "back")
%path = %path @ "Minus";
%assetId = %assetId @ "Minus";
else if(%button $= "dpadu")
%path = %path @ "Dpad_Up";
%assetId = %assetId @ "Dpad_Up";
else if(%button $= "dpadd")
%path = %path @ "Dpad_Down";
%assetId = %assetId @ "Dpad_Down";
else if(%button $= "dpadl")
%path = %path @ "Dpad_Left";
%assetId = %assetId @ "Dpad_Left";
else if(%button $= "dpadr")
%path = %path @ "Dpad_Right";
%assetId = %assetId @ "Dpad_Right";
%assetId = %assetId @ "_image";
}
else if(%device $= "Keyboard" || %device $= "Mouse")
{
%pathBase = "data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_";
%path = %pathBase @ %button @ ".png";
if(!isFile(%path))
%path = %pathBase @ "Blank";
%assetId = "UI:Keyboard_Black_" @ %button @ "_image";
}
else if(%device !$= "")
{
%path = "data/ui/images/inputs/Xbox/Xbox_";
%assetId = "UI:Xbox_";
if(%button $= "btn_a")
%path = %path @ "B";
%assetId = %assetId @ "B";
else if(%button $= "btn_b")
%path = %path @ "A";
%assetId = %assetId @ "A";
else if(%button $= "btn_x")
%path = %path @ "Y";
%assetId = %assetId @ "Y";
else if(%button $= "btn_y")
%path = %path @ "X";
%assetId = %assetId @ "X";
else if(%button $= "thumbrx" || %button $= "thumbry")
%path = %path @ "Right_Stick";
%assetId = %assetId @ "Right_Stick";
else if(%button $= "thumblx" || %button $= "thumbly")
%path = %path @ "Left_Stick";
%assetId = %assetId @ "Left_Stick";
else if(%button $= "start")
%path = %path @ "Menu";
%assetId = %assetId @ "Menu";
else if(%button $= "back")
%path = %path @ "Windows";
%assetId = %assetId @ "Windows";
else if(%button $= "dpadu")
%path = %path @ "Dpad_Up";
%assetId = %assetId @ "Dpad_Up";
else if(%button $= "dpadd")
%path = %path @ "Dpad_Down";
%assetId = %assetId @ "Dpad_Down";
else if(%button $= "dpadl")
%path = %path @ "Dpad_Left";
%assetId = %assetId @ "Dpad_Left";
else if(%button $= "dpadr")
%path = %path @ "Dpad_Right";
%assetId = %assetId @ "Dpad_Right";
%assetId = %assetId @ "_image";
}
return %path;
}
if(!AssetDatabase.isDeclaredAsset(%assetId))
%assetId = "UI:Keyboard_Black_Blank_image";
return %assetId;
}