TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Streamlined baseUI profiles

Browse source 
Implemented audioOptions file with structure to comply to BaseUI options menu
Implemented majority of keybind remapping logic for options menu
This commit is contained in:
Areloch 2023-12-18 23:49:13 -06:00
parent f14c96c2bc
commit 55697cffdb
23 changed files with 1605 additions and 1582 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/assets/assetManager.cpp
View file

@ -210,7 +210,7 @@ bool AssetManager::addModuleDeclaredAssets( ModuleDefinition* pModuleDefinition
dSprintf(extensionBuffer, sizeof(extensionBuffer), "*.%s", pDeclaredAssets->getExtension());
// Scan declared assets at location.
if ( !scanDeclaredAssets( filePathBuffer, extensionBuffer, pDeclaredAssets->getRecurse(), pModuleDefinition ) )
if ( !scanDeclaredAssets( filePathBuffer, extensionBuffer, pDeclaredAssets->getRecurse(), pModuleDefinition ) && mEchoInfo)
{
// Warn.
Con::warnf( "AssetManager::addModuleDeclaredAssets() - No assets found at location '%s' with extension '%s'.", filePathBuffer, pDeclaredAssets->getExtension() );

2
Templates/BaseGame/game/core/console/scripts/profiles.tscript
View file

@ -52,7 +52,7 @@ new GuiControlProfile(GuiConsoleTextProfile)
category = "Core";
};
$ConsoleDefaultFillColor = "12 14 19 175";
$ConsoleDefaultFillColor = "0 0 0 175";
if(!isObject(ConsoleScrollProfile))
new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile)

21
Templates/BaseGame/game/core/gui/scripts/profiles.tscript
View file

@ -267,3 +267,24 @@ new GuiControlProfile(GuiScrollProfile)
bitmapAsset = "Core_GUI:scrollBar_image";
category = "Core";
};
// ---------------------------------------------------------------------------
singleton GuiControlProfile( GuiInputCtrlProfile )
{
tab = true;
canKeyFocus = true;
category = "Core";
};
singleton GuiControlProfile (GuiTextProfile)
{
justify = "left";
fontColor = "20 20 20";
category = "Core";
};
singleton GuiControlProfile (GuiTextRightProfile : GuiTextProfile)
{
justify = "right";
category = "Core";
};

1426
Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript
View file

File diff suppressed because it is too large Load diff

2
Templates/BaseGame/game/core/sfx/Core_SFX.tscript
View file

@ -7,7 +7,7 @@ function Core_SFX::onCreate(%this)
exec("./scripts/audioDescriptions." @ $TorqueScriptFileExtension);
exec("./scripts/audioEnvironments." @ $TorqueScriptFileExtension);
exec("./scripts/audioStates." @ $TorqueScriptFileExtension);
exec("./scripts/audioOptions." @ $TorqueScriptFileExtension);
}
function Core_SFX::onDestroy(%this)

82
Templates/BaseGame/game/core/sfx/scripts/audioOptions.tscript Normal file
View file

@ -0,0 +1,82 @@
new SimGroup(AudioSettingsGroup)
{
class = "PrimaryOptionsGroup";
displayName = "Audio";
new SimGroup()
{
class = "SubOptionsGroup";
displayName = "Audio Devices";
new SimGroup(AudioSettingsProviderGroup)
{
class = "AudioOptionsSettings";
OptionName = "Audio Provider";
Description = "";
};
new SimGroup(AudioSettingsDeviceGroup)
{
class = "AudioOptionsSettings";
OptionName = "Audio Device";
Description = "";
};
};
};
function AudioSettingsGroup::populateSettings(%this)
{
AudioSettingsProviderGroup.clear();
AudioSettingsDeviceGroup.clear();
%buffer = sfxGetAvailableDevices();
%count = getRecordCount( %buffer );
for(%i = 0; %i < %count; %i++)
{
%record = getRecord(%buffer, %i);
%provider = getField(%record, 0);
%device = getField(%record, 1);
//When the client is actually running, we don't care about null audo devices
if(%provider $= "null")
continue;
//We can't have duplicate providers, so double check for uniqueness
%foundProvider = false;
foreach(%registeredProviders in AudioSettingsProviderGroup)
{
if(%registeredProviders.displayName $= %provider)
{
%foundProvider = true;
break;
}
}
if(!%foundProvider)
{
//Provider entry
%providerEntry = new ArrayObject()
{
class = "OptionsQualityLevel";
displayName = %provider;
key["$pref::SFX::provider"] = %provider;
};
AudioSettingsProviderGroup.add(%providerEntry);
}
//Device Entry
%deviceEntry = new ArrayObject()
{
class = "OptionsQualityLevel";
displayName = %device;
provider = %provider; //this is for filtering later, if we need to
key["$pref::SFX::device"] = %device;
};
AudioSettingsDeviceGroup.add(%deviceEntry);
}
}

