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

Improves handling of rendering guiPopupCtrls where if the height extent is taller than the bitmap array height, it'll adjust the height to recenter the displayed bitmap elements.

Browse source 
Streamlined the toolbar for the gui and world editors to utilize a stack, making the behavior and manipulation of toolbar elements significantly more consistent.
Added Settings and Asset Browser buttons to both gui and world editor toolbars for easier access.
Moved all tool toolbars over to work with the stack system to make them more consistent and better formatting
Added saving of asset browser's last position and extent so it remembers it on load.
Added editor setting to close the asset browser after completing a drag-n-drop action.
Added keybind to editor keybind list, making space toggle the asset browser
This commit is contained in:
Areloch 2021-09-01 01:12:16 -05:00
parent ef6efbf738
commit 683c438b09
20 changed files with 341 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

94
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -33,6 +33,29 @@
Visible = "1";
hovertime = "1000";
new GuiStackControl(EditorGuiToolbarStack) {
stackingType = "Horizontal";
horizStacking = "Left to Right";
vertStacking = "Top to Bottom";
padding = "0";
dynamicSize = "1";
dynamicNonStackExtent = "0";
dynamicPos = "0";
changeChildSizeToFit = "0";
changeChildPosition = "1";
position = "0 0";
extent = "885 32";
minExtent = "16 16";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapButtonCtrl(EHWorldEditor) {
canSaveDynamicFields = "0";
@ -107,6 +130,76 @@
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
BitmapAsset = "ToolsModule:settings_n_image";
bitmapMode = "Stretched";
autoFitExtents = "0";
useModifiers = "0";
useStates = "1";
masked = "0";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
position = "572 0";
extent = "29 27";
minExtent = "8 8";
horizSizing = "right";
vertSizing = "bottom";
profile = "ToolsGuiButtonProfile";
visible = "1";
active = "1";
command = "ESettingsWindow.toggleEditorSettings();";
tooltipProfile = "ToolsGuiToolTipProfile";
tooltip = "Open Editor Settings";
hovertime = "1000";
isContainer = "0";
internalName = "editorSettingsBtn";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl() {
Enabled = "1";
Profile = "ToolsGuiDefaultProfile";
position = "98 3";
Extent = "2 26";
MinExtent = "1 1";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = AssetBrowserBtn;
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "180 0";
Extent = "29 27";
MinExtent = "8 2";
canSave = "1";
Visible = "1";
Command = "AssetBrowser.toggleDialog();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Asset Browser";
hovertime = "750";
bitmapAsset = "ToolsModule:menuGrid_n_image";
bitmapMode = "Stretched";
buttonType = "PushButton";
groupNum = "0";
useMouseEvents = "0";
};
new GuiBitmapCtrl() {
Enabled = "1";
Profile = "ToolsGuiDefaultProfile";
position = "98 3";
Extent = "2 26";
MinExtent = "1 1";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl(EWorldEditorToggleCamera) {
canSaveDynamicFields = "0";
Enabled = "1";
@ -306,6 +399,7 @@
sbUsesNAColor = "0";
reverseTextList = "0";
bitmapBounds = "16 16";
};
};
};

25
Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui
View file

@ -520,31 +520,6 @@
useMouseEvents = "0";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
internalName = "editorSettingsBtn";
Enabled = "1";
isContainer = "0";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "484 3";
Extent = "29 27";
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Variable = "";
Command = "ESettingsWindow.toggleEditorSettings();";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Open Editor Settings";
hovertime = "1000";
bitmapAsset = "ToolsModule:settings_n_image";
text = "";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
};
new GuiContainer(objectCenterDropdown){
Profile = "IconDropdownProfile";
Position = getWord(EWorldEditorToolbar.position, 0)+getWord(ToggleButtonBar.Position, 0)+getWord(EWorldEditorToolbar-->centerObject.position, 0)-5 SPC getWord(EditorGuiToolbar.extent, 1)-1;

31
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript
View file

@ -91,10 +91,10 @@ function EditorGui::init(%this)
{
// Load Creator/Inspector GUI
exec("~/worldEditor/gui/WorldEditorToolbar.ed.gui");
if( isObject( EWorldEditorToolbar ) )
if( isObject( EditorGuiToolbarStack ) )
{
%this.add( EWorldEditorToolbar );
EWorldEditorToolbar.setVisible( false );
EditorGuiToolbarStack.add( EWorldEditorToolbar );
//EWorldEditorToolbar.setVisible( false );
}
}
@ -102,11 +102,11 @@ function EditorGui::init(%this)
{
// Load Terrain Edit GUI
exec("~/worldEditor/gui/TerrainEditToolbar.ed.gui");
if( isObject( EWTerrainEditToolbar ) )
/*if( isObject( EWTerrainEditToolbar ) )
{
%this.add( EWTerrainEditToolbar );
EWTerrainEditToolbar.setVisible( false );
}
}*/
}
if( !isObject( %this-->TerrainPainter ) )
@ -126,11 +126,11 @@ function EditorGui::init(%this)
{
// Load Terrain Edit GUI
exec("~/worldEditor/gui/TerrainPainterToolbar.ed.gui");
if( isObject( EWTerrainPainterToolbar ) )
/*if( isObject( EWTerrainPainterToolbar ) )
{
%this.add( EWTerrainPainterToolbar );
EWTerrainPainterToolbar.setVisible( false );
}
}*/
}
if( !isObject( %this-->ToolsToolbar ) )
@ -1082,7 +1082,9 @@ function TerrainEditorPlugin::onActivated( %this )
ETerrainEditor.attachTerrain();
ETerrainEditor.makeFirstResponder( true );
EWTerrainEditToolbar.setVisible( true );
EditorGuiToolbarStack.add(EWTerrainEditToolbar);
EditorGuiToolbarStack.remove( EWorldEditorToolbar );
//EWTerrainEditToolbar.setVisible( true );
ETerrainEditor.onBrushChanged();
ETerrainEditor.setup();
TerrainEditorPlugin.syncBrushInfo();
@ -1098,7 +1100,9 @@ function TerrainEditorPlugin::onDeactivated( %this )
endToolTime("TerrainEditor");
EditorGui.writeTerrainEditorSettings();
EWTerrainEditToolbar.setVisible( false );
EditorGuiToolbarStack.remove(EWTerrainEditToolbar);
EditorGuiToolbarStack.add( EWorldEditorToolbar );
//EWTerrainEditToolbar.setVisible( false );
ETerrainEditor.setVisible( false );
EditorGui.menuBar.remove( %this.terrainMenu );
@ -1216,7 +1220,10 @@ function TerrainPainterPlugin::onActivated( %this )
EditorGui-->TerrainPainter.setVisible(true);
EditorGui-->TerrainPainterPreview.setVisible(true);
EWTerrainPainterToolbar.setVisible(true);
EditorGuiToolbarStack.add(EWTerrainPainterToolbar);
EditorGuiToolbarStack.remove( EWorldEditorToolbar );
//EWTerrainPainterToolbar.setVisible(true);
ETerrainEditor.onBrushChanged();
EPainter.setup();
TerrainPainterPlugin.syncBrushInfo();
@ -1233,7 +1240,9 @@ function TerrainPainterPlugin::onDeactivated( %this )
%this.map.pop();
EditorGui-->TerrainPainter.setVisible(false);
EditorGui-->TerrainPainterPreview.setVisible(false);
EWTerrainPainterToolbar.setVisible(false);
EditorGuiToolbarStack.remove(EWTerrainPainterToolbar);
EditorGuiToolbarStack.add( EWorldEditorToolbar );
//EWTerrainPainterToolbar.setVisible(false);
ETerrainEditor.setVisible( false );
}

2
Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.tscript
View file

@ -78,3 +78,5 @@ GlobalActionMap.bind(keyboard, "ctrl F3", doProfile);
GlobalActionMap.bind(keyboard, "tilde", toggleConsole);
EditorMap.bind( mouse, "alt zaxis", editorWheelFadeScroll );
EditorMap.bindCmd( keyboard, space, "", "AssetBrowser.toggleDialog();" );