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

Reduce console spam from probe manager when not in debug

Browse source 
Added ability to activate height override on inspector fields from script
Further refinements of theme usage as well as editor settings
This commit is contained in:
Areloch 2019-06-17 23:48:20 -05:00
parent 07b28cb29a
commit e5c12f4aab
7 changed files with 204 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@
minExtent = "64 64";
horizSizing = "width";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
@ -86,7 +86,7 @@
minExtent = "16 16";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
profile = "ToolsGuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";

87
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs
View file

@ -56,7 +56,7 @@ function ESettingsWindow::hideDialog( %this )
function ESettingsWindow::ToggleVisibility()
{
if ( ESettingsWindow.visible )
if ( ESettingsWindow.visible )
{
ESettingsWindow.setVisible(false);
}
@ -65,6 +65,8 @@ function ESettingsWindow::ToggleVisibility()
ESettingsWindow.setVisible(true);
ESettingsWindow.selectWindow();
ESettingsWindow.setCollapseGroup(false);
ESettingsWindowList.clear();
}
ESettingsWindowList.setSelectedById( 1 );
@ -82,10 +84,10 @@ function ESettingsWindow::toggleProjectSettings(%this)
}
ESettingsWindowList.sort(0);
ESettingsWindowList.setSelectedById( 1 );
%this.mode = "Project";
ESettingsWindow.text = "Game Project Settings";
ESettingsWindowList.setSelectedById( 1 );
}
function ESettingsWindow::toggleEditorSettings(%this)
@ -100,10 +102,10 @@ function ESettingsWindow::toggleEditorSettings(%this)
}
ESettingsWindowList.sort(0);
ESettingsWindowList.setSelectedById( 1 );
%this.mode = "Editor";
ESettingsWindow.text = "Editor Settings";
ESettingsWindowList.setSelectedById( 1 );
}
function ESettingsWindow::addEditorSettingsPage(%this, %settingsPageName, %settingsPageText)
@ -161,6 +163,77 @@ function SettingsInspector::changeEditorSetting(%this, %varName, %value)
%success = ProjectSettings.write();
}
function GuiInspectorVariableGroup::buildOptionsSettingField(%this, %fieldName, %fieldLabel, %fieldDesc, %fieldDefaultVal, %fieldDataVals, %ownerObj)
{
%extent = 200;
%fieldCtrl = %this.createInspectorField();
%fieldCtrl.setHeightOverride(true, 200);
%extent = %this.stack.getExtent();
%width = mRound(%extent/2);
%height = 20;
%inset = 10;
%editControl = new GuiPopUpMenuCtrl() {
class = "guiInspectorListField";
maxPopupHeight = "200";
sbUsesNAColor = "0";
reverseTextList = "0";
bitmapBounds = "16 16";
maxLength = "1024";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
AnchorTop = "1";
AnchorBottom = "0";
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "ToolsGuiPopUpMenuProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = %fieldCtrl.edit.position;
Extent = %fieldCtrl.edit.extent;
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = %tooltip;
text = %fieldDefaultVal;
hovertime = "1000";
ownerObject = %ownerObj;
fieldName = %fieldName;
};
//set the field value
if(getSubStr(%this.fieldName, 0, 1) $= "$")
{
if(%fieldName $= "")
%editControl.setText(%fieldName);
}
else
{
//regular variable
%setCommand = %editControl @ ".setText(" @ %ownerObj @ "." @ %fieldName @ ");";
eval(%setCommand);
}
%listCount = getTokenCount(%fieldDataVals, ",");
for(%i=0; %i < %listCount; %i++)
{
%entryText = getToken(%fieldDataVals, ",", %i);
%editControl.add(%entryText);
}
%fieldCtrl.setCaption(%fieldLabel);
%fieldCtrl.setEditControl(%editControl);
%this.addInspectorField(%fieldCtrl);
}
//
// COMMON EDITOR SETTINGS
//
@ -345,7 +418,7 @@ function ESettingsWindow::getGameplaySettings(%this)
function ESettingsWindow::getGameOptionsSettings(%this)
{
SettingsInspector.startGroup("Game Modes");
SettingsInspector.addSettingsField("Gameplay/GameModes/defaultModeName", "Default Gamemode Name", "string", "");
SettingsInspector.startGroup("Options Settings");
SettingsInspector.addSettingsField("Options/optionsList", "OptionsList", "OptionsSetting", "");
SettingsInspector.endGroup();
}