9
Templates/BaseGame/game/data/ExampleModule/scripts/client/defaultKeybinds.tscript
View file

@ -17,13 +17,20 @@ addKeyRemap("Ascend", "ExampleMoveMap", "keyboard", "moveup", "Makes the camera
addKeyRemap("Descend", "ExampleMoveMap", "keyboard", "movedown", "Makes the camera descend");
addKeyRemap("Jump", "ExampleMoveMap", "keyboard", "jump", "Jump");
addKeyRemap("Forward", "ExampleMoveMap", "gamepad", "gamePadMoveY", "Forward Movement");
addKeyRemap("Backward", "ExampleMoveMap", "gamepad", "gamePadMoveY", "Backward Movement");
addKeyRemap("Strafe Left", "ExampleMoveMap", "gamepad", "gamePadMoveX", "Left Strafing Movement");
addKeyRemap("Strafe Right", "ExampleMoveMap", "gamepad", "gamePadMoveX", "Right Strafing Movement");
addKeyRemap("Jump", "ExampleMoveMap", "gamepad", "jump", "Jump");
//------------------------------------------------------------------------------
// Non-remapable binds
//------------------------------------------------------------------------------
ExampleMoveMap.bind( keyboard, F2, showPlayerList );
ExampleMoveMap.bind(keyboard, "ctrl h", hideHUDs);
ExampleMoveMap.bind(keyboard, "alt p", doScreenShotHudless);
ExampleMoveMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(PauseMenu);");
ExampleMoveMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(GameMenu);");
ExampleMoveMap.bindCmd(gamepad, btn_start, "Canvas.pushDialog(GameMenu);", "" );
//------------------------------------------------------------------------------
// Movement Keys

2
Templates/BaseGame/game/data/UI/guis/ChooseLevelMenu.tscript
View file

@ -73,7 +73,7 @@ function ChooseLevelMenu::onWake(%this)
position = "0 0";
extent = "480 480";
buttonType = "ToggleButton";
profile = LevelPreviewButtonProfile;
profile = GuiMenuButtonLeftJustProfile;
horizSizing = "width";
vertSizing = "height";
internalName = "button";

36
Templates/BaseGame/game/data/UI/guis/optionsMenu.gui
View file

@ -32,8 +32,8 @@ $guiContent = new GuiControl(OptionsMenu) {
stackingType = "Horizontal";
padding = "10";
dynamicSize = "0";
position = "430 0";
extent = "420 40";
position = "330 0";
extent = "650 40";
horizSizing = "center";
vertSizing = "center";
profile = "GuiDefaultProfile";
@ -55,11 +55,19 @@ $guiContent = new GuiControl(OptionsMenu) {
tooltipProfile = "GuiToolTipProfile";
};
new GuiButtonCtrl() {
text = "Controls";
text = "Keyboard/Mouse";
position = "260 0";
extent = "220 40";
profile = "GuiMenuButtonProfile";
command = "OptionsMenu.openOptionsCategory(\"KBM\");";
tooltipProfile = "GuiToolTipProfile";
};
new GuiButtonCtrl() {
text = "Controller";
position = "480 0";
extent = "160 40";
profile = "GuiMenuButtonProfile";
command = "OptionsMenu.openOptionsCategory(\"Controls\");";
command = "OptionsMenu.openOptionsCategory(\"Controller\");";
tooltipProfile = "GuiToolTipProfile";
};
};
@ -98,6 +106,7 @@ $guiContent = new GuiControl(OptionsMenu) {
tooltipProfile = "GuiToolTipProfile";
new GuiStackControl(VideoSettingsList) {
class = "OptionsMenuList";
padding = "5";
changeChildSizeToFit = "0";
position = "0 1";
@ -108,6 +117,7 @@ $guiContent = new GuiControl(OptionsMenu) {
tooltipProfile = "GuiToolTipProfile";
};
new GuiStackControl(AudioSettingsList) {
class = "OptionsMenuList";
padding = "5";
changeChildSizeToFit = "0";
position = "0 1";
@ -119,7 +129,21 @@ $guiContent = new GuiControl(OptionsMenu) {
tooltipProfile = "GuiToolTipProfile";
hidden = "1";
};
new GuiStackControl(ControlSettingsList) {
new GuiStackControl(KBMControlsList) {
class = "OptionsMenuList";
padding = "5";
changeChildSizeToFit = "0";
position = "0 1";
extent = "800 200";
horizSizing = "width";
vertSizing = "height";
profile = "GuiDefaultProfile";
visible = "0";
tooltipProfile = "GuiToolTipProfile";
hidden = "1";
};
new GuiStackControl(GamepadControlsList) {
class = "OptionsMenuList";
padding = "5";
changeChildSizeToFit = "0";
position = "0 1";
@ -174,7 +198,7 @@ $guiContent = new GuiControl(OptionsMenu) {
makeIconSquare = "1";
textLocation = "Center";
text = "Reset";
position = "947 0";
position = "1135 0";
extent = "140 40";
horizSizing = "left";
vertSizing = "center";

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

File diff suppressed because it is too large Load diff

506
Templates/BaseGame/game/data/UI/scripts/profiles.tscript
View file

@ -4,48 +4,45 @@ $TextHighEmphasisColor = "224 224 224";
$TextHighEmphasisColorHL = "0 0 0";
$TextDisabledColor = "108 108 108";
singleton GuiGameListMenuProfile(DefaultListMenuProfile)
// ---------------------------------------------------------------------------
// Defaults
// ---------------------------------------------------------------------------
singleton GuiControlProfile( GuiMenuDefaultProfile )
{
fontType = "Arial Bold";
fontSize = 20;
fontColor = $TextMediumEmphasisColor;
fontColorSEL = $TextMediumEmphasisColor;
fontColorNA = $TextDisabledColor;
fontColorHL = $TextMediumEmphasisColor;
fillColor = "108 108 108";
fillColorHL = "140 140 140";
fillColorSEL = "180 180 180";
HitAreaUpperLeft = "16 20";
HitAreaLowerRight = "503 74";
IconOffset = "40 0";
TextOffset = "100 0";
RowSize = "500 90";
ColumnSplit = "250";
RightPad = "20";
bitmap = "UI:listMenuArray_image";
canKeyFocus = true;
opaque = false;
fillColor = "0 0 0 0";
category = "BaseUI";
};
singleton GuiControlProfile(GamepadDefaultProfile)
singleton GuiControlProfile( GuiModelessDialogProfile : GuiMenuDefaultProfile )
{
border = 0;
modal = false;
};
singleton GuiControlProfile(GamepadButtonTextLeft)
singleton GuiControlProfile(GuiMenuBackgroundProfile)
{
fontType = "Arial Bold";
fontSize = 20;
fontColor = "255 255 255";
justify = "left";
category = "BaseUI";
opaque = true;
fillcolor = "34 34 34 255";
};
singleton GuiControlProfile(GamepadButtonTextRight : GamepadButtonTextLeft)
singleton GuiControlProfile(GuiMenuPanelProfile)
{
justify = "right";
category = "BaseUI";
opaque = true;
fillcolor = "15 15 15 255";
};
singleton GuiControlProfile(GuiMenuBasePanelProfile)
{
category = "BaseUI";
opaque = true;
fillcolor = "40 40 40 255";
};
// ---------------------------------------------------------------------------
// Text
// ---------------------------------------------------------------------------
singleton GuiControlProfile(MenuHeaderText)
{
fontType = "Arial Bold";
@ -53,6 +50,7 @@ singleton GuiControlProfile(MenuHeaderText)
fontColor = $TextHighEmphasisColor;
justify = "left";
modal = false;
category = "BaseUI";
};
singleton GuiControlProfile(MenuHeaderTextHighlighted : MenuHeaderText)
@ -60,11 +58,8 @@ singleton GuiControlProfile(MenuHeaderTextHighlighted : MenuHeaderText)
fontColor = $TextHighEmphasisColorHL;
};
singleton GuiControlProfile(MenuHeaderTextCenter)
singleton GuiControlProfile(MenuHeaderTextCenter : MenuHeaderText)
{
fontType = "Arial Bold";
fontSize = 32;
fontColor = $TextHighEmphasisColor;
justify = "center";
};
@ -75,6 +70,7 @@ singleton GuiControlProfile(MenuSubHeaderText)
fontColor = $TextMediumEmphasisColor;
justify = "left";
modal = false;
category = "BaseUI";
};
singleton GuiControlProfile(MenuSubHeaderTextHighlighted : MenuSubHeaderText)
@ -101,6 +97,7 @@ singleton GuiControlProfile(MenuMLSubHeaderText)
autoSizeWidth = true;
autoSizeHeight = true;
modal = false;
category = "BaseUI";
};
singleton GuiControlProfile(MenuMLSubHeaderTextCenter : MenuMLSubHeaderText)
@ -108,92 +105,6 @@ singleton GuiControlProfile(MenuMLSubHeaderTextCenter : MenuMLSubHeaderText)
justify = "center";
};
singleton GuiControlProfile( GuiMenuDefaultProfile )
{
opaque = false;
fillColor = "0 0 0 0";
};
singleton GuiControlProfile( GuiMenuButtonProfile )
{
opaque = true;
border = false;
fontSize = 24;
fontType = "Arial Bold";
fontColor = "200 200 200 255";
fontColorHL = "0 0 0 255";
fontColorNA = "108 108 108 255";
fontColorSEL = "200 200 200 255";
fillColor = "0 0 0 0";
fillColorHL = "255 255 255 255";
fillColorNA = "40 40 40";
borderColor = "87 87 87";
borderColorNA = "0 0 0";
borderColorHL = "194 64 64";
fixedExtent = 0;
justify = "center";
canKeyFocus = false;
//bitmapAsset = "UI:menu_button_image";
hasBitmapArray = false;
soundButtonDown = "UI:buttonClick";
soundButtonOver = "UI:buttonHover";
category = "BaseUI";
fontColors[0] = "200 200 200 255";
fontColors[2] = "108 108 108 255";
fontColors[3] = "200 200 200 255";
fontColors[5] = "Magenta";
fontColorLinkHL = "Magenta";
};
singleton GuiControlProfile( LevelPreviewButtonProfile : GuiMenuButtonProfile )
{
fontSize = 22;
justify = "Left";
};
singleton GuiControlProfile( GuiHighlightMenuButtonProfile )
{
opaque = true;
border = false;
fontSize = 18;
fontType = "Arial Bold";
fontColor = "240 240 240";
fontColorHL = "0 0 0";
fontColorNA = "125 125 125";
//fontColorSEL ="0 0 0";
fixedExtent = false;
justify = "center";
canKeyFocus = false;
bitmapAsset = "UI:selector_button_highlight_only_image";
hasBitmapArray = false;
category = "Core";
};
singleton GuiControlProfile( GuiBlankMenuButtonProfile )
{
opaque = true;
border = false;
fontSize = 18;
fontType = "Arial Bold";
fontColor = "220 220 220";
fontColorHL = "255 255 255";
fontColorNA = "200 200 200";
//fontColorSEL ="0 0 0";
fixedExtent = false;
justify = "center";
canKeyFocus = false;
bitmapAsset = "UI:selector_button_blank_image";
hasBitmapArray = false;
soundButtonDown = menuButtonPressed;
soundButtonOver = menuButtonHover;
category = "Core";
};
singleton GuiControlProfile( GuiJoinServerButtonProfile : GuiMenuButtonProfile )
{
justify = "left";
};
singleton GuiControlProfile( GuiMenuTextProfile )
{
opaque = true;
@ -209,99 +120,11 @@ singleton GuiControlProfile( GuiMenuTextProfile )
modal = false;
};
singleton GuiControlProfile( GuiMenuTextProfileHighlighted : GuiMenuTextProfile )
singleton GuiControlProfile( GuiMenuTextProfileHL : GuiMenuTextProfile )
{
fontColor = "0 0 0";
};
singleton GuiControlProfile (GuiSolidDefaultProfile)
{
opaque = true;
border = true;
category = "Core";
};
singleton GuiControlProfile (GuiTransparentProfile)
{
opaque = false;
border = false;
category = "Core";
};
singleton GuiControlProfile( GuiGroupBorderProfile )
{
border = false;
opaque = false;
hasBitmapArray = true;
bitmapAsset = "UI:group_border_image";
category = "Core";
};
singleton GuiControlProfile( GuiTabBorderProfile )
{
border = false;
opaque = false;
hasBitmapArray = true;
bitmapAsset = "UI:tab_border_image";
category = "Core";
};
singleton GuiControlProfile( GuiModelessDialogProfile )
{
modal = false;
category = "Core";
};
singleton GuiControlProfile (GuiFrameSetProfile)
{
fillcolor = "255 255 255";
borderColor = "246 245 244";
border = 1;
opaque = true;
border = true;
category = "Core";
};
singleton GuiControlProfile( GuiInputCtrlProfile )
{
tab = true;
canKeyFocus = true;
category = "Core";
};
singleton GuiControlProfile (GuiTextProfile)
{
justify = "left";
fontColor = "20 20 20";
category = "Core";
};
singleton GuiControlProfile (GuiTextRightProfile : GuiTextProfile)
{
justify = "right";
category = "Core";
};
singleton GuiControlProfile (GuiAutoSizeTextProfile)
{
fontColor = "0 0 0";
autoSizeWidth = true;
autoSizeHeight = true;
category = "Core";
};
singleton GuiControlProfile( GuiMediumTextProfile : GuiTextProfile )
{
fontSize = 24;
category = "Core";
};
singleton GuiControlProfile( GuiBigTextProfile : GuiTextProfile )
{
fontSize = 36;
category = "Core";
};
singleton GuiControlProfile( GuiMLTextProfile )
{
fontColor = $TextMediumEmphasisColor;
@ -324,224 +147,48 @@ singleton GuiControlProfile( GuiMLTextProfileHighlighted : GuiMLTextProfile )
fontColor = $TextMediumEmphasisColorHL;
};
singleton GuiControlProfile( GuiMLWhiteTextProfile )
{
fontColor = "220 220 220";
fontColorHL = $TextMediumEmphasisColor;
autoSizeWidth = true;
autoSizeHeight = true;
border = false;
category = "Core";
};
singleton GuiControlProfile( GuiTextArrayProfile : GuiTextProfile )
{
fontColor = $TextMediumEmphasisColor;
fontColorHL = $TextMediumEmphasisColor;
fontColorSEL = $TextMediumEmphasisColor;
fontColorNA = $TextDisabledColor;
fillColor = "22 22 22 255";
fillColorHL = "22 22 22 255";
fillColorSEL = "56 56 56 255";
border = true;
borderColor ="87 87 87";
borderColorHL = "87 87 87";
borderColorSEL = "255 255 255";
category = "Core";
canKeyFocus = true;
};
singleton GuiControlProfile( GuiMenuTextEditProfile : GuiTextEditProfile )
{
fontColor = $TextMediumEmphasisColor;
fontColorHL = $TextMediumEmphasisColor;
fontColorSEL = $TextMediumEmphasisColor;
fontColorNA = $TextDisabledColor;
fillColor = "22 22 22 255";
fillColorHL = "22 22 22 255";
border = true;
borderColor ="87 87 87";
borderColorHL = "87 87 87";
borderColorSEL = "255 255 255";
category = "Core";
};
// ----------------------------------------------------------------------------
// TODO: Revisit Popupmenu
// ----------------------------------------------------------------------------
singleton GuiControlProfile( GuiPopupMenuItemBorder : GuiButtonProfile )
// ---------------------------------------------------------------------------
// Interactive Controls
// ---------------------------------------------------------------------------
singleton GuiControlProfile( GuiMenuButtonProfile )
{
opaque = true;
border = true;
fontColor = "0 0 0";
fontColorHL = "0 0 0";
fontColorNA = "255 255 255";
fixedExtent = false;
border = false;
fontSize = 24;
fontType = "Arial Bold";
fontColor = "200 200 200 255";
fontColorHL = "0 0 0 255";
fontColorNA = "108 108 108 255";
fontColorSEL = "200 200 200 255";
fillColor = "0 0 0 0";
fillColorHL = "255 255 255 255";
fillColorNA = "40 40 40";
borderColor = "87 87 87";
borderColorNA = "0 0 0";
borderColorHL = "194 64 64";
fixedExtent = 0;
justify = "center";
canKeyFocus = false;
bitmapAsset = "UI:menubutton_image";
category = "Core";
hasBitmapArray = false;
soundButtonDown = "UI:buttonClick";
soundButtonOver = "UI:buttonHover";
category = "BaseUI";
fontColors[0] = "200 200 200 255";
fontColors[2] = "108 108 108 255";
fontColors[3] = "200 200 200 255";
};
singleton GuiControlProfile( GuiPopUpMenuDefault : GuiDefaultProfile )
singleton GuiControlProfile( GuiMenuButtonLeftJustProfile : GuiMenuButtonProfile )
{
opaque = true;
mouseOverSelected = true;
textOffset = "3 3";
border = 0;
borderThickness = 0;
fixedExtent = true;
hasBitmapArray = true;
fillColor = EditorSettings.value("Theme/fieldBGColor");//"255 255 255";//100
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor");//"91 101 116";
fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");//"91 101 116";
fontColor = EditorSettings.value("Theme/fieldTextColor");//"215 215 215";
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");//"215 215 215";
fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor");//"215 215 215";
fontColorNA = EditorSettings.value("Theme/fieldTextColor");//"215 215 215";
borderColor = EditorSettings.value("Theme/dividerDarkColor");
profileForChildren = GuiPopupMenuItemBorder;
category = "Core";
justify = "Left";
};
singleton GuiControlProfile( GuiPopUpMenuProfile : GuiPopUpMenuDefault )
singleton GuiControlProfile( GuiRemapActionMapButtonProfile : GuiMenuButtonProfile )
{
textOffset = "6 4";
bitmapAsset = "UI:dropDown_image";
hasBitmapArray = true;
border = 1;
profileForChildren = GuiPopUpMenuDefault;
category = "Core";
fillColor = "18 18 18 255";
fillColorHL = "0 0 0 255";
};
singleton GuiControlProfile( GuiTabBookProfile )
{
fillColorHL = "100 100 100";
fillColorNA = "150 150 150";
fontColor = "30 30 30";
fontColorHL = "0 0 0";
fontColorNA = "50 50 50";
fontType = "Arial";
fontSize = 14;
justify = "center";
bitmapAsset = "UI:tab_image";
tabWidth = 64;
tabHeight = 24;
tabPosition = "Top";
tabRotation = "Horizontal";
textOffset = "0 -3";
tab = true;
cankeyfocus = true;
category = "Core";
};
singleton GuiControlProfile( GuiTabPageProfile : GuiDefaultProfile )
{
fontType = "Arial";
fontSize = 10;
justify = "center";
bitmapAsset = "UI:tab_image";
opaque = false;
fillColor = "240 239 238";
category = "Core";
};
singleton GuiControlProfile( GuiConsoleProfile )
{
fontType = ($platform $= "macos") ? "Monaco" : "Lucida Console";
fontSize = ($platform $= "macos") ? 13 : 12;
fontColor = "255 255 255";
fontColorHL = "0 255 255";
fontColorNA = "255 0 0";
fontColors[6] = "100 100 100";
fontColors[7] = "100 100 0";
fontColors[8] = "0 0 100";
fontColors[9] = "0 100 0";
category = "Core";
};
singleton GuiControlProfile( GuiConsoleTextProfile )
{
fontColor = "0 0 0";
autoSizeWidth = true;
autoSizeHeight = true;
textOffset = "2 2";
opaque = true;
fillColor = "255 255 255";
border = true;
borderThickness = 1;
borderColor = "0 0 0";
category = "Core";
};
$ConsoleDefaultFillColor = "0 0 0 175";
singleton GuiControlProfile( ConsoleScrollProfile : GuiScrollProfile )
{
opaque = true;
fillColor = $ConsoleDefaultFillColor;
border = 1;
//borderThickness = 0;
borderColor = "0 0 0";
category = "Core";
};
singleton GuiControlProfile( ConsoleTextEditProfile : GuiTextEditProfile )
{
fillColor = "242 241 240 255";
fillColorHL = "255 255 255";
category = "Core";
};
//-----------------------------------------------------------------------------
// Center and bottom print
//-----------------------------------------------------------------------------
singleton GuiControlProfile ( CenterPrintProfile )
{
opaque = false;
fillColor = "128 128 128";
fontColor = "0 255 0";
border = true;
borderColor = "0 255 0";
category = "Core";
};
singleton GuiControlProfile ( CenterPrintTextProfile )
{
opaque = false;
fontType = "Arial";
fontSize = 12;
fontColor = "0 255 0";
category = "Core";
};
// ----------------------------------------------------------------------------
// Radio button control
// ----------------------------------------------------------------------------
singleton GuiControlProfile( GuiRadioProfile )
{
fontSize = 14;
fillColor = "232 232 232";
fontColor = "20 20 20";
fontColorHL = "80 80 80";
fixedExtent = true;
bitmapAsset = "UI:radioButton_image";
hasBitmapArray = true;
category = "Core";
};
//
// Scroll Profile
//
singleton GuiControlProfile(GuiMenuScrollProfile)
{
opaque = false;
@ -552,33 +199,4 @@ singleton GuiControlProfile(GuiMenuScrollProfile)
bitmapAsset = "UI:scrollBar_image";
hasBitmapArray = true;
category = "BaseUI";
};
singleton GuiControlProfile(SliderBitmapGUIProfile)
{
bitmapAsset = "UI:optionsMenuSliderBitmapArray_image";
hasBitmapArray = true;
opaque = false;
borderColor = "0 0 0 255";
};
singleton GuiControlProfile(GuiMenuBackgroundProfile)
{
category = "BaseUI";
opaque = true;
fillcolor = "34 34 34 255";
};
singleton GuiControlProfile(GuiMenuPanelProfile)
{
category = "BaseUI";
opaque = true;
fillcolor = "15 15 15 255";
};
singleton GuiControlProfile(GuiMenuBasePanelProfile)
{
category = "BaseUI";
opaque = true;
fillcolor = "40 40 40 255";
};

4
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui
View file

@ -302,7 +302,7 @@ new VPathEditor(EVPathEditor) {
};
new GuiPopUpMenuCtrl(EPathEditorNodeOrientationMode){
internalName = "weight";
Profile = "GuiPopUpMenuProfile";
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "57 84";
@ -385,7 +385,7 @@ new VPathEditor(EVPathEditor) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "1 1";

4
Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditorToolbar.gui
View file

@ -30,7 +30,7 @@ $guiContent = new GuiControl(VPathEditorToolbar)
new GuiTextCtrl()
{
internalName = "ToolbarLabel";
profile = "GuiTextProfile";
profile = "ToolsGuiTextProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "2 7";
@ -48,7 +48,7 @@ $guiContent = new GuiControl(VPathEditorToolbar)
internalName = "PathTypeMenu";
Enabled = "1";
isContainer = "0";
Profile = "GuiPopUpMenuProfile";
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "85 7";

4
Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript
View file

@ -79,7 +79,7 @@ singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile )
canKeyFocus = true;
};
singleton GuiControlProfile( VEditorPopupMenuProfile : GuiPopUpMenuProfile )
singleton GuiControlProfile( VEditorPopupMenuProfile : ToolsGuiPopUpMenuProfile )
{
FillColorHL = "90 90 90";
FillColorSEL = "0 0 0";
@ -204,7 +204,7 @@ singleton GuiControlProfile( VEditorPropertyLabelProfile : VEditorTextProfile )
//-----------------------------------------------------------------------------
singleton GuiControlProfile( VEditorPreferenceLabelProfile : GuiTextProfile )
singleton GuiControlProfile( VEditorPreferenceLabelProfile : ToolsGuiTextProfile )
{
opaque = true;
fillColor = "242 241 240";

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
View file

@ -2420,7 +2420,7 @@ function AssetBrowserPreviewButton::onMouseDragged(%this)
%ctrl = new GuiDragAndDropControl()
{
canSaveDynamicFields = "0";
Profile = "GuiSolidDefaultProfile";
Profile = "ToolsGuiSolidDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = %xPos SPC %yPos;

2
Templates/BaseGame/game/tools/gui/messageBoxes/IODropdownDlg.ed.gui
View file

@ -54,7 +54,7 @@ $guiContent = new GuiControl(IODropdownDlg) {
};
new GuiBitmapBorderCtrl() {
isContainer = "0";
profile = "GuiGroupBorderProfile";
profile = "ToolsGuiGroupBorderProfile";
horizSizing = "width";
vertSizing = "bottom";
position = "7 51";

4
Templates/BaseGame/game/tools/gui/renderTargetVisualizer.ed.gui
View file

@ -5,7 +5,7 @@ $guiContent = new GuiControl(RenderTargetVisualizer) {
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiModelessDialogProfile";
profile = "ToolsGuiModelessDialogProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -79,7 +79,7 @@ $guiContent = new GuiControl(RenderTargetVisualizer) {
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
profile = "GuiPopUpMenuProfile";
profile = "ToolsGuiPopUpMenuProfile";
visible = "1";
active = "1";
command = "RenderTargetsList.updateTarget();";

6
Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml
View file

@ -1,10 +1,7 @@
<LevelAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DefaultEditorLevel"
LevelFile="@assetFile=DefaultEditorLevel.mis"
LevelName="DefaultEditorLevel"
isSubScene="false"
description="An empty room"
previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image"
@ -14,5 +11,4 @@
previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image"
previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image"
staticObjectAssetDependency0="@asset=Prototyping:FloorGray"
staticObjectAssetDependency1="@asset=FPSGameplay:soldier_rigged"
VersionId="1" />
VersionId="1"/>

14
Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui
View file

@ -2619,7 +2619,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
hovertime = "1000";
new GuiContainer(){ // enable/disable
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 24";
@ -2652,7 +2652,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
};
new GuiContainer(){ // scale
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 24";
@ -2735,7 +2735,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
};
new GuiContainer(){ // direction
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 24";
@ -2817,7 +2817,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
};
};
new GuiContainer(){ // strength
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 24";
@ -2899,7 +2899,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
};
};
new GuiContainer(){ // coverage
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 24";
@ -2981,7 +2981,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
};
};
new GuiContainer(){ // specular
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 24";
@ -3063,7 +3063,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
};
};
new GuiContainer(){ // empty space
profile="GuiTransparentProfile";
profile="ToolsGuiTransparentProfile";
isContainer = "1";
position = "0 0";
Extent = "300 10";

2
Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui
View file

@ -549,7 +549,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
canSaveDynamicFields = "0";
Enabled = "1";
isContainer = "1";
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "width";
VertSizing = "height";
Position = "1 1";

2
Templates/BaseGame/game/tools/navEditor/NavEditorSettingsTab.gui
View file

@ -14,7 +14,7 @@ $guiContent = new GuiTabPageCtrl(ENavEditorSettingsPage) {
minExtent = "8 2";
horizSizing = "width";
vertSizing = "height";
profile = "GuiSolidDefaultProfile";
profile = "ToolsGuiSolidDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

2
Templates/BaseGame/game/tools/settings.xml
View file

@ -41,7 +41,7 @@
<Setting
name="doubleClickAction">Edit Asset</Setting>
<Setting
name="LastPosExt">0 976 2016 360</Setting>
name="LastPosExt">0 976 2200 360</Setting>
<Setting
name="previewTileSize">1</Setting>
<Setting

2
Templates/BaseGame/game/tools/worldEditor/gui/shadowViz.gui
View file

@ -7,7 +7,7 @@
$guiContent = new GuiControl(AL_ShadowVizOverlayCtrl) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiModelessDialogProfile";
Profile = "ToolsGuiModelessDialogProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "0 0";