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

Merge pull request #1638 from Azaezel/alpha41/minorUICleanups
Some checks are pending
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Waiting to run
Details
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Waiting to run
Details
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Waiting to run
Details

Browse source 
options menu: rem keybind debug spam
This commit is contained in:
Brian Roberts 2025-12-25 19:31:57 -06:00 • committed by GitHub
commit 0fb68936f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp
View file

@ -669,4 +669,10 @@ bool GuiBitmapButtonCtrl::pointInControl(const Point2I& parentCoordPoint)
return Parent::pointInControl(parentCoordPoint); return Parent::pointInControl(parentCoordPoint);
} }
DEF_ASSET_BINDS_REFACTOR(GuiBitmapButtonCtrl, Bitmap) DefineEngineMethod(GuiBitmapButtonCtrl, getBitmap, StringTableEntry, (), , "get name") {
return object->getBitmapFile();
}DefineEngineMethod(GuiBitmapButtonCtrl, getBitmapAsset, StringTableEntry, (), , assetText(Bitmap, asset reference)) {
return object->_getBitmap();
}DefineEngineMethod(GuiBitmapButtonCtrl, setBitmap, void, (const char* assetName), , assetText(Bitmap, assignment.first tries asset then flat file.)) {
object->setBitmap(StringTable->insert(assetName));
}

8
Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file

@ -464,4 +464,10 @@ void GuiIconButtonCtrl::renderBitmapArray(RectI &bounds, S32 state)
} }
} }
DEF_ASSET_BINDS_REFACTOR(GuiIconButtonCtrl, Bitmap) DefineEngineMethod(GuiIconButtonCtrl, getBitmap, StringTableEntry, (), , "get name") {
return object->getBitmapFile();
}DefineEngineMethod(GuiIconButtonCtrl, getBitmapAsset, StringTableEntry, (), , assetText(Bitmap, asset reference)) {
return object->_getBitmap();
}DefineEngineMethod(GuiIconButtonCtrl, setBitmap, void, (const char* assetName), , assetText(Bitmap, assignment.first tries asset then flat file.)) {
object->setBitmap(StringTable->insert(assetName));
}

4
Templates/BaseGame/game/data/DamageModel/DamageModel.module
View file

@ -4,7 +4,9 @@
Group="Game" Group="Game"
scriptFile="DamageModel.tscript" scriptFile="DamageModel.tscript"
CreateFunction="onCreate" CreateFunction="onCreate"
DestroyFunction="onDestroy"> DestroyFunction="onDestroy"
Group="Game"
Dependencies="UI=1">
<DeclaredAssets <DeclaredAssets
Extension="asset.taml" Extension="asset.taml"
Recurse="true"/> Recurse="true"/>

8
Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui
View file

@ -4,7 +4,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
minExtent = "8 8"; minExtent = "8 8";
horizSizing = "relative"; horizSizing = "relative";
vertSizing = "relative"; vertSizing = "relative";
profile = "GuiDefaultProfile"; profile = "GuiModelessDialogProfile";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
canSaveDynamicFields = "1"; canSaveDynamicFields = "1";
enabled = "1"; enabled = "1";
@ -25,7 +25,6 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
}; };
new GuiCrossHairHud(Reticle) { new GuiCrossHairHud(Reticle) {
damageOffset = "0 10"; damageOffset = "0 10";
BitmapAsset = "";
position = "624 344"; position = "624 344";
extent = "32 32"; extent = "32 32";
minExtent = "8 8"; minExtent = "8 8";
@ -64,6 +63,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
}; };
new GuiBitmapCtrl(previewImage) { new GuiBitmapCtrl(previewImage) {
BitmapAsset = "UI:hudfill_image"; BitmapAsset = "UI:hudfill_image";
BitmapFile = "data/UI/images/hudfill.png";
position = "8 0"; position = "8 0";
extent = "108 56"; extent = "108 56";
horizSizing = "width"; horizSizing = "width";
@ -80,7 +80,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
extent = "120 16"; extent = "120 16";
minExtent = "8 8"; minExtent = "8 8";
vertSizing = "top"; vertSizing = "top";
profile = "HudTextItalicProfile"; profile = "GuiModelessDialogProfile";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
isContainer = "0"; isContainer = "0";
}; };
@ -95,7 +95,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
position = "5 645"; position = "5 645";
extent = "72 72"; extent = "72 72";
vertSizing = "top"; vertSizing = "top";
profile = "GuiBigTextProfile"; profile = "GuiModelessDialogProfile";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiControl(DamageHUD) { new GuiControl(DamageHUD) {

6
Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
View file

@ -1036,7 +1036,7 @@ function OptionsMenu::populateKeybinds(%this,%device, %controlsList) {
if($activeRemapControlSet $= "") if($activeRemapControlSet $= "")
$activeRemapControlSet = getField(%actionMapList, 0); $activeRemapControlSet = getField(%actionMapList, 0);
echo("============================================"); //echo("============================================");
for(%am = 0; %am < getFieldCount(%actionMapList); %am++) for(%am = 0; %am < getFieldCount(%actionMapList); %am++)
{ {
@ -1064,7 +1064,7 @@ function OptionsMenu::populateKeybinds(%this,%device, %controlsList) {
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device ); %keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
%description = $RemapDescription[%i]; %description = $RemapDescription[%i];
echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description); //echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
%remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description); %remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description);
%controlsList.add(%remapEntry); %controlsList.add(%remapEntry);
@ -1245,7 +1245,7 @@ function addActionMapEntry(%actionMap, %device, %keyMap, %index, %description)
}; };
%buttonContainer = %entry.findObjectByInternalName("valuesContainer"); %buttonContainer = %entry.findObjectByInternalName("valuesContainer");
echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1))); //echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
if(getWordCount(getField(%keyMap, 1)) == 2) if(getWordCount(getField(%keyMap, 1)) == 2)
{ {
%modifierBtn = new GuiIconButtonCtrl() { %modifierBtn = new GuiIconButtonCtrl() {