TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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();
}
}