diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_h_image.asset.taml b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_h_image.asset.taml index a2dc1f821..ebf48969f 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_h_image.asset.taml +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_h_image.asset.taml @@ -1,8 +1,8 @@ diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_n_image.asset.taml b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_n_image.asset.taml index d697e1095..1df5992de 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_n_image.asset.taml +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/Images_btn_Palette_n_image.asset.taml @@ -1,7 +1,7 @@ diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_h.png b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_h.png new file mode 100644 index 000000000..e5023a4ac Binary files /dev/null and b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_h.png differ diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_h_image.asset.taml b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_h_image.asset.taml new file mode 100644 index 000000000..6f69ec079 --- /dev/null +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_n.png b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_n.png new file mode 100644 index 000000000..89ba60d8e Binary files /dev/null and b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_n.png differ diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_n_image.asset.taml b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_n_image.asset.taml new file mode 100644 index 000000000..ace12e9a7 --- /dev/null +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/Images/btn_VMovie_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui index 8962b3ec7..b6315df53 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui @@ -40,17 +40,19 @@ new VPathEditor(EVPathEditor) { GizmoProfile = "GlobalGizmoProfile"; new GuiWindowCollapseCtrl(VPathEditorTreeWindow) { + canCollapse = "0"; + canMove = "0"; internalName = ""; canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "GuiWindowProfile"; + Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 167"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 167"; + MinExtent = "300 100"; canSave = "1"; Visible = "1"; tooltipprofile = "GuiToolTipProfile"; @@ -63,14 +65,13 @@ new VPathEditor(EVPathEditor) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = "Path Editor"; + text = ":: Verve Path Editor"; new GuiContainer(){ profile = GuiDefaultProfile; @@ -149,7 +150,7 @@ new VPathEditor(EVPathEditor) { Profile = "GuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "193 4"; + position = "339 4"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -162,7 +163,7 @@ new VPathEditor(EVPathEditor) { canSaveDynamicFields = "0"; }; new GuiBitmapButtonCtrl() { - bitmap = "core/gui/images/new"; + bitmapAsset = "ToolsModule:new_n_image"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -170,7 +171,7 @@ new VPathEditor(EVPathEditor) { Profile = "GuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "176 3"; + position = "322 3"; Extent = "17 17"; MinExtent = "8 2"; canSave = "1"; @@ -184,17 +185,21 @@ new VPathEditor(EVPathEditor) { }; }; new GuiWindowCollapseCtrl(VPathEditorOptionsWindow) { + canCollapse = "0"; + canMove = "0"; + canCollapse = "0"; + canMove = "0"; internalName = "Window"; canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "GuiWindowProfile"; + Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(VPathEditorTreeWindow.extent, 1) - 2; - Extent = "210 530"; - MinExtent = "210 298"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(VPathEditorTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(VPathEditorTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 300"; canSave = "1"; Visible = "1"; tooltipprofile = "GuiToolTipProfile"; @@ -207,14 +212,13 @@ new VPathEditor(EVPathEditor) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Verve Path - Properties"; new GuiContainer(){ //Node Properties isContainer = "1"; @@ -227,7 +231,7 @@ new VPathEditor(EVPathEditor) { Margin = "3 3 3 3"; new GuiTextCtrl(){ - Profile = "GuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -235,7 +239,7 @@ new VPathEditor(EVPathEditor) { text = "Node Properties"; }; new GuiTextCtrl(){ - Profile = "GuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "7 21"; @@ -253,7 +257,7 @@ new VPathEditor(EVPathEditor) { AltCommand = "EVPathEditor.setNodePosition( $ThisControl.getValue() );"; }; new GuiTextCtrl(){ - Profile = "GuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "7 42"; @@ -271,7 +275,7 @@ new VPathEditor(EVPathEditor) { AltCommand = "EVPathEditor.setNodeRotation( $ThisControl.getValue() );"; }; new GuiTextCtrl(){ - Profile = "GuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "7 63"; @@ -289,7 +293,7 @@ new VPathEditor(EVPathEditor) { AltCommand = "EVPathEditor.setNodeWeight( $ThisControl.getValue() );"; }; new GuiTextCtrl(){ - Profile = "GuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "7 84"; @@ -307,7 +311,7 @@ new VPathEditor(EVPathEditor) { Command = "OnOrientationChanged();"; }; new GuiTextCtrl(){ - Profile = "GuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "7 105"; @@ -336,7 +340,7 @@ new VPathEditor(EVPathEditor) { Margin = "0 0 3 3"; new GuiTextCtrl(){ - Profile = "GuiDefaultProfile"; + Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -401,8 +405,8 @@ new VPathEditor(EVPathEditor) { Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - Position = "1 485"; - Extent = "202 42"; + position = "8" SPC getWord(VPathEditorOptionsWindow.extent, 1) - 40; + Extent = "330 42"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript index d18c18753..7344c3ea2 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript @@ -224,5 +224,5 @@ function VPathInspector::onInspectorFieldModified( %this, %object, %fieldName, % function VPathInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - VPathFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + VPathFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " @ " : " @ "" @ %fieldDoc ); } \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript b/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript new file mode 100644 index 000000000..434b01e0c --- /dev/null +++ b/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript @@ -0,0 +1,121 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +function EVPathEditor::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = VPathEditorTreeWindow; + %fluidWindow = VPathEditorOptionsWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function VPathEditorTreeWindow::onMouseDragged(%this) +{ + %parent = EVPathEditor; + + if(%parent.resizing == false) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function VPathEditorOptionsWindow::onMouseDragged(%this) +{ + %parent = EVPathEditor; + + if(%parent.resizing == false) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function EVPathEditor::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = RoadEditorOptionsWindow; + + if(%this.resizing == false) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } + + FieldInfoControl.position = 5 SPC EWInspectorWindow.extent.y - 40; +} \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript index e264f9312..0705216ed 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Plugin.tscript @@ -36,18 +36,18 @@ function VPathEditorPlugin::onWorldEditorStartup( %this ) //---------------------------------------------------------------------- // Add ourselves to the window menu. - %accel = EditorGui.addToEditorsMenu( "Path Editor", "", VPathEditorPlugin ); + %accel = EditorGui.addToEditorsMenu( "Verve Path Editor", "", VPathEditorPlugin ); // Add ourselves to the ToolsToolbar - %tooltip = "Path Editor (" @ %accel @ ")"; - EditorGui.addToToolsToolbar( "VPathEditorPlugin", "VPathEditorPalette", "ToolsModule:btn_Palette_n_image", %tooltip ); + %tooltip = "Verve Path Editor (" @ %accel @ ")"; + EditorGui.addToToolsToolbar( "VPathEditorPlugin", "VPathEditorPalette", "ToolsModule:btn_VMovie_n_image", %tooltip ); // Find and Store the Button. %this.ToolbarButton = ToolsToolbarArray.findObjectByInternalName( "VPathEditorPalette", false ); // Extend Width. %extent = EWToolsToolbar.getExtent(); - EWToolsToolbar.setExtent( ( getWord( %extent, 0 ) + 33 ) SPC getWord( %extent, 1 ) ); + EWToolsToolbar.setExtent( ( getWord( %extent, 0 ) + 32 ) SPC getWord( %extent, 1 ) ); //---------------------------------------------------------------------- // diff --git a/Templates/BaseGame/game/tools/VPathEditor/main.tscript b/Templates/BaseGame/game/tools/VPathEditor/main.tscript index 27ad718ec..c539867c2 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/main.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/main.tscript @@ -12,6 +12,7 @@ function InitializeVPathEditor() // Scripts. exec( "./Scripts/Plugin." @ $TorqueScriptFileExtension ); exec( "./Scripts/Editor." @ $TorqueScriptFileExtension ); + exec( "./Scripts/GuiScript." @ $TorqueScriptFileExtension ); } function DestroyVPathEditor() diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript index 3d7217100..ada3b1a08 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript @@ -15,7 +15,7 @@ singleton GuiControlProfile( VEditorDefaultProfile ) borderColorHL = "100 100 100"; borderColorNA = "240 240 240"; - fontType = "Arial"; + fontType = "Segoe UI Regular"; fontSize = 12; fontCharset = ANSI; @@ -56,7 +56,7 @@ singleton GuiControlProfile( VEditorTextProfile : VEditorDefaultProfile ) border = false; opaque = false; - fontType = "Arial Bold"; + fontType = "Segoe UI Bold"; }; singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile ) @@ -186,7 +186,7 @@ singleton GuiControlProfile( VEditorPropertyRolloutProfile : GuiRolloutProfile ) hasBitmapArray = true; bitmapAsset = "ToolsModule:PropertyRollout_image"; - fontType = "Arial"; + fontType = "Segoe UI Regular"; fontSize = 12; fontCharset = ANSI; diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_d.png b/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_d.png index af2143ead..7fab9f5b0 100644 Binary files a/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_d.png and b/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_d.png differ diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_h.png b/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_h.png index 31242c88f..031154d30 100644 Binary files a/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_h.png and b/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_h.png differ diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_n.png b/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_n.png index 8fb0392cc..ee9359ce2 100644 Binary files a/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_n.png and b/Templates/BaseGame/game/tools/VerveEditor/GUI/Images/btn_Palette_n.png differ diff --git a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript index f3532ae8a..9a330c284 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/Scripts/Plugin.tscript @@ -34,7 +34,7 @@ function VerveEditorPlugin::onWorldEditorStartup( %this ) // Extend Width. %extent = EWToolsToolbar.getExtent(); - EWToolsToolbar.setExtent( ( getWord( %extent, 0 ) + 33 ) SPC getWord( %extent, 1 ) ); + EWToolsToolbar.setExtent( ( getWord( %extent, 0 ) + 32 ) SPC getWord( %extent, 1 ) ); } function VerveEditorPlugin::setEditorFunction( %this ) diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/animationIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/animationIcon.png index d8f3e35b9..f12357beb 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/animationIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/animationIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_d.png b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_d.png new file mode 100644 index 000000000..0335c0794 Binary files /dev/null and b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_d.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_h.png b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_h.png new file mode 100644 index 000000000..7729b2500 Binary files /dev/null and b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_h.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_n.png b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_n.png new file mode 100644 index 000000000..24be08773 Binary files /dev/null and b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_n.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_n_image.asset.taml b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_n_image.asset.taml new file mode 100644 index 000000000..a7a4405b9 --- /dev/null +++ b/Templates/BaseGame/game/tools/assetBrowser/art/assetBrowser_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/clientScriptIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/clientScriptIcon.png index 698c68852..502835ea1 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/clientScriptIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/clientScriptIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/componentIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/componentIcon.png index cbaf56990..e04515030 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/componentIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/componentIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/cppIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/cppIcon.png index 3f7e4efd5..fcdff77e4 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/cppIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/cppIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/datablockIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/datablockIcon.png index e1fa5917a..cce35bbba 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/datablockIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/datablockIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/folderIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/folderIcon.png index bb425c1b2..55ac100af 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/folderIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/folderIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/gameObjectIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/gameObjectIcon.png index 9d6f7328f..05dd765db 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/gameObjectIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/gameObjectIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/guiIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/guiIcon.png index 3d25b953a..27dc12c1b 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/guiIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/guiIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/levelIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/levelIcon.png index d3a2f55e8..22b39d894 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/levelIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/levelIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/materialIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/materialIcon.png index 2b805f6d8..e1b80679e 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/materialIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/materialIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/postEffectIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/postEffectIcon.png index 2b7fda7e4..3f4cfb8d7 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/postEffectIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/postEffectIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/prefabIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/prefabIcon.png index 91ce8888c..4ab78e9c8 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/prefabIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/prefabIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/scriptIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/scriptIcon.png index 2cd25eee4..b1889b332 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/scriptIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/scriptIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/serverScriptIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/serverScriptIcon.png index 23b7861bd..37e330c43 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/serverScriptIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/serverScriptIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/soundIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/soundIcon.png index 0346a4c93..37d05ea68 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/soundIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/soundIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/stateMachineIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/stateMachineIcon.png index ed94703a1..0f0e052ef 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/stateMachineIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/stateMachineIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/terrainIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/terrainIcon.png index 29036c61e..e34b9cdab 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/terrainIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/terrainIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/art/terrainMaterialIcon.png b/Templates/BaseGame/game/tools/assetBrowser/art/terrainMaterialIcon.png index 75ae72c45..4db4fa910 100644 Binary files a/Templates/BaseGame/game/tools/assetBrowser/art/terrainMaterialIcon.png and b/Templates/BaseGame/game/tools/assetBrowser/art/terrainMaterialIcon.png differ diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui index 5a7aade06..735275523 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui @@ -30,7 +30,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "321 334"; + position = "120 334"; extent = "381 99"; minExtent = "48 92"; horizSizing = "center"; @@ -138,8 +138,8 @@ $guiContent = new GuiControl(AssetBrowser) { }; }; new GuiWindowCtrl(AssetBrowserWindow) { - text = "Asset Browser"; - resizeWidth = "1"; + text = ":: Asset Browser"; + resizeWidth = "0"; resizeHeight = "1"; canMove = "1"; canClose = "1"; @@ -154,9 +154,10 @@ $guiContent = new GuiControl(AssetBrowser) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "204 80"; - extent = "615 608"; - minExtent = "383 274"; + //position = "204 80"; + Position = "0" SPC getWord($pref::Video::mode, 1) - 360 - 60; + extent = getWord($pref::Video::mode, 0) - 360 SPC "360"; + minExtent = "360 120"; horizSizing = "windowRelative"; vertSizing = "windowRelative"; profile = "ToolsGuiWindowProfile"; @@ -181,7 +182,7 @@ $guiContent = new GuiControl(AssetBrowser) { dynamicSize = "0"; padding = "0 0 0 0"; position = "0 24"; - extent = "615 30"; + extent = "615 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -196,19 +197,19 @@ $guiContent = new GuiControl(AssetBrowser) { canSaveDynamicFields = "0"; new GuiIconButtonCtrl() { - buttonMargin = "4 4"; + buttonMargin = "0 0"; bitmapAsset = "ToolsModule:phone_image"; iconLocation = "Left"; - sizeIconToButton = "1"; - makeIconSquare = "1"; + sizeIconToButton = "0"; + makeIconSquare = "0"; textLocation = "Left"; - textMargin = "4"; + textMargin = "0"; autoSize = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; position = "0 0"; - extent = "30 30"; + extent = "32 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -222,21 +223,22 @@ $guiContent = new GuiControl(AssetBrowser) { internalName = "windowOptionsButton"; canSave = "1"; canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; }; new GuiIconButtonCtrl() { - buttonMargin = "4 4"; + buttonMargin = "0 0"; bitmapAsset = "ToolsModule:plus_image"; iconLocation = "Left"; - sizeIconToButton = "1"; - makeIconSquare = "1"; + sizeIconToButton = "0"; + makeIconSquare = "0"; textLocation = "Center"; - textMargin = "4"; + textMargin = "0"; autoSize = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "30 0"; - extent = "30 30"; + position = "32 0"; + extent = "32 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -250,21 +252,22 @@ $guiContent = new GuiControl(AssetBrowser) { class="CreateAssetButton"; canSave = "1"; canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; }; new GuiIconButtonCtrl() { - buttonMargin = "4 4"; + buttonMargin = "0 0"; bitmapAsset = "ToolsModule:import_image"; iconLocation = "Left"; - sizeIconToButton = "1"; - makeIconSquare = "1"; + sizeIconToButton = "0"; + makeIconSquare = "0"; textLocation = "Center"; - textMargin = "4"; + textMargin = "0"; autoSize = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "60 0"; - extent = "30 30"; + position = "64 0"; + extent = "32 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -279,21 +282,22 @@ $guiContent = new GuiControl(AssetBrowser) { command="AssetBrowser.importNewFile();"; canSave = "1"; canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; }; new GuiIconButtonCtrl() { - buttonMargin = "4 4"; + buttonMargin = "0 0"; bitmapAsset = "ToolsModule:filter_image"; iconLocation = "Left"; - sizeIconToButton = "1"; - makeIconSquare = "1"; + sizeIconToButton = "0"; + makeIconSquare = "0"; textLocation = "Center"; - textMargin = "4"; + textMargin = "0"; autoSize = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "90 0"; - extent = "30 30"; + position = "96 0"; + extent = "32 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -308,21 +312,22 @@ $guiContent = new GuiControl(AssetBrowser) { internalName = "filterAssetsButton"; canSave = "1"; canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; }; new GuiIconButtonCtrl() { - buttonMargin = "4 4"; + buttonMargin = "0 0"; bitmapAsset = "ToolsModule:gear_image"; iconLocation = "Left"; - sizeIconToButton = "1"; - makeIconSquare = "1"; + sizeIconToButton = "0"; + makeIconSquare = "0"; textLocation = "Center"; - textMargin = "4"; + textMargin = "0"; autoSize = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "120 0"; - extent = "30 30"; + position = "128 0"; + extent = "32 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -337,21 +342,22 @@ $guiContent = new GuiControl(AssetBrowser) { internalName = "editAssetSettingsButton"; canSave = "1"; canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; }; new GuiIconButtonCtrl() { - buttonMargin = "4 4"; + buttonMargin = "0 0"; bitmapAsset = "ToolsModule:warning_image"; iconLocation = "Left"; - sizeIconToButton = "1"; - makeIconSquare = "1"; + sizeIconToButton = "0"; + makeIconSquare = "0"; textLocation = "Center"; - textMargin = "4"; + textMargin = "0"; autoSize = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "150 0"; - extent = "30 30"; + position = "160 0"; + extent = "32 32"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -366,6 +372,37 @@ $guiContent = new GuiControl(AssetBrowser) { internalName = "AutoImportAssetButton"; canSave = "1"; canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; + }; + new GuiIconButtonCtrl() { + buttonMargin = "0 0"; + bitmapAsset = "ToolsModule:console_image"; + iconLocation = "Left"; + sizeIconToButton = "0"; + makeIconSquare = "0"; + textLocation = "Center"; + textMargin = "0"; + autoSize = "0"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "192 0"; + extent = "32 32"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.showWindow();"; + tooltipProfile = "GuiToolTipProfile"; + tooltip = "Open the console log in a window."; + hovertime = "1000"; + isContainer = "0"; + internalName = "ABwindowConsoleButton"; + canSave = "1"; + canSaveDynamicFields = "0"; + buttonMargin = "-2 0"; }; }; new GuiSplitContainer(AssetBrowser_MainSplit) { @@ -373,7 +410,7 @@ $guiContent = new GuiControl(AssetBrowser) { splitterSize = "2"; splitPoint = "190 100"; fixedPanel = "None"; - fixedSize = "468"; + fixedSize = "280"; docking = "None"; margin = "0 0 0 0"; padding = "0 0 0 0"; @@ -382,7 +419,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "0"; position = "3 56"; - extent = "608 532"; + extent = getWord($pref::Video::mode, 0) - 360 - 2 SPC "280"; minExtent = "64 64"; horizSizing = "relative"; vertSizing = "height"; @@ -404,7 +441,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "0"; position = "0 0"; - extent = "188 532"; + extent = "188 280"; minExtent = "0 0"; horizSizing = "right"; vertSizing = "bottom"; @@ -480,7 +517,7 @@ $guiContent = new GuiControl(AssetBrowser) { buttonType = "PushButton"; useMouseEvents = "0"; position = "173 4"; - extent = "15 15"; + extent = "16 16"; minExtent = "8 2"; horizSizing = "left"; vertSizing = "bottom"; @@ -496,7 +533,7 @@ $guiContent = new GuiControl(AssetBrowser) { canSaveDynamicFields = "0"; }; }; - new GuiContainer() { + new GuiContainer(AssetBrowserTreePanel) { margin = "0 0 0 0"; padding = "0 0 0 0"; anchorTop = "1"; @@ -504,7 +541,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "0"; position = "0 17"; - extent = "188 516"; + extent = "188 260"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "height"; @@ -517,7 +554,7 @@ $guiContent = new GuiControl(AssetBrowser) { canSave = "1"; canSaveDynamicFields = "0"; - new GuiScrollCtrl() { + new GuiScrollCtrl(AssetBrowserTreeScroll) { willFirstRespond = "1"; hScrollBar = "dynamic"; vScrollBar = "dynamic"; @@ -534,7 +571,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "0"; position = "0 0"; - extent = "188 516"; + extent = "188 260"; minExtent = "8 8"; horizSizing = "width"; vertSizing = "height"; @@ -596,7 +633,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "0"; position = "192 0"; - extent = "416 532"; + extent = "416 260"; minExtent = "16 16"; horizSizing = "right"; vertSizing = "bottom"; @@ -868,7 +905,7 @@ $guiContent = new GuiControl(AssetBrowser) { canSaveDynamicFields = "0"; }; }; - new GuiContainer() { + new GuiContainer(AssetListContainer) { margin = "0 0 0 0"; padding = "0 0 0 0"; anchorTop = "1"; @@ -876,7 +913,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "1"; position = "1 37"; - extent = "416 495"; + extent = "416 240"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "height"; @@ -906,7 +943,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorLeft = "1"; anchorRight = "0"; position = "0 0"; - extent = "416 479"; + extent = "416 220"; minExtent = "8 8"; horizSizing = "width"; vertSizing = "height"; @@ -922,7 +959,7 @@ $guiContent = new GuiControl(AssetBrowser) { new GuiMouseEventCtrl(AssetListPanelInputs) { lockMouse = "0"; position = "1 1"; - extent = "414 472"; + extent = "414 220"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "height"; @@ -996,11 +1033,11 @@ $guiContent = new GuiControl(AssetBrowser) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "0 479"; - extent = "416 16"; + position = "0 220"; + extent = "300 16"; minExtent = "8 2"; horizSizing = "width"; - vertSizing = "height"; + vertSizing = "top"; profile = "ToolsGuiSolidDefaultProfile"; visible = "1"; active = "1"; @@ -1020,7 +1057,7 @@ $guiContent = new GuiControl(AssetBrowser) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "0 475"; + position = "0 220"; extent = "269 23"; minExtent = "8 2"; horizSizing = "right"; @@ -1044,8 +1081,8 @@ $guiContent = new GuiControl(AssetBrowser) { groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "-2 200"; - extent = "18 18"; + position = "-2 120"; + extent = "16 16"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "center"; @@ -1068,7 +1105,7 @@ $guiContent = new GuiControl(AssetBrowser) { groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "559 588"; + position = "120 340"; extent = "53 19"; minExtent = "8 2"; horizSizing = "left"; @@ -1087,8 +1124,8 @@ $guiContent = new GuiControl(AssetBrowser) { }; new GuiBitmapCtrl() { bitmapAsset = "ToolsModule:smaller_image"; - position = "5 588"; - extent = "20 20"; + position = "5 338"; + extent = "16 16"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "top"; @@ -1109,7 +1146,7 @@ $guiContent = new GuiControl(AssetBrowser) { useFillBar = "0"; fillBarColor = "255 255 255 255"; renderTicks = "0"; - position = "28 590"; + position = "24 340"; extent = "75 20"; minExtent = "8 2"; horizSizing = "right"; @@ -1129,8 +1166,8 @@ $guiContent = new GuiControl(AssetBrowser) { }; new GuiBitmapCtrl() { bitmapAsset = "ToolsModule:larger_image"; - position = "103 588"; - extent = "20 20"; + position = "103 338"; + extent = "16 16"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "top"; @@ -1143,6 +1180,136 @@ $guiContent = new GuiControl(AssetBrowser) { canSave = "1"; canSaveDynamicFields = "0"; }; + new GuiButtonCtrl(assetBrowser_Tab1) { + text = "Tab1 Text 1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "5 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(assetBrowser_Tab2) { + text = "Tab1 Text 2"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "105 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(assetBrowser_Tab3) { + text = "Tab1 Text 3"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "205 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(assetBrowser_Tab4) { + text = "Tab1 Text 4"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "305 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl(AssetBrowserWindow_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = getWord($pref::Video::mode, 0) - 407 SPC "1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "AssetBrowserWindow.releasePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Panel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(AssetBrowserWindow_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = getWord($pref::Video::mode, 0) - 407 SPC "1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "AssetBrowserWindow.dockPanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Panel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index 3e9c778ae..1216eaab6 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -18,14 +18,14 @@ function AssetBrowser::addToolbarButton(%this) tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Asset Browser"; hovertime = "750"; - bitmapAsset = "ToolsModule:menuGrid_n_image"; + bitmapAsset = "ToolsModule:assetBrowser_n_image"; bitmapMode = "Stretched"; - buttonType = "PushButton"; + buttonType = "ToggleButton"; groupNum = "0"; useMouseEvents = "0"; }; ToolsToolbarArray.add(%button); - EWToolsToolbar.setExtent((25 + 8) * (ToolsToolbarArray.getCount()) + 12 SPC "33"); + EWToolsToolbar.setExtent((29 + 4) * (ToolsToolbarArray.getCount()) + 4 SPC "32"); } // @@ -73,12 +73,84 @@ function AssetBrowser::onAdd(%this) function AssetBrowser::onWake(%this) { %this.initialize(); + + // Make the window fit next to the side panel + // We do a simple resize so that we don't have to redo the whole GUI layout + %newWidth = getWord($pref::Video::mode, 0) - 360; + %vertPos = getWord($pref::Video::mode, 1) - 360 - 35; + AssetBrowserWindow.resize("0", %vertPos, %newWidth, "360"); + AssetBrowserWindow.dockPanel(); } function AssetBrowser::onDialogPop(%this) { + $AssetBrowser::Open = false; %lastPosExt = AssetBrowserWindow.position SPC AssetBrowserWindow.extent; - EditorSettings.setValue("Assets/Browser/LastPosExt", %lastPosExt); + EditorSettings.setValue("Assets/Browser/LastPosExt", %lastPosExt); +} + +function AssetBrowser::onDialogPush(%this) +{ + $AssetBrowser::Open = true; + + // Add a tab to the windowed console + if($WindowConsole::Open) + { + %text = "Console Log"; + %command = "windowConsoleControl.putToFront();"; + + AssetBrowserWindow.text = ""; + windowConsoleControl.text = ""; + + AssetBrowser.setTab(assetBrowser_Tab1, "Asset Browser", ""); + assetBrowser_Tab1.setHidden(false); + assetBrowser_Tab1.setActive(false); + + if(assetBrowser_Tab2.text $= %text || assetBrowser_Tab3.text $= %text || assetBrowser_Tab4.text $= %text) + { + // we have a tab, don't do anything + } + else if(assetBrowser_Tab2.hidden == true) + { + AssetBrowser.setTab(assetBrowser_Tab2, %text, %command); + } + else if(assetBrowser_Tab3.hidden == true) + { + AssetBrowser.setTab(assetBrowser_Tab3, %text, %command); + } + else if(assetBrowser_Tab4.hidden == true) + { + AssetBrowser.setTab(assetBrowser_Tab4, %text, %command); + } + else + { + warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()"); + } + } + + EditorGui.updateSideBar(); +} + +function AssetBrowser::setTab(%this, %tab, %text, %command) +{ + if(isObject(%tab)) + { + %tab.setActive(true); + %tab.setHidden(false); + %tab.setText(%text); + %tab.command = %command; + } +} + +function AssetBrowser::putToFront(%this) +{ + // Close the object + AssetBrowser.hideDialog(); + // Create the object again so it will render on top + AssetBrowser.ShowDialog(); + // Put the focus on this window + AssetBrowser.restoreLastPosExt(); + AssetBrowserWindow.selectWindow(); } function AssetBrowser::restoreLastPosExt(%this) @@ -88,6 +160,7 @@ function AssetBrowser::restoreLastPosExt(%this) { AssetBrowserWindow.resize(getWord(%lastPosExt, 0), getWord(%lastPosExt, 1), getWord(%lastPosExt, 2), getWord(%lastPosExt, 3)); } + EditorGui.updateSideBar(); } function contentTreeTabBook::onTabSelected(%this, %tabText, %tabIndex) @@ -304,6 +377,11 @@ function AssetBrowser::showDialog( %this, %AssetTypeFilter, %selectCallback, %ta AssetBrowserWindow.setVisible(1); AssetBrowserWindow.selectWindow(); + if(AssetBrowserWindow.docked) + AssetBrowserWindow.dockPanel(); + else + AssetBrowserWindow.releasePanel(); + //If we're special-case filtering(like for selecting a given type), then ignore our normal //visibility filter if(%AssetTypeFilter !$= "") @@ -511,7 +589,7 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName ) extent = %previewSize.x SPC %previewSize.y + %textBottomPad; buttonType = "RadioButton"; buttonMargin = "0 -10"; - profile = ToolsGuiDefaultProfile; + profile = ToolsGuiDefaultIconBtnProfile; }; %previewScaleSize = AssetBrowser-->previewSlider.getValue(); @@ -526,8 +604,9 @@ function AssetBrowser::buildAssetPreview( %this, %asset, %moduleName ) { %previewButton.iconLocation = "Left"; %previewButton.textLocation = "Right"; - %previewButton.setextent(120,20); - %previewButton.buttonMargin = "0 0"; + %previewButton.setextent(160,34); + %previewButton.buttonMargin = "8 8"; + %previewButton.textMargin = "6"; AssetBrowser.previewListMode = true; } @@ -2710,7 +2789,8 @@ function AssetBrowser::importLooseFiles(%this) LooseFileAuditWindow.showDialog(%this.dirHandler.currentAddress); } -// +// ----------------------------------------------------------------------------- + function getAssetPreviewImage(%asset) { if(isFile(%asset)) @@ -2755,4 +2835,48 @@ function getAssetPreviewImage(%asset) %previewPath = "ToolsModule:unknownImage_image"; return %previewPath; +} + +// ----------------------------------------------------------------------------- + +function AssetBrowserWindow::dockPanel(%this) +{ + if(%this.docked == true) + return; + + %this.resizing = true; + + %this.docked = true; + + %this.canCollapse = "0"; + %this.canMove = "0"; + %this.resizeWidth = "0"; + + AssetBrowserWindow_UnDockBtn.Visible = "1"; + AssetBrowserWindow_DockBtn.Visible = "0"; + + EditorGui.updateSideBar(); +} + +function AssetBrowserWindow::releasePanel(%this) +{ + if(%this.docked == false) + return; + + %this.canCollapse = "1"; + %this.canMove = "1"; + %this.resizeWidth = "1"; + + AssetBrowserWindow_UnDockBtn.Visible = "0"; + AssetBrowserWindow_DockBtn.Visible = "1"; + + // Let's do a small resize so it's visually clear we're "undocking" + %position = %this.position.x + 6 SPC %this.position.y - 6; + %extent = %this.extent.x SPC %this.extent.y; + %this.resize(%position.x, %position.y, %extent.x, %extent.y); + + %this.docked = false; + %this.resizing = false; + + EditorGui.updateSideBar(); } \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/classIcons/ActiveScene.png b/Templates/BaseGame/game/tools/classIcons/ActiveScene.png index 01981f965..d2f584972 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ActiveScene.png and b/Templates/BaseGame/game/tools/classIcons/ActiveScene.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/BasicClouds.png b/Templates/BaseGame/game/tools/classIcons/BasicClouds.png index f5c863f29..04851b509 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/BasicClouds.png and b/Templates/BaseGame/game/tools/classIcons/BasicClouds.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Camera.png b/Templates/BaseGame/game/tools/classIcons/Camera.png index 0722c8515..5eeb960eb 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Camera.png and b/Templates/BaseGame/game/tools/classIcons/Camera.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/CameraBookmark.png b/Templates/BaseGame/game/tools/classIcons/CameraBookmark.png index 0722c8515..d335dcbff 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/CameraBookmark.png and b/Templates/BaseGame/game/tools/classIcons/CameraBookmark.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/CloudLayer.png b/Templates/BaseGame/game/tools/classIcons/CloudLayer.png index 0cde23bc0..d6f41099a 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/CloudLayer.png and b/Templates/BaseGame/game/tools/classIcons/CloudLayer.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Component.png b/Templates/BaseGame/game/tools/classIcons/Component.png new file mode 100644 index 000000000..36561d239 Binary files /dev/null and b/Templates/BaseGame/game/tools/classIcons/Component.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Component_image.asset.taml b/Templates/BaseGame/game/tools/classIcons/Component_image.asset.taml new file mode 100644 index 000000000..0540b4d7c --- /dev/null +++ b/Templates/BaseGame/game/tools/classIcons/Component_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/classIcons/ConvexShape.png b/Templates/BaseGame/game/tools/classIcons/ConvexShape.png index bc9c749d4..0e76188f6 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ConvexShape.png and b/Templates/BaseGame/game/tools/classIcons/ConvexShape.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/CreatorTree.png b/Templates/BaseGame/game/tools/classIcons/CreatorTree.png index f916c304e..d034e736a 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/CreatorTree.png and b/Templates/BaseGame/game/tools/classIcons/CreatorTree.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/DecalRoad.png b/Templates/BaseGame/game/tools/classIcons/DecalRoad.png index cbe8aab12..52e7df094 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/DecalRoad.png and b/Templates/BaseGame/game/tools/classIcons/DecalRoad.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Forest.png b/Templates/BaseGame/game/tools/classIcons/Forest.png index 014caf957..8d23dabdf 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Forest.png and b/Templates/BaseGame/game/tools/classIcons/Forest.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/ForestBrush.png b/Templates/BaseGame/game/tools/classIcons/ForestBrush.png index af9ab2520..cc140e488 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ForestBrush.png and b/Templates/BaseGame/game/tools/classIcons/ForestBrush.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/ForestBrushElement.png b/Templates/BaseGame/game/tools/classIcons/ForestBrushElement.png index 0fc969d30..9bf7b80a9 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ForestBrushElement.png and b/Templates/BaseGame/game/tools/classIcons/ForestBrushElement.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GameTSCtrl.png b/Templates/BaseGame/game/tools/classIcons/GameTSCtrl.png index f1801ffe0..b5c0d3146 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GameTSCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GameTSCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GroundCover.png b/Templates/BaseGame/game/tools/classIcons/GroundCover.png index 6d3ebecd3..c3f0dfd16 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GroundCover.png and b/Templates/BaseGame/game/tools/classIcons/GroundCover.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GroundPlane.png b/Templates/BaseGame/game/tools/classIcons/GroundPlane.png index 96815a58f..91b3cd404 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GroundPlane.png and b/Templates/BaseGame/game/tools/classIcons/GroundPlane.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiAutoScrollCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiAutoScrollCtrl.png index b8219f575..23bc336ac 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiAutoScrollCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiAutoScrollCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiBitmapBorderCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiBitmapBorderCtrl.png index b6d8e52ac..bca2c1a67 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiBitmapBorderCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiBitmapBorderCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonCtrl.png index 76cb12598..7eeb12e73 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonTextCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonTextCtrl.png index eeee4adcf..22ab2fcb3 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonTextCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiBitmapButtonTextCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiBitmapCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiBitmapCtrl.png index 6f511189f..0371eac6f 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiBitmapCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiBitmapCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiBorderButtonCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiBorderButtonCtrl.png index 25044777f..31132e5e0 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiBorderButtonCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiBorderButtonCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiButtonCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiButtonCtrl.png index cc15e745f..c7d015b89 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiButtonCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiButtonCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiCheckBoxCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiCheckBoxCtrl.png index 8e608ba2d..93a68ffec 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiCheckBoxCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiCheckBoxCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiColorPickerCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiColorPickerCtrl.png index cd9c6ca32..eb14b45a4 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiColorPickerCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiColorPickerCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiContainer.png b/Templates/BaseGame/game/tools/classIcons/GuiContainer.png index e4838a4b4..f42744fb9 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiContainer.png and b/Templates/BaseGame/game/tools/classIcons/GuiContainer.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiControl.png b/Templates/BaseGame/game/tools/classIcons/GuiControl.png index 633934138..db8ce8a4d 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiControl.png and b/Templates/BaseGame/game/tools/classIcons/GuiControl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiControlArrayControl.png b/Templates/BaseGame/game/tools/classIcons/GuiControlArrayControl.png index f7340fae4..f29f2ec2b 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiControlArrayControl.png and b/Templates/BaseGame/game/tools/classIcons/GuiControlArrayControl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiCrossHairHud.png b/Templates/BaseGame/game/tools/classIcons/GuiCrossHairHud.png index 65b06404a..14fd8e4b0 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiCrossHairHud.png and b/Templates/BaseGame/game/tools/classIcons/GuiCrossHairHud.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiDecoyCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiDecoyCtrl.png index a092c1ee2..d0d30c030 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiDecoyCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiDecoyCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiDragAndDropControl.png b/Templates/BaseGame/game/tools/classIcons/GuiDragAndDropControl.png index d55dd70f7..875bc6204 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiDragAndDropControl.png and b/Templates/BaseGame/game/tools/classIcons/GuiDragAndDropControl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiDynamicCtrlArrayControl.png b/Templates/BaseGame/game/tools/classIcons/GuiDynamicCtrlArrayControl.png index a356634e8..bcb1fd3f6 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiDynamicCtrlArrayControl.png and b/Templates/BaseGame/game/tools/classIcons/GuiDynamicCtrlArrayControl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiFadeinBitmapCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiFadeinBitmapCtrl.png index 60463c219..994d00e55 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiFadeinBitmapCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiFadeinBitmapCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiFileTreeCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiFileTreeCtrl.png index f916c304e..1c9185b61 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiFileTreeCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiFileTreeCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiFilterCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiFilterCtrl.png index b0ddc8a78..3b4ca18cb 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiFilterCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiFilterCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiFormCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiFormCtrl.png index 6717fa7ac..acc8df9ca 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiFormCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiFormCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiFrameSetCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiFrameSetCtrl.png index 633934138..ea56e75d6 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiFrameSetCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiFrameSetCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiGradientSwatchCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiGradientSwatchCtrl.png index 0b7d7c58b..1fb2c35d9 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiGradientSwatchCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiGradientSwatchCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiGraphCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiGraphCtrl.png index 18dfdd8d5..5fdce0b08 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiGraphCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiGraphCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiHealthBarHud.png b/Templates/BaseGame/game/tools/classIcons/GuiHealthBarHud.png index f661a431a..11f3e0064 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiHealthBarHud.png and b/Templates/BaseGame/game/tools/classIcons/GuiHealthBarHud.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiIconButtonCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiIconButtonCtrl.png index 752de83a4..10d331a1a 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiIconButtonCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiIconButtonCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiListBoxCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiListBoxCtrl.png index d6e5e064d..a75bdfca0 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiListBoxCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiListBoxCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiMLTextCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiMLTextCtrl.png index acb4ea577..7f0a7aaf0 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiMLTextCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiMLTextCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiMLTextEditCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiMLTextEditCtrl.png index 0e1dea166..faebe160d 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiMLTextEditCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiMLTextEditCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiMenuBar.png b/Templates/BaseGame/game/tools/classIcons/GuiMenuBar.png index ef40a9834..6bc8322ad 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiMenuBar.png and b/Templates/BaseGame/game/tools/classIcons/GuiMenuBar.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiObjectView.png b/Templates/BaseGame/game/tools/classIcons/GuiObjectView.png index e6b832c9a..d115f1617 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiObjectView.png and b/Templates/BaseGame/game/tools/classIcons/GuiObjectView.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiPanel.png b/Templates/BaseGame/game/tools/classIcons/GuiPanel.png index ea571796b..b6d49a9f3 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiPanel.png and b/Templates/BaseGame/game/tools/classIcons/GuiPanel.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrl.png index c5ef727a2..9390bb217 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrlEx.png b/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrlEx.png index 18a4aaf59..735b11f8a 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrlEx.png and b/Templates/BaseGame/game/tools/classIcons/GuiPopUpMenuCtrlEx.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiProgressBitmapCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiProgressBitmapCtrl.png index a6be7a2ed..17e47f881 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiProgressBitmapCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiProgressBitmapCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiProgressCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiProgressCtrl.png index 5c07e2345..35e9361c3 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiProgressCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiProgressCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiRadioCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiRadioCtrl.png index 062f90af2..dfd358bc6 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiRadioCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiRadioCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiRectHandles.png b/Templates/BaseGame/game/tools/classIcons/GuiRectHandles.png index 11e5a06a9..3819097ef 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiRectHandles.png and b/Templates/BaseGame/game/tools/classIcons/GuiRectHandles.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiRolloutCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiRolloutCtrl.png index ed922abdb..826e0c814 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiRolloutCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiRolloutCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiScrollCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiScrollCtrl.png index 64e9fe1bc..3e21d74aa 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiScrollCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiScrollCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiSplitContainer.png b/Templates/BaseGame/game/tools/classIcons/GuiSplitContainer.png index 752127aaf..2d37e55fb 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiSplitContainer.png and b/Templates/BaseGame/game/tools/classIcons/GuiSplitContainer.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiStackControl.png b/Templates/BaseGame/game/tools/classIcons/GuiStackControl.png index b8d34ffa3..7fe351266 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiStackControl.png and b/Templates/BaseGame/game/tools/classIcons/GuiStackControl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiSwatchButtonCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiSwatchButtonCtrl.png index 0b7d7c58b..b84e52372 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiSwatchButtonCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiSwatchButtonCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTabBookCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTabBookCtrl.png index 41e09bd65..3ddc53dfe 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTabBookCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTabBookCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTabPageCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTabPageCtrl.png index ac58cc276..b8154fc6f 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTabPageCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTabPageCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTextCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTextCtrl.png index b185f092d..71d525540 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTextCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTextCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTextEditCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTextEditCtrl.png index 114a30e5f..4fc8de9ea 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTextEditCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTextEditCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTextEditSliderCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTextEditSliderCtrl.png index 27844cf39..9163cea05 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTextEditSliderCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTextEditSliderCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTextListCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTextListCtrl.png index 5369870c0..601a41655 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTextListCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTextListCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTheoraCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTheoraCtrl.png index 2cf955565..321246f13 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTheoraCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTheoraCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiTreeViewCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiTreeViewCtrl.png index f916c304e..c7b2e1fbb 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiTreeViewCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiTreeViewCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiWindowCollapseCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiWindowCollapseCtrl.png index 09e99cdd1..94844989f 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiWindowCollapseCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiWindowCollapseCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/GuiWindowCtrl.png b/Templates/BaseGame/game/tools/classIcons/GuiWindowCtrl.png index 09e99cdd1..b97475b43 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/GuiWindowCtrl.png and b/Templates/BaseGame/game/tools/classIcons/GuiWindowCtrl.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Item.png b/Templates/BaseGame/game/tools/classIcons/Item.png index 94c6222dc..1f69add2b 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Item.png and b/Templates/BaseGame/game/tools/classIcons/Item.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/LevelInfo.png b/Templates/BaseGame/game/tools/classIcons/LevelInfo.png index d7d757686..2f359bddd 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/LevelInfo.png and b/Templates/BaseGame/game/tools/classIcons/LevelInfo.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Lightning.png b/Templates/BaseGame/game/tools/classIcons/Lightning.png index baedee38d..13bccba2e 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Lightning.png and b/Templates/BaseGame/game/tools/classIcons/Lightning.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Marker.png b/Templates/BaseGame/game/tools/classIcons/Marker.png index a93b82252..d647d8b5d 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Marker.png and b/Templates/BaseGame/game/tools/classIcons/Marker.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/MeshRoad.png b/Templates/BaseGame/game/tools/classIcons/MeshRoad.png index 8f33e23f4..3a1e6b841 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/MeshRoad.png and b/Templates/BaseGame/game/tools/classIcons/MeshRoad.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/MissionArea.png b/Templates/BaseGame/game/tools/classIcons/MissionArea.png index 91bb1e219..c6e522e1c 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/MissionArea.png and b/Templates/BaseGame/game/tools/classIcons/MissionArea.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/NavMesh.png b/Templates/BaseGame/game/tools/classIcons/NavMesh.png index 056d3c3ac..828dc54f8 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/NavMesh.png and b/Templates/BaseGame/game/tools/classIcons/NavMesh.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/NavPath.png b/Templates/BaseGame/game/tools/classIcons/NavPath.png index 35b8372ae..30800237f 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/NavPath.png and b/Templates/BaseGame/game/tools/classIcons/NavPath.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/ParticleEmitter.png b/Templates/BaseGame/game/tools/classIcons/ParticleEmitter.png index e5489fc70..c22cbc03b 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ParticleEmitter.png and b/Templates/BaseGame/game/tools/classIcons/ParticleEmitter.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/ParticleEmitterNode.png b/Templates/BaseGame/game/tools/classIcons/ParticleEmitterNode.png index 351e4bd72..f53bd6745 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ParticleEmitterNode.png and b/Templates/BaseGame/game/tools/classIcons/ParticleEmitterNode.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Path.png b/Templates/BaseGame/game/tools/classIcons/Path.png index 945102557..96cb78ba2 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Path.png and b/Templates/BaseGame/game/tools/classIcons/Path.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/PhysicalZone.png b/Templates/BaseGame/game/tools/classIcons/PhysicalZone.png index 023cb7dd0..130a5ff18 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/PhysicalZone.png and b/Templates/BaseGame/game/tools/classIcons/PhysicalZone.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Player.png b/Templates/BaseGame/game/tools/classIcons/Player.png index 480dfce70..c999421db 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Player.png and b/Templates/BaseGame/game/tools/classIcons/Player.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/PointLight.png b/Templates/BaseGame/game/tools/classIcons/PointLight.png index bd47c6187..c452de909 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/PointLight.png and b/Templates/BaseGame/game/tools/classIcons/PointLight.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Portal.png b/Templates/BaseGame/game/tools/classIcons/Portal.png index 0dec3b0a5..f66118613 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Portal.png and b/Templates/BaseGame/game/tools/classIcons/Portal.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Precipitation.png b/Templates/BaseGame/game/tools/classIcons/Precipitation.png index 8e2cc784c..73073e7dd 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Precipitation.png and b/Templates/BaseGame/game/tools/classIcons/Precipitation.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Prefab.png b/Templates/BaseGame/game/tools/classIcons/Prefab.png index 6786bda75..5352df183 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Prefab.png and b/Templates/BaseGame/game/tools/classIcons/Prefab.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/PxCloth.png b/Templates/BaseGame/game/tools/classIcons/PxCloth.png index 5fa4a9ba4..713fb8ee4 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/PxCloth.png and b/Templates/BaseGame/game/tools/classIcons/PxCloth.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/River.png b/Templates/BaseGame/game/tools/classIcons/River.png index 87d6d0d2d..68ec1cf43 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/River.png and b/Templates/BaseGame/game/tools/classIcons/River.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SFXEmitter.png b/Templates/BaseGame/game/tools/classIcons/SFXEmitter.png index 92f165e99..45012b30c 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SFXEmitter.png and b/Templates/BaseGame/game/tools/classIcons/SFXEmitter.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/ScatterSky.png b/Templates/BaseGame/game/tools/classIcons/ScatterSky.png index 52257b0bc..8f0a56731 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/ScatterSky.png and b/Templates/BaseGame/game/tools/classIcons/ScatterSky.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Scene.png b/Templates/BaseGame/game/tools/classIcons/Scene.png index cb6621f2a..4d236a166 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Scene.png and b/Templates/BaseGame/game/tools/classIcons/Scene.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SceneObject.png b/Templates/BaseGame/game/tools/classIcons/SceneObject.png index 59079e3d7..aba5a87cf 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SceneObject.png and b/Templates/BaseGame/game/tools/classIcons/SceneObject.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SimDataBlock.png b/Templates/BaseGame/game/tools/classIcons/SimDataBlock.png index 63655e1cb..799ae2e44 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SimDataBlock.png and b/Templates/BaseGame/game/tools/classIcons/SimDataBlock.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SimObject.png b/Templates/BaseGame/game/tools/classIcons/SimObject.png index 5c143982f..0c3b8045e 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SimObject.png and b/Templates/BaseGame/game/tools/classIcons/SimObject.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SimSet.png b/Templates/BaseGame/game/tools/classIcons/SimSet.png index 571a904d0..5cf776d72 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SimSet.png and b/Templates/BaseGame/game/tools/classIcons/SimSet.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SkyBox.png b/Templates/BaseGame/game/tools/classIcons/SkyBox.png index cfe50f6c4..d30278afa 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SkyBox.png and b/Templates/BaseGame/game/tools/classIcons/SkyBox.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SpawnSphere.png b/Templates/BaseGame/game/tools/classIcons/SpawnSphere.png index df46d9df5..f7d028fbc 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SpawnSphere.png and b/Templates/BaseGame/game/tools/classIcons/SpawnSphere.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/SpotLight.png b/Templates/BaseGame/game/tools/classIcons/SpotLight.png index c63369559..bc065a6d4 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/SpotLight.png and b/Templates/BaseGame/game/tools/classIcons/SpotLight.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Sun.png b/Templates/BaseGame/game/tools/classIcons/Sun.png index 097526cac..c708ac2a5 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Sun.png and b/Templates/BaseGame/game/tools/classIcons/Sun.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/TSForestItemData.png b/Templates/BaseGame/game/tools/classIcons/TSForestItemData.png index 183c7e532..edf63d446 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/TSForestItemData.png and b/Templates/BaseGame/game/tools/classIcons/TSForestItemData.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/TSStatic.png b/Templates/BaseGame/game/tools/classIcons/TSStatic.png index e0b7e7f94..23b37997c 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/TSStatic.png and b/Templates/BaseGame/game/tools/classIcons/TSStatic.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/TerrainBlock.png b/Templates/BaseGame/game/tools/classIcons/TerrainBlock.png index db58bb863..53beb88f6 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/TerrainBlock.png and b/Templates/BaseGame/game/tools/classIcons/TerrainBlock.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/TimeOfDay.png b/Templates/BaseGame/game/tools/classIcons/TimeOfDay.png index e210a22da..ec233d3d2 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/TimeOfDay.png and b/Templates/BaseGame/game/tools/classIcons/TimeOfDay.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Trigger.png b/Templates/BaseGame/game/tools/classIcons/Trigger.png index c9f12040b..466cec3ae 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Trigger.png and b/Templates/BaseGame/game/tools/classIcons/Trigger.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/VolumetricFog.png b/Templates/BaseGame/game/tools/classIcons/VolumetricFog.png index 5dc516cb5..e1166b1af 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/VolumetricFog.png and b/Templates/BaseGame/game/tools/classIcons/VolumetricFog.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/WaterBlock.png b/Templates/BaseGame/game/tools/classIcons/WaterBlock.png index 6b396fff5..31015256d 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/WaterBlock.png and b/Templates/BaseGame/game/tools/classIcons/WaterBlock.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/WaterPlane.png b/Templates/BaseGame/game/tools/classIcons/WaterPlane.png index a2d28f854..47dd03de1 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/WaterPlane.png and b/Templates/BaseGame/game/tools/classIcons/WaterPlane.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/Zone.png b/Templates/BaseGame/game/tools/classIcons/Zone.png index 117e48ad0..7bfa58028 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/Zone.png and b/Templates/BaseGame/game/tools/classIcons/Zone.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/cameraSpawn.png b/Templates/BaseGame/game/tools/classIcons/cameraSpawn.png index 8a060a651..cbf033c23 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/cameraSpawn.png and b/Templates/BaseGame/game/tools/classIcons/cameraSpawn.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/decal.png b/Templates/BaseGame/game/tools/classIcons/decal.png index ba792f986..91606e3d5 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/decal.png and b/Templates/BaseGame/game/tools/classIcons/decal.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/decalNode.png b/Templates/BaseGame/game/tools/classIcons/decalNode.png index f6684f185..502004465 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/decalNode.png and b/Templates/BaseGame/game/tools/classIcons/decalNode.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/default.png b/Templates/BaseGame/game/tools/classIcons/default.png index 0519b5220..2291c8e3c 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/default.png and b/Templates/BaseGame/game/tools/classIcons/default.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/interiorInstance.png b/Templates/BaseGame/game/tools/classIcons/interiorInstance.png index 7c699f858..160daa552 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/interiorInstance.png and b/Templates/BaseGame/game/tools/classIcons/interiorInstance.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/material.png b/Templates/BaseGame/game/tools/classIcons/material.png index c8b2106c2..d611b80b3 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/material.png and b/Templates/BaseGame/game/tools/classIcons/material.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/particleEffecterObject.png b/Templates/BaseGame/game/tools/classIcons/particleEffecterObject.png index 255a5a8a8..7cd2ee9eb 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/particleEffecterObject.png and b/Templates/BaseGame/game/tools/classIcons/particleEffecterObject.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/particleEmitterObject.png b/Templates/BaseGame/game/tools/classIcons/particleEmitterObject.png index e5489fc70..6c1d22e54 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/particleEmitterObject.png and b/Templates/BaseGame/game/tools/classIcons/particleEmitterObject.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/particleSimulation.png b/Templates/BaseGame/game/tools/classIcons/particleSimulation.png index 95bcfef6b..3b833a29c 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/particleSimulation.png and b/Templates/BaseGame/game/tools/classIcons/particleSimulation.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/pathMarker.png b/Templates/BaseGame/game/tools/classIcons/pathMarker.png index a93b82252..e47cdb3fa 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/pathMarker.png and b/Templates/BaseGame/game/tools/classIcons/pathMarker.png differ diff --git a/Templates/BaseGame/game/tools/classIcons/volumeLight.png b/Templates/BaseGame/game/tools/classIcons/volumeLight.png index 114a7f2ab..5fee5bcd0 100644 Binary files a/Templates/BaseGame/game/tools/classIcons/volumeLight.png and b/Templates/BaseGame/game/tools/classIcons/volumeLight.png differ diff --git a/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui b/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui index a0a79e60b..d83f6f0ef 100644 --- a/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui +++ b/Templates/BaseGame/game/tools/componentEditor/gui/superToolTipDlg.ed.gui @@ -17,7 +17,7 @@ $guiContent = new GuiControl(SuperTooltipDlg) { HorizSizing = "right"; VertSizing = "bottom"; position = "216 160"; - Extent = "221 134"; + Extent = "300 134"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -30,7 +30,7 @@ $guiContent = new GuiControl(SuperTooltipDlg) { HorizSizing = "right"; VertSizing = "bottom"; position = "5 5"; - Extent = "210 14"; + Extent = "290 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript b/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript index f7063e764..824261de8 100644 --- a/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/componentEditor/scripts/componentEditor.ed.tscript @@ -80,9 +80,9 @@ function GuiInspectorEntityGroup::createAddComponentList(%this) if(!isObject("componentTooltipTheme")) { %theme = createsupertooltiptheme("componentTooltipTheme"); - %theme.addstyle("headerstyle", ""); - %theme.addstyle("headertwostyle", ""); - %theme.addstyle("basictextstyle", ""); + %theme.addstyle("headerstyle", ""); + %theme.addstyle("headertwostyle", ""); + %theme.addstyle("basictextstyle", ""); %theme.setdefaultstyle("title", "headerstyle"); %theme.setdefaultstyle("paramtitle", "headertwostyle"); %theme.setdefaultstyle("param", "basictextstyle"); diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui index 07ecfc7be..8f74414af 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui @@ -47,10 +47,10 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 167"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 167"; + MinExtent = "300 100"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -70,12 +70,12 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = "ConvexShapes"; + text = ":: Convex Shape Editor"; new GuiContainer(){ profile = "ToolsGuiDefaultProfile"; Position = "5 25"; - Extent = "200 120"; + Extent = "290 120"; Docking = "Client"; Margin = "3 1 3 3 "; HorizSizing = "width"; @@ -90,7 +90,7 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "200 118"; + Extent = "290 118"; MinExtent = "8 8"; canSave = "1"; isDecoy = "0"; @@ -121,7 +121,7 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { HorizSizing = "right"; VertSizing = "bottom"; Position = "1 1"; - Extent = "193 21"; + Extent = "283 21"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript index dbfdade80..3e18ff75d 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript @@ -42,6 +42,23 @@ function ConvexEditorGui::onWake( %this ) ConvexEditorOptionsWindow.activeMaterial = %mat; } + + %fluidWindow = ConvexEditorOptionsWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } } function ConvexEditorGui::onSleep( %this ) @@ -246,3 +263,183 @@ function ESettingsWindow::getConvexEditorSettings(%this) "The default material when creating a convexShape"); SettingsInspector.endGroup(); } + +//----------------------------------------------------------------------------- + +function ConvexEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fluidWindow = ConvexEditorOptionsWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + + %position = Canvas.extent.x - %fluidWindow.extent.x SPC %top; + %extent = %window.extent.x SPC Canvas.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function ConvexEditorOptionsWindow::onMouseDragged(%this) +{ + %parent = ConvexEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function ConvexEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = ConvexEditorOptionsWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function ConvexEditorGui::dockSidePanel() +{ + %parent = ConvexEditorGui; + %fluidWindow = ConvexEditorOptionsWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + ConvexEditorGui_UnDockBtn.Visible = "1"; + ConvexEditorGui_DockBtn.Visible = "0"; + + ConvexEditorGui_showBtn.Visible = "0"; + ConvexEditorGui_hideBtn.Visible = "1"; +} + +function ConvexEditorGui::releaseSidePanel() +{ + %parent = ConvexEditorGui; + %fluidWindow = ConvexEditorOptionsWindow; + + if(%parent.docked == false) + return; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + ConvexEditorGui_UnDockBtn.Visible = "0"; + ConvexEditorGui_DockBtn.Visible = "1"; + + ConvexEditorGui_showBtn.Visible = "0"; + ConvexEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function ConvexEditorGui::hideSidePanel() +{ + %parent = ConvexEditorGui; + %fluidWindow = ConvexEditorOptionsWindow; + + ConvexEditorGui_showBtn.Visible = "1"; + ConvexEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fluidWindow.titleText = %fluidWindow.text; + + %fluidWindow.text = ""; + ConvexEditorOptionsPanel.Visible = "0"; + ConvexEditorUVPanel.Visible = "0"; + ConvexEditorAdvPanel.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function ConvexEditorGui::showSidePanel() +{ + %parent = ConvexEditorGui; + %fluidWindow = ConvexEditorOptionsWindow; + + ConvexEditorGui_showBtn.Visible = "0"; + ConvexEditorGui_hideBtn.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + ConvexEditorOptionsPanel.Visible = "1"; + ConvexEditorUVPanel.Visible = "1"; + ConvexEditorAdvPanel.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui index 91a1357c3..6009482ae 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui @@ -5,7 +5,7 @@ $guiContnt = new GuiControl(ConvexEditorOptions) extent = "800 600"; new GuiWindowCollapseCtrl(ConvexEditorOptionsWindow) { - text = "Properties"; + text = ":: Sketch Tool - Properties"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; @@ -21,10 +21,10 @@ $guiContnt = new GuiControl(ConvexEditorOptions) anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - Position = Canvas.extent.x - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 2; - Extent = "210 550"; - minExtent = "210 298"; + Position = firstWord($pref::Video::mode) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + minExtent = "300 298"; horizSizing = "windowRelative"; vertSizing = "windowRelative"; profile = "ToolsGuiWindowProfile"; @@ -36,10 +36,104 @@ $guiContnt = new GuiControl(ConvexEditorOptions) internalName = "window"; canSave = "1"; canSaveDynamicFields = "1"; - enabled = "1"; - minSize = "50 50"; + enabled = "1"; + minSize = "50 50"; + + // window / panel buttons + new GuiBitmapButtonCtrl(ConvexEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "ConvexEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(ConvexEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "ConvexEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(ConvexEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "ConvexEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(ConvexEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "ConvexEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; - new GuiContainer() { + new GuiContainer(ConvexEditorOptionsPanel) { docking = "Top"; margin = "3 3 3 3"; padding = "0 0 0 0"; @@ -259,7 +353,7 @@ $guiContnt = new GuiControl(ConvexEditorOptions) class = "ConvexEditorDefaultMaterialBtn"; }; }; - new GuiContainer() { + new GuiContainer(ConvexEditorUVPanel) { docking = "Top"; margin = "0 0 3 3"; padding = "0 0 0 0"; @@ -745,8 +839,7 @@ $guiContnt = new GuiControl(ConvexEditorOptions) }; }; }; - - new GuiContainer() { + new GuiContainer(ConvexEditorAdvPanel) { docking = "Top"; margin = "0 0 3 3"; padding = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_d.png b/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_d.png index 2ea137fca..f77493d44 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_d.png and b/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_h.png b/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_h.png index 956fae3d8..e5cb6f604 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_h.png and b/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_n.png b/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_n.png index cdb2a4b6d..c85cca71b 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_n.png and b/Templates/BaseGame/game/tools/convexEditor/images/convex-editor-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_d.png b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_d.png index 8d0ff5114..a7c25cb2e 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_d.png and b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_h.png b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_h.png index c2d84b49d..2c12a1f05 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_h.png and b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_i.png b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_i.png index c8719cc7d..11a6dfc08 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_i.png and b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_n.png b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_n.png index 100952571..bbb7d0893 100644 Binary files a/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_n.png and b/Templates/BaseGame/game/tools/convexEditor/images/split-face-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui index 28f6abd3d..a2596841b 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl() { minSize = "50 50"; closeCommand = "DatablockEditorInspectorWindow.setVisible(false);"; EdgeSnap = "1"; - text = "Datablock"; + text = ":: Datablock Editor - Data"; Margin = "8 8 8 8"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -34,10 +34,10 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(DatablockEditorTreeWindow.extent, 1) - 2; - Extent = "210 373"; - MinExtent = "210 140"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(DatablockEditorTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(DatablockEditorTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 140"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -45,7 +45,7 @@ $guiContent = new GuiControl() { internalName = "DatablockEditorInspectorWindow"; canSaveDynamicFields = "0"; - new GuiContainer() { + new GuiContainer(DatablockEditorInspectorPanel) { Docking = "Client"; Margin = "22 41 3 3"; Padding = "0 0 0 0"; @@ -58,7 +58,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "4 41"; - Extent = "202 287"; + Extent = "340 287"; MinExtent = "64 64"; canSave = "1"; Visible = "1"; @@ -87,7 +87,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "0 0"; - Extent = "202 287"; + Extent = "340 287"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -108,7 +108,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "bottom"; position = "1 1"; - Extent = "190 8"; + Extent = "320 8"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -128,8 +128,8 @@ $guiContent = new GuiControl() { Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - position = "1 328"; - Extent = "205 14"; + position = "8" SPC getWord(DatablockEditorInspectorWindow.extent, 1) - 40; + Extent = "330 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -137,7 +137,7 @@ $guiContent = new GuiControl() { hovertime = "1000"; canSaveDynamicFields = "0"; }; - new GuiTextEditCtrl() { + new GuiTextEditCtrl(DatablockFileField) { historySize = "0"; password = "0"; tabComplete = "0"; @@ -155,11 +155,12 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "bottom"; position = "4 23"; - Extent = "159 18"; + Extent = "280 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Datablock File"; hovertime = "1000"; internalName = "DatablockFile"; canSaveDynamicFields = "0"; @@ -174,7 +175,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "167 23"; + position = "320 23"; Extent = "17 17"; MinExtent = "8 2"; canSave = "1"; @@ -194,7 +195,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "187 23"; + position = "340 23"; Extent = "17 17"; MinExtent = "8 2"; canSave = "1"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui index 8f0d0eaee..493efa38d 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui @@ -1,5 +1,5 @@ //--- OBJECT WRITE BEGIN --- -$guiContent = new GuiControl() { +$guiContent = new GuiControl(DatablockEditorGui) { isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; @@ -23,7 +23,7 @@ $guiContent = new GuiControl() { minSize = "50 50"; closeCommand = "DatablockInspectorTreeWindow.setVisible(false);"; EdgeSnap = "1"; - text = "Datablock Library"; + text = ":: Datablock Editor - Library"; Margin = "8 8 8 8"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -34,10 +34,10 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 324"; - MinExtent = "210 140"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 324"; + MinExtent = "300 140"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -61,7 +61,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "4 25"; - Extent = "202 294"; + Extent = "340 294"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -84,7 +84,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "0 19"; - Extent = "202 276"; + Extent = "320 276"; MinExtent = "8 2"; canSave = "1"; Visible = "0"; @@ -94,7 +94,7 @@ $guiContent = new GuiControl() { new GuiTextEditCtrl( DatablockEditorTreeFilter ) { position = "2 4"; - extent = "180 18"; + extent = "300 18"; profile = "ToolsGuiTextEditProfile"; horizSizing = "width"; vertSizing = "bottom"; @@ -111,7 +111,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "185 5"; + position = "320 5"; Extent = "17 17"; MinExtent = "8 2"; canSave = "1"; @@ -143,7 +143,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "0 25"; - Extent = "202 251"; + Extent = "320 251"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -171,7 +171,7 @@ $guiContent = new GuiControl() { HorizSizing = "right"; VertSizing = "bottom"; position = "1 1"; - Extent = "198 21"; + Extent = "318 21"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -195,7 +195,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "0 19"; - Extent = "202 276"; + Extent = "340 276"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -224,7 +224,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "0 0"; - Extent = "202 276"; + Extent = "320 276"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -252,7 +252,7 @@ $guiContent = new GuiControl() { HorizSizing = "right"; VertSizing = "bottom"; position = "1 1"; - Extent = "196 260"; + Extent = "318 260"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -273,7 +273,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "190 26"; + position = "336 26"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -294,7 +294,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "192 25"; + position = "336 25"; Extent = "17 17"; MinExtent = "8 2"; canSave = "1"; @@ -306,6 +306,99 @@ $guiContent = new GuiControl() { internalName = "CreateSelection"; canSaveDynamicFields = "0"; }; + // window / panel buttons + new GuiBitmapButtonCtrl(DatablockEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "DatablockEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(DatablockEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "DatablockEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(DatablockEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "DatablockEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(DatablockEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "DatablockEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript index 012bb2256..2fa9cc30a 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript +++ b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript @@ -63,6 +63,9 @@ function DatablockEditorPlugin::onActivated( %this ) DatablockEditorInspectorWindow.setVisible( true ); DatablockEditorInspectorWindow.makeFirstResponder( true ); + // Maximize the windows when set + DatablockEditorGui.onWake(); + %this.map.push(); // Set the status bar here until all tool have been hooked up @@ -760,6 +763,270 @@ function DatablockEditorPlugin::canBeClientSideDatablock( %className ) } } +//------------------------------------------------------------------------------ +// GUI +//------------------------------------------------------------------------------ + +//----------------------------------------------------------------------------- + +function DatablockEditorGui::onWake(%this) +{ + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function DatablockEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = DatablockEditorTreeWindow; + %fluidWindow = DatablockEditorInspectorWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function DatablockEditorTreeWindow::onMouseDragged(%this) +{ + %parent = DatablockEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function DatablockEditorInspectorWindow::onMouseDragged(%this) +{ + %parent = DatablockEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function DatablockEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = DatablockEditorInspectorWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function DatablockEditorGui::dockSidePanel() +{ + %parent = DatablockEditorGui; + %fixedWindow = DatablockEditorTreeWindow; + %fluidWindow = DatablockEditorInspectorWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + DatablockEditorGui_UnDockBtn.Visible = "1"; + DatablockEditorGui_DockBtn.Visible = "0"; + + DatablockEditorGui_showBtn.Visible = "0"; + DatablockEditorGui_hideBtn.Visible = "1"; +} + +function DatablockEditorGui::releaseSidePanel() +{ + %parent = DatablockEditorGui; + %fixedWindow = DatablockEditorTreeWindow; + %fluidWindow = DatablockEditorInspectorWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + DatablockEditorGui_UnDockBtn.Visible = "0"; + DatablockEditorGui_DockBtn.Visible = "1"; + + DatablockEditorGui_showBtn.Visible = "0"; + DatablockEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function DatablockEditorGui::hideSidePanel() +{ + %parent = DatablockEditorGui; + %fixedWindow = DatablockEditorTreeWindow; + %fluidWindow = DatablockEditorInspectorWindow; + + DatablockEditorGui_showBtn.Visible = "1"; + DatablockEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + DatablockEditorTreeTabBook.Visible = "0"; + + %fluidWindow.text = ""; + DatablockEditorInspectorPanel.Visible = "0"; + DatablockFieldInfoControl.Visible = "0"; + DatablockFileField.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function DatablockEditorGui::showSidePanel() +{ + %parent = DatablockEditorGui; + %fixedWindow = DatablockEditorTreeWindow; + %fluidWindow = DatablockEditorInspectorWindow; + + DatablockEditorGui_showBtn.Visible = "0"; + DatablockEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + // hide the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + DatablockEditorTreeTabBook.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + DatablockEditorInspectorPanel.Visible = "1"; + DatablockFieldInfoControl.Visible = "1"; + DatablockFileField.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//------------------------------------------------------------------------------ //============================================================================================= // Events. //============================================================================================= @@ -778,7 +1045,7 @@ function DatablockEditorInspector::onInspectorFieldModified( %this, %object, %fi function DatablockEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - DatablockFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + DatablockFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " @ " : " @ "" @ %fieldDoc ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui index e53a8c7c8..b9df9013b 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/editWatchDlg.ed.gui @@ -57,8 +57,8 @@ $guiContent = new GuiControl(DebuggerEditWatchDlg, EditorGuiGroup) { altCommand = "DbgWatchDialogEdit();"; helpTag = "0"; historySize = "0"; - fontHL = "14 253 Arial"; - font = "14 244 Arial"; + fontHL = "14 253 " @ $Gui::fontTypeRegular @ ""; + font = "14 244 " @ $Gui::fontTypeRegular @ ""; }; new GuiButtonCtrl() { profile = "ToolsGuiButtonProfile"; diff --git a/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui b/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui index a16b9784b..058b4e549 100644 --- a/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui +++ b/Templates/BaseGame/game/tools/debugger/gui/findDlg.ed.gui @@ -57,8 +57,8 @@ $guiContent = new GuiControl(DebuggerFindDlg, EditorGuiGroup) { altCommand = "DbgFileViewFind();"; helpTag = "0"; historySize = "0"; - fontHL = "14 253 Arial"; - font = "14 244 Arial"; + fontHL = "14 253 " @ $Gui::fontTypeRegular @ ""; + font = "14 244 " @ $Gui::fontTypeRegular @ ""; }; new GuiButtonCtrl() { profile = "ToolsGuiButtonProfile"; diff --git a/Templates/BaseGame/game/tools/decalEditor/add-decal_d.png b/Templates/BaseGame/game/tools/decalEditor/add-decal_d.png index 5e45b78ce..0a4da56d0 100644 Binary files a/Templates/BaseGame/game/tools/decalEditor/add-decal_d.png and b/Templates/BaseGame/game/tools/decalEditor/add-decal_d.png differ diff --git a/Templates/BaseGame/game/tools/decalEditor/add-decal_h.png b/Templates/BaseGame/game/tools/decalEditor/add-decal_h.png index 4fd3f4e28..8aacc7471 100644 Binary files a/Templates/BaseGame/game/tools/decalEditor/add-decal_h.png and b/Templates/BaseGame/game/tools/decalEditor/add-decal_h.png differ diff --git a/Templates/BaseGame/game/tools/decalEditor/add-decal_n.png b/Templates/BaseGame/game/tools/decalEditor/add-decal_n.png index 7aa1ad2c9..937ff5dc2 100644 Binary files a/Templates/BaseGame/game/tools/decalEditor/add-decal_n.png and b/Templates/BaseGame/game/tools/decalEditor/add-decal_n.png differ diff --git a/Templates/BaseGame/game/tools/decalEditor/decal-editor_d.png b/Templates/BaseGame/game/tools/decalEditor/decal-editor_d.png index 78fdcd6c3..bd2201c6d 100644 Binary files a/Templates/BaseGame/game/tools/decalEditor/decal-editor_d.png and b/Templates/BaseGame/game/tools/decalEditor/decal-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/decalEditor/decal-editor_h.png b/Templates/BaseGame/game/tools/decalEditor/decal-editor_h.png index f83cbe4a9..3c7799667 100644 Binary files a/Templates/BaseGame/game/tools/decalEditor/decal-editor_h.png and b/Templates/BaseGame/game/tools/decalEditor/decal-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/decalEditor/decal-editor_n.png b/Templates/BaseGame/game/tools/decalEditor/decal-editor_n.png index b94023007..297227bb4 100644 Binary files a/Templates/BaseGame/game/tools/decalEditor/decal-editor_n.png and b/Templates/BaseGame/game/tools/decalEditor/decal-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui index 78210bb43..5f7af7d80 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui @@ -37,16 +37,19 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { currentDecalID = "175"; Docking = "None"; - new GuiWindowCollapseCtrl(DecalEditorWindow) { + new GuiWindowCollapseCtrl(DecalEditorWindow) { + canCollapse = "0"; + canMove = "0"; canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 SPC getWord(EditorGuiToolbar.extent, 1) -1; - Extent = "210 600"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 300"; + MinExtent = "300 180"; canSave = "1"; isDecoy = "0"; Visible = "1"; @@ -60,14 +63,13 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = "Decal Editor"; + text = ":: Decal Editor"; new GuiTabBookCtrl(DecalEditorTabBook) { canSaveDynamicFields = "0"; @@ -76,7 +78,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; position = "0 0"; - Extent = "202 502"; + Extent = "340 502"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -100,7 +102,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; Docking = "client"; MinExtent = "8 2"; canSave = "1"; @@ -120,7 +122,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; Margin = "0 0 0 0"; Docking = "client"; MinExtent = "0 8"; @@ -131,7 +133,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; MinExtent = "0 -500"; Profile = "ToolsGuiTabBorderProfile"; }; @@ -144,7 +146,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -173,7 +175,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "474 48"; + Extent = "340 48"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -195,7 +197,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; Docking = "client"; MinExtent = "8 2"; canSave = "1"; @@ -215,7 +217,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; Margin = "0 0 0 0"; Docking = "client"; MinExtent = "0 8"; @@ -226,7 +228,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; MinExtent = "0 -500"; Profile = "ToolsGuiTabBorderProfile"; }; @@ -239,7 +241,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "height"; Position = "0 0"; - Extent = "202 483"; + Extent = "340 483"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -269,7 +271,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "right"; VertSizing = "bottom"; Position = "1 1"; - Extent = "200 100"; + Extent = "336 100"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -289,99 +291,202 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { }; }; }; - // Save Button - new GuiBitmapButtonCtrl(SaveDecalsButton) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiDefaultProfile"; + + new GuiContainer(DecalsButtonsGroup){ HorizSizing = "left"; VertSizing = "bottom"; - position = "137 26"; - Extent = "16 16"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; - Command = "DecalPMan.saveDirty(); DecalInspector::removeDirty();"; - hovertime = "1000"; - groupNum = "-1"; - text =""; - tooltip = "Save All"; - buttonType = "PushButton"; - useMouseEvents = "0"; - bitmapAsset = "ToolsModule:save_icon_n_image"; - }; + Position = "240 0"; + Extent = "110 55"; + Docking = "none"; - new GuiBitmapButtonCtrl(RetargetDecalButton) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "left"; - VertSizing = "bottom"; - Position = "157 26"; - Extent = "16 16"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - tooltip = "Retarget missing decals to an existing decal datablock"; - bitmapAsset = "ToolsModule:retarget_btn_n_image"; - buttonType = "PushButton"; - useMouseEvents = "0"; + // Save Button + new GuiBitmapButtonCtrl(SaveDecalsButton) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "37 24"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + Command = "DecalPMan.saveDirty(); DecalInspector::removeDirty();"; + hovertime = "1000"; + groupNum = "-1"; + text =""; + tooltip = "Save All"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:save_icon_n_image"; + }; + + new GuiBitmapButtonCtrl(RetargetDecalButton) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "57 24"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + tooltip = "Retarget missing decals to an existing decal datablock"; + bitmapAsset = "ToolsModule:retarget_btn_n_image"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapButtonCtrl(NewDecalButton) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "76 24"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + tooltip = "Create New Decal Template"; + bitmapAsset = "ToolsModule:new_n_image"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapButtonCtrl(DeleteDecalButton) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "92 24"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + text = ""; + tooltip = "Delete Selected Decal Template"; + bitmapAsset = "ToolsModule:delete_n_image"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + tabSelected = "0"; + }; }; - new GuiBitmapButtonCtrl(NewDecalButton) { + // window / panel buttons + new GuiBitmapButtonCtrl(DecalEditorGui_UnDockBtn) { canSaveDynamicFields = "0"; + internalName = ""; Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - Position = "177 26"; - Extent = "16 16"; - MinExtent = "8 2"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; canSave = "1"; - isDecoy = "0"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - tooltip = "Create New Decal Template"; - bitmapAsset = "ToolsModule:new_n_image"; - buttonType = "PushButton"; - useMouseEvents = "0"; - }; - - new GuiBitmapButtonCtrl(DeleteDecalButton) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "left"; - VertSizing = "bottom"; - Position = "190 26"; - Extent = "16 16"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; + Visible = "0"; + Command = "DecalEditorGui.releaseSidePanel();"; tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; text = ""; - tooltip = "Delete Selected Decal Template"; - bitmapAsset = "ToolsModule:delete_n_image"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - tabSelected = "0"; }; + new GuiBitmapButtonCtrl(DecalEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "DecalEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(DecalEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "DecalEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(DecalEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "DecalEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; - new GuiWindowCollapseCtrl(DecalPreviewWindow) { + canCollapse = "0"; canSaveDynamicFields = "0"; internalName = ""; Enabled = "1"; @@ -389,9 +494,10 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 SPC getWord(EditorGuiToolbar.extent, 1) + getWord(DecalEditorWindow.extent, 1) - 2; - Extent = "210 335"; - MinExtent = "210 335"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(DecalEditorWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(DecalEditorWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 240"; canSave = "1"; Visible = "0"; hovertime = "1000"; @@ -404,14 +510,14 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "152 235"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = "Decal Properties"; + text = ":: Decal Properties"; new GuiScrollCtrl(DecalEditorTemplateProperties){ canSaveDynamicFields = "0"; @@ -421,7 +527,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { VertSizing = "bottom"; HorizSizing = "width"; Position = "4 24"; - Extent = "202 259"; + Extent = "340 259"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -452,7 +558,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; position = "0 0"; - Extent = "189 0"; + Extent = "340 0"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -467,7 +573,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "208 0"; + Extent = "320 0"; Caption = "Decal Instance Preview"; Margin = "0 0 0 -3"; DragSizable = false; @@ -483,7 +589,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; position = "0 0"; - Extent = "208 0"; + Extent = "320 0"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -495,7 +601,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "-1 0"; - Extent = "202 187"; + Extent = "320 258"; Docking = "none"; new GuiBitmapCtrl() { @@ -505,9 +611,9 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { isContainer = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "center"; - VertSizing = "height"; + VertSizing = "bottom"; Position = "0 0"; - Extent = "188 186"; + Extent = "256 256"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -523,9 +629,9 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { isContainer = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "center"; - VertSizing = "height"; + VertSizing = "bottom"; Position = "0 0"; - Extent = "188 186"; + Extent = "257 257"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -545,7 +651,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "202 0"; + Extent = "340 0"; Caption = "Decal Instance Properties"; Margin = "0 0 0 0"; DragSizable = false; @@ -561,7 +667,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; position = "0 0"; - Extent = "208 0"; + Extent = "340 0"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -661,7 +767,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { VertSizing = "bottom"; HorizSizing = "width"; Position = "4 24"; - Extent = "202 259"; + Extent = "340 259"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -692,7 +798,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; position = "0 0"; - Extent = "187 0"; + Extent = "320 0"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -707,7 +813,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "208 0"; + Extent = "320 0"; Caption = "Decal Template Preview"; Margin = "0 0 0 -3"; DragSizable = false; @@ -723,7 +829,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; position = "0 0"; - Extent = "208 0"; + Extent = "320 0"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -735,7 +841,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "-1 0"; - Extent = "202 187"; + Extent = "320 258"; Docking = "none"; new GuiBitmapCtrl() { @@ -745,9 +851,9 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { isContainer = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "center"; - VertSizing = "height"; + VertSizing = "bottom"; Position = "0 0"; - Extent = "188 186"; + Extent = "256 256"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -763,9 +869,9 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { isContainer = "0"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "center"; - VertSizing = "height"; + VertSizing = "bottom"; Position = "0 0"; - Extent = "188 186"; + Extent = "257 257"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -785,7 +891,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "202 0"; + Extent = "340 0"; Caption = "Decal Template Properties"; Margin = "0 0 0 0"; DragSizable = false; @@ -803,7 +909,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { HorizSizing = "width"; VertSizing = "bottom"; Position = "1 1"; - Extent = "200 257"; + Extent = "320 257"; MinExtent = "16 16"; canSave = "1"; isDecoy = "0"; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript index 3257ab7cd..33b0034c4 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript @@ -20,10 +20,264 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -function DecalEditorGui::onWake( %this ) -{ +//----------------------------------------------------------------------------- + +function DecalEditorGui::onWake(%this) +{ + %fixedWindow = DecalEditorWindow; + %fluidWindow = DecalPreviewWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } } +function DecalEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = DecalEditorWindow; + %fluidWindow = DecalPreviewWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function DecalEditorWindow::onMouseDragged(%this) +{ + %parent = DecalEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function DecalPreviewWindow::onMouseDragged(%this) +{ + %parent = DecalEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function DecalEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = DecalPreviewWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function DecalEditorGui::dockSidePanel() +{ + %parent = DecalEditorGui; + %fixedWindow = DecalEditorWindow; + %fluidWindow = DecalPreviewWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + DecalEditorGui_UnDockBtn.Visible = "1"; + DecalEditorGui_DockBtn.Visible = "0"; + + DecalEditorGui_showBtn.Visible = "0"; + DecalEditorGui_hideBtn.Visible = "1"; +} + +function DecalEditorGui::releaseSidePanel() +{ + %parent = DecalEditorGui; + %fixedWindow = DecalEditorWindow; + %fluidWindow = DecalPreviewWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + DecalEditorGui_UnDockBtn.Visible = "0"; + DecalEditorGui_DockBtn.Visible = "1"; + + DecalEditorGui_showBtn.Visible = "0"; + DecalEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function DecalEditorGui::hideSidePanel() +{ + %parent = DecalEditorGui; + %fixedWindow = DecalEditorWindow; + %fluidWindow = DecalPreviewWindow; + + DecalEditorGui_showBtn.Visible = "1"; + DecalEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + DecalEditorTabBook.Visible = "0"; + + %fluidWindow.text = ""; + DecalEditorTemplateProperties.Visible = "0"; + DecalEditorLibraryProperties.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function DecalEditorGui::showSidePanel() +{ + %parent = DecalEditorGui; + %fixedWindow = DecalEditorWindow; + %fluidWindow = DecalPreviewWindow; + + DecalEditorGui_showBtn.Visible = "0"; + DecalEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + DecalEditorTabBook.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + DecalEditorTemplateProperties.Visible = "1"; + DecalEditorLibraryProperties.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- + function DecalEditorGui::onSelectInstance( %this, %decalId, %lookupName ) { if( DecalEditorGui.selDecalInstanceId == %decalId ) @@ -232,7 +486,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx ) { if( %idx == 0) { - DecalPreviewWindow.text = "Template Properties"; + DecalPreviewWindow.text = ":: Decal Editor - Template Properties"; DecalEditorLibraryProperties.setVisible(true); DecalEditorTemplateProperties.setVisible(false); RetargetDecalButton.setVisible( true ); @@ -242,7 +496,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx ) } else { - DecalPreviewWindow.text = "Instance Properties"; + DecalPreviewWindow.text = ":: Decal Editor - Instance Properties"; RetargetDecalButton.setVisible( false ); NewDecalButton.setVisible( false ); SaveDecalsButton.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png index 6e773052a..3d6cc85b2 100644 Binary files a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png and b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png differ diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png index 114ec2ca1..fa353ab5c 100644 Binary files a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png and b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png differ diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header_darker.png b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header_darker.png new file mode 100644 index 000000000..a28f6578d Binary files /dev/null and b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header_darker.png differ diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header_darker_image.asset.taml b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header_darker_image.asset.taml new file mode 100644 index 000000000..a91ab6643 --- /dev/null +++ b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header_darker_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui index e633829e8..51ee7b03d 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui @@ -35,17 +35,18 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { canSaveDynamicFields = "1"; new GuiWindowCollapseCtrl(ForestEditorPalleteWindow) { + canCollapse = "0"; CollapseGroup = "-1"; CollapseGroupNum = "-1"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Forest Editor"; + text = ":: Forest Editor - Pallete"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -56,10 +57,10 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiWindowCollapseProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1)-1; - Extent = "210 252"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 300"; + MinExtent = "300 100"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -284,7 +285,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "170 25"; + position = "310 25"; Extent = "35 17"; MinExtent = "16 16"; canSave = "1"; @@ -303,7 +304,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "0 0"; + position = "1 0"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -323,7 +324,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "19 0"; + position = "21 0"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -347,7 +348,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "151 25"; + position = "291 25"; Extent = "54 17"; MinExtent = "16 16"; canSave = "1"; @@ -373,7 +374,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Visible = "1"; Command = "ForestEditorGui.newBrush();"; tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Add New Brush Group"; + ToolTip = "Add New Brush Group" NL " " NL "Hint: Prepare a brush element before creating a brush group."; hovertime = "1000"; canSaveDynamicFields = "0"; }; @@ -386,13 +387,13 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "19 0"; + position = "20 0"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "ForestEditorGui.newElement();"; - tooltip = "Add New Brush Element"; + tooltip = "Add New Brush Element" NL " " NL "Hint: Prepare a mesh before adding a brush element."; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; @@ -406,31 +407,125 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "38 0"; + position = "40 0"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "ForestEditorGui.deleteBrushOrElement();"; - tooltip = "Delete Selected"; + tooltip = "Delete Selected."; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; canSaveDynamicFields = "0"; }; }; + // window / panel buttons + new GuiBitmapButtonCtrl(ForestEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "ForestEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(ForestEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "ForestEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(ForestEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "ForestEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(ForestEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "ForestEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; new GuiWindowCollapseCtrl(ForestEditorPropertiesWindow) { + canCollapse = "0"; CollapseGroup = "-1"; CollapseGroupNum = "-1"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Forest Editor - Properties"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -441,10 +536,10 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { Profile = "ToolsGuiWindowCollapseProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(ForestEditorPalleteWindow.extent, 1) - 2; - Extent = "210 460"; - MinExtent = "210 50"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(ForestEditorPalleteWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(ForestEditorPalleteWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 50"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -452,7 +547,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { internalName = "PropertiesWindow"; canSaveDynamicFields = "0"; - new GuiScrollCtrl() { + new GuiScrollCtrl(ForestEditorPropertiesScroll) { willFirstRespond = "1"; hScrollBar = "alwaysOff"; vScrollBar = "dynamic"; diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript index 2c2673963..e7a409b40 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript @@ -20,9 +20,265 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- - // ForestEditorGui Script Methods +//----------------------------------------------------------------------------- + +function ForestEditorGui::onWake(%this) +{ + %fixedWindow = ForestEditorPalleteWindow; + %fluidWindow = ForestEditorPropertiesWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function ForestEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = ForestEditorPalleteWindow; + %fluidWindow = ForestEditorPropertiesWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function ForestEditorPalleteWindow::onMouseDragged(%this) +{ + %parent = ForestEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function ForestEditorPropertiesWindow::onMouseDragged(%this) +{ + %parent = ForestEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function ForestEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = ForestEditorPropertiesWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function ForestEditorGui::dockSidePanel() +{ + %parent = ForestEditorGui; + %fixedWindow = ForestEditorPalleteWindow; + %fluidWindow = ForestEditorPropertiesWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + ForestEditorGui_UnDockBtn.Visible = "1"; + ForestEditorGui_DockBtn.Visible = "0"; + + ForestEditorGui_showBtn.Visible = "0"; + ForestEditorGui_hideBtn.Visible = "1"; +} + +function ForestEditorGui::releaseSidePanel() +{ + %parent = ForestEditorGui; + %fixedWindow = ForestEditorPalleteWindow; + %fluidWindow = ForestEditorPropertiesWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + ForestEditorGui_UnDockBtn.Visible = "0"; + ForestEditorGui_DockBtn.Visible = "1"; + + ForestEditorGui_showBtn.Visible = "0"; + ForestEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function ForestEditorGui::hideSidePanel() +{ + %parent = ForestEditorGui; + %fixedWindow = ForestEditorPalleteWindow; + %fluidWindow = ForestEditorPropertiesWindow; + + ForestEditorGui_showBtn.Visible = "1"; + ForestEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + ForestEditTabBook.Visible = "0"; + + %fluidWindow.text = ""; + ForestEditorPropertiesScroll.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function ForestEditorGui::showSidePanel() +{ + %parent = ForestEditorGui; + %fixedWindow = ForestEditorPalleteWindow; + %fluidWindow = ForestEditorPropertiesWindow; + + ForestEditorGui_showBtn.Visible = "0"; + ForestEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + // hide the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + ForestEditTabBook.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + ForestEditorPropertiesScroll.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- + function ForestEditorGui::setActiveTool( %this, %tool ) { if ( %tool == ForestTools->BrushTool ) @@ -526,7 +782,7 @@ function ForestEditorInspector::onInspectorFieldModified( %this, %object, %field function ForestEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - //FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + //FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " @ " : " @ "" @ %fieldDoc ); } function ForestBrushSizeSliderCtrlContainer::onWake(%this) diff --git a/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_d.png b/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_d.png index 24af47fb0..fa4d54bc1 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_h.png b/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_h.png index 66d75bb5b..0a5e9e50b 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_n.png b/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_n.png index ec82f5ac0..f85825a20 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/erase-all-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_d.png b/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_d.png index 8f45d199e..2f75fa833 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_h.png b/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_h.png index 26189746f..c19501ddc 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_n.png b/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_n.png index 05fb6690f..9386fd790 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/erase-element-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_d.png b/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_d.png index 79745e5bd..0a43bd5af 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_h.png b/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_h.png index 5351983f6..e841c6c87 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_n.png b/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_n.png index 3c305350f..6e7512e72 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/forest-editor-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-brush_d.png b/Templates/BaseGame/game/tools/forestEditor/images/new-brush_d.png index df1e11c35..cc7002992 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-brush_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-brush_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-brush_h.png b/Templates/BaseGame/game/tools/forestEditor/images/new-brush_h.png index 57391fe5f..ed1044171 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-brush_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-brush_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-brush_n.png b/Templates/BaseGame/game/tools/forestEditor/images/new-brush_n.png index e5d51f5d0..bdbf707d2 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-brush_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-brush_n.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-element_d.png b/Templates/BaseGame/game/tools/forestEditor/images/new-element_d.png index bac080398..acec76e56 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-element_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-element_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-element_h.png b/Templates/BaseGame/game/tools/forestEditor/images/new-element_h.png index c9ddc03f0..7ef2fb677 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-element_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-element_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-element_n.png b/Templates/BaseGame/game/tools/forestEditor/images/new-element_n.png index 61f42fb9c..5231c2544 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-element_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-element_n.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_d.png b/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_d.png index c21bb3969..4567e5179 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_h.png b/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_h.png index 705a7a836..64755976c 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_n.png b/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_n.png index c4c01754c..cf2723c8b 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/new-mesh_n.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_d.png b/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_d.png index 2d2facc71..2d837aef8 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_d.png and b/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_h.png b/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_h.png index 8a2bda1eb..ceb5d1daa 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_h.png and b/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_n.png b/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_n.png index ad9242ead..c60f9d159 100644 Binary files a/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_n.png and b/Templates/BaseGame/game/tools/forestEditor/images/paint-forest-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui index 93010d0e1..057350304 100644 --- a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui @@ -15,14 +15,14 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { canSaveDynamicFields = "1"; new GuiWindowCollapseCtrl(ESettingsWindow) { - text = "Editor Settings"; + text = ":: Editor Settings"; resizeWidth = "0"; - resizeHeight = "1"; + resizeHeight = "0"; canMove = "1"; canClose = "1"; canMinimize = "0"; canMaximize = "0"; - canCollapse = "1"; + canCollapse = "0"; closeCommand = "ESettingsWindow.hideDialog();"; edgeSnap = "1"; margin = "0 0 0 0"; @@ -31,11 +31,11 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "34 48"; - extent = "958 671"; + position = "160 0"; + extent = "960 640"; minExtent = "319 100"; horizSizing = "right"; - vertSizing = "bottom"; + vertSizing = "center"; profile = "ToolsGuiWindowProfile"; visible = "1"; active = "1"; @@ -60,7 +60,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "0 24"; - extent = "958 647"; + extent = "958 610"; minExtent = "64 64"; horizSizing = "width"; vertSizing = "bottom"; @@ -82,7 +82,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "0 0"; - extent = "180 647"; + extent = "180 610"; minExtent = "16 16"; horizSizing = "right"; vertSizing = "bottom"; @@ -112,7 +112,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "3 3"; - extent = "177 643"; + extent = "177 610"; minExtent = "100 50"; horizSizing = "width"; vertSizing = "height"; @@ -154,7 +154,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "184 0"; - extent = "774 647"; + extent = "774 610"; minExtent = "16 16"; horizSizing = "right"; vertSizing = "bottom"; @@ -181,7 +181,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { changeChildSizeToFit = "1"; changeChildPosition = "1"; position = "0 0"; - extent = "773 643"; + extent = "773 610"; minExtent = "16 16"; horizSizing = "width"; vertSizing = "height"; diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript index c9b589caa..a39dbcf1f 100644 --- a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript @@ -108,7 +108,7 @@ function ESettingsWindow::toggleEditorSettings(%this) ESettingsWindowList.sort(0); %this.mode = "Editor"; - ESettingsWindow.text = "Editor Settings"; + ESettingsWindow.text = ":: Editor Settings"; ESettingsWindowList.setSelectedById( 1 ); } diff --git a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui index 78f96f804..d8ca203c1 100644 --- a/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui +++ b/Templates/BaseGame/game/tools/gui/guiObjectInspector.ed.gui @@ -11,7 +11,7 @@ $guiContent = new GuiWindowCollapseCtrl() { minSize = "50 50"; closeCommand = "$ThisControl.onClose();"; edgeSnap = "1"; - text = "Object Inspector"; + text = ":: Object Inspector"; margin = "0 0 0 0"; padding = "0 0 0 0"; anchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_d.png index 57abbf499..06bdd1cb5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_h.png index f506cda5a..482abacda 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_n.png index 38fcc753d..c69fa9b58 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-bottom_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_d.png index 585cee321..b9ab4d3a6 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_h.png index 88ad2882a..7301d876b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_n.png index a86581d31..bc428f9db 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-left_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_d.png index 7ac9b2eb4..ba927749b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_h.png index 7ae17f933..fcc0f7e1b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_n.png index 4ba926e19..16c08a8d6 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-right_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_d.png index 5380df5c4..8df26b9e2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_h.png index 368fcab20..d390a3480 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_n.png index be9738647..6f9562fcf 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/align-top_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_d.png index a98c192dd..98090b868 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_h.png index c8289f7a0..3e788fc86 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_n.png index 0f768fbc6..f586e00d7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/bring-to-front_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_d.png index fc95fc3e6..aae45e513 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_h.png index b6a4015a3..aafaedb55 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_n.png index 189932ef9..00ec0346d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/centersnap_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_d.png index 204b03d47..cceaf1c1a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_h.png index 886496372..2b295469a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_n.png index 5025483b5..69e7a18ef 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-horizontal_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_d.png index 205af2b98..01b7bdeca 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_h.png index 1dc903759..df2c41f78 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_n.png index fd4de0f1a..9417b4cde 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/distribute-vertical_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_d.png index a368096d8..5f28cc90a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_h.png index ad60be2bf..0eca49a76 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_n.png index b39ed929b..e89a8e802 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/edgesnap_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_d.png index 0aaa49872..bdf03944c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_h.png index aeb7e4b5e..b459b998a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_n.png index abeaba153..99416d3da 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/gui-library_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_d.png index 554647640..517dd5c1e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_h.png index e02673324..532624a14 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_n.png index 0233a804c..91529861e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/horizontal-center_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_d.png index 4c405c57e..3e161871d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_h.png index d25111b61..435454c05 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_n.png index 70721965f..ebaef0291 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/send-to-back_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_d.png index e97dd429d..a75a7ceb9 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_h.png index fa681e049..f48d15d97 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_n.png index ca97f4e92..13c342776 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/snap-grid_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_d.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_d.png index 9b580ad5b..236e3d04e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_d.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_h.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_h.png index a2d561142..eeab4a87a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_h.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_n.png b/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_n.png index d0f6c45e5..372c62478 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_n.png and b/Templates/BaseGame/game/tools/gui/images/GUI-editor/vertical-center_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/NESW.png b/Templates/BaseGame/game/tools/gui/images/NESW.png index 2f73696c8..ee341b145 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/NESW.png and b/Templates/BaseGame/game/tools/gui/images/NESW.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/NWSE.png b/Templates/BaseGame/game/tools/gui/images/NWSE.png index c952a3e45..ec54afc24 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/NWSE.png and b/Templates/BaseGame/game/tools/gui/images/NWSE.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_d.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_d.png index c8a9417b4..2c98bebc2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_d.png and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_h.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_h.png index fa7c424b7..e98203639 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_h.png and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_i.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_i.png new file mode 100644 index 000000000..70680d5f7 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_n.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_n.png index 47842cd61..00e5afcd8 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_n.png and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_ctrl_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_d.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_d.png index c8a9417b4..f5899df5f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_h.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_h.png index fa7c424b7..5df320687 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_i.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_i.png new file mode 100644 index 000000000..e7264aa0d Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_n.png b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_n.png index 5c22ffe8f..b6967f82f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/add-simgroup-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/arrowbtn_d.png b/Templates/BaseGame/game/tools/gui/images/arrowbtn_d.png index be39b42bd..a80ac32b5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/arrowbtn_d.png and b/Templates/BaseGame/game/tools/gui/images/arrowbtn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/arrowbtn_n.png b/Templates/BaseGame/game/tools/gui/images/arrowbtn_n.png index 0c0fd526d..21d6e5e52 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/arrowbtn_n.png and b/Templates/BaseGame/game/tools/gui/images/arrowbtn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/button.png b/Templates/BaseGame/game/tools/gui/images/button.png index 5a676fe70..949e89fbb 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/button.png and b/Templates/BaseGame/game/tools/gui/images/button.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/buttontab.png b/Templates/BaseGame/game/tools/gui/images/buttontab.png new file mode 100644 index 000000000..ee0cbfb31 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/buttontab.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/buttontab_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/buttontab_image.asset.taml new file mode 100644 index 000000000..371fbdc5d --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/buttontab_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/camera-btn_d.png b/Templates/BaseGame/game/tools/gui/images/camera-btn_d.png index 6029aa915..c5512ee75 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/camera-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/camera-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/camera-btn_h.png b/Templates/BaseGame/game/tools/gui/images/camera-btn_h.png index a088f2213..6f325656a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/camera-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/camera-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/camera-btn_i.png b/Templates/BaseGame/game/tools/gui/images/camera-btn_i.png new file mode 100644 index 000000000..b47087db6 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/camera-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/camera-btn_n.png b/Templates/BaseGame/game/tools/gui/images/camera-btn_n.png index 372a267bb..81d720a06 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/camera-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/camera-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/checkbox-list.png b/Templates/BaseGame/game/tools/gui/images/checkbox-list.png index 04ca2b0dc..64c0477fb 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/checkbox-list.png and b/Templates/BaseGame/game/tools/gui/images/checkbox-list.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/checkbox-list_fliped.png b/Templates/BaseGame/game/tools/gui/images/checkbox-list_fliped.png index 2db4489de..5b3ed2237 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/checkbox-list_fliped.png and b/Templates/BaseGame/game/tools/gui/images/checkbox-list_fliped.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/checkbox.png b/Templates/BaseGame/game/tools/gui/images/checkbox.png index 46e0ac959..b6d40733f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/checkbox.png and b/Templates/BaseGame/game/tools/gui/images/checkbox.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/clear-icon_d.png b/Templates/BaseGame/game/tools/gui/images/clear-icon_d.png index ffca76c89..7bcd1a130 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/clear-icon_d.png and b/Templates/BaseGame/game/tools/gui/images/clear-icon_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/clear-icon_h.png b/Templates/BaseGame/game/tools/gui/images/clear-icon_h.png index e424b7e0e..de0b8ed3f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/clear-icon_h.png and b/Templates/BaseGame/game/tools/gui/images/clear-icon_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/clear-icon_i.png b/Templates/BaseGame/game/tools/gui/images/clear-icon_i.png new file mode 100644 index 000000000..ca52ecb8e Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/clear-icon_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/clear-icon_n.png b/Templates/BaseGame/game/tools/gui/images/clear-icon_n.png index 9a396bb7f..84d9824e2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/clear-icon_n.png and b/Templates/BaseGame/game/tools/gui/images/clear-icon_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_d.png b/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_d.png index 984a63853..6d09e8ab0 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_d.png and b/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_h.png b/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_h.png index 7e3de8387..f2a9da788 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_h.png and b/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_n.png b/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_n.png index b36de3ae0..5e435190e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_n.png and b/Templates/BaseGame/game/tools/gui/images/collapse-toolbar_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/copy-btn_d.png b/Templates/BaseGame/game/tools/gui/images/copy-btn_d.png index 4212ecae0..98e2cba6f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/copy-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/copy-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/copy-btn_h.png b/Templates/BaseGame/game/tools/gui/images/copy-btn_h.png index 3de0ae110..140051d15 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/copy-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/copy-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/copy-btn_i.png b/Templates/BaseGame/game/tools/gui/images/copy-btn_i.png index 528d6bf93..edb8728dc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/copy-btn_i.png and b/Templates/BaseGame/game/tools/gui/images/copy-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/copy-btn_n.png b/Templates/BaseGame/game/tools/gui/images/copy-btn_n.png index b2e88b654..73119fee3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/copy-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/copy-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/crosshair.png b/Templates/BaseGame/game/tools/gui/images/crosshair.png index 06bcf5c6c..07a542206 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/crosshair.png and b/Templates/BaseGame/game/tools/gui/images/crosshair.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/delete_d.png b/Templates/BaseGame/game/tools/gui/images/delete_d.png index 6ffdf6d2e..2d10bcd32 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/delete_d.png and b/Templates/BaseGame/game/tools/gui/images/delete_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/delete_h.png b/Templates/BaseGame/game/tools/gui/images/delete_h.png index 7a1ac2e31..66aeff7b0 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/delete_h.png and b/Templates/BaseGame/game/tools/gui/images/delete_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/delete_i.png b/Templates/BaseGame/game/tools/gui/images/delete_i.png new file mode 100644 index 000000000..cb876ccd9 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/delete_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/delete_n.png b/Templates/BaseGame/game/tools/gui/images/delete_n.png index 5a96d51d6..b7a8a356a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/delete_n.png and b/Templates/BaseGame/game/tools/gui/images/delete_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropDown-tab.png b/Templates/BaseGame/game/tools/gui/images/dropDown-tab.png index d79c6c70e..54ae250cd 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropDown-tab.png and b/Templates/BaseGame/game/tools/gui/images/dropDown-tab.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropDown.png b/Templates/BaseGame/game/tools/gui/images/dropDown.png index fe62131cc..6f9a0f960 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropDown.png and b/Templates/BaseGame/game/tools/gui/images/dropDown.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow.png b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow.png index 8c420ab85..34e6cb727 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow.png and b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_d.png b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_d.png new file mode 100644 index 000000000..ca2953522 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_h.png b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_h.png new file mode 100644 index 000000000..14617083c Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_i.png b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_i.png new file mode 100644 index 000000000..cb43eac06 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_n.png b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_n.png new file mode 100644 index 000000000..34e6cb727 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/dropdown-button-arrow_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropdown-textEdit.png b/Templates/BaseGame/game/tools/gui/images/dropdown-textEdit.png index 3966efbb5..80ff64493 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropdown-textEdit.png and b/Templates/BaseGame/game/tools/gui/images/dropdown-textEdit.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropslider_d.png b/Templates/BaseGame/game/tools/gui/images/dropslider_d.png index 0c65347aa..bafeb9fa3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropslider_d.png and b/Templates/BaseGame/game/tools/gui/images/dropslider_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropslider_h.png b/Templates/BaseGame/game/tools/gui/images/dropslider_h.png index bd2cb89d8..55af6198f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropslider_h.png and b/Templates/BaseGame/game/tools/gui/images/dropslider_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/dropslider_n.png b/Templates/BaseGame/game/tools/gui/images/dropslider_n.png index 6242fb390..f447acac1 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/dropslider_n.png and b/Templates/BaseGame/game/tools/gui/images/dropslider_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/expand-toolbar_d.png b/Templates/BaseGame/game/tools/gui/images/expand-toolbar_d.png index a3415c7d0..edec9def5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/expand-toolbar_d.png and b/Templates/BaseGame/game/tools/gui/images/expand-toolbar_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/expand-toolbar_h.png b/Templates/BaseGame/game/tools/gui/images/expand-toolbar_h.png index c50608264..17ad2abe7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/expand-toolbar_h.png and b/Templates/BaseGame/game/tools/gui/images/expand-toolbar_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/expand-toolbar_n.png b/Templates/BaseGame/game/tools/gui/images/expand-toolbar_n.png index d6c63504e..9a957ba2b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/expand-toolbar_n.png and b/Templates/BaseGame/game/tools/gui/images/expand-toolbar_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folder.png b/Templates/BaseGame/game/tools/gui/images/folder.png index 571a904d0..22305faaf 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/folder.png and b/Templates/BaseGame/game/tools/gui/images/folder.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folderDown.png b/Templates/BaseGame/game/tools/gui/images/folderDown.png index d61103cc7..a8762b9b3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/folderDown.png and b/Templates/BaseGame/game/tools/gui/images/folderDown.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folderUp.png b/Templates/BaseGame/game/tools/gui/images/folderUp.png index 0d2b0ffbe..bc6f5ddf2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/folderUp.png and b/Templates/BaseGame/game/tools/gui/images/folderUp.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folder_d.png b/Templates/BaseGame/game/tools/gui/images/folder_d.png new file mode 100644 index 000000000..9d4c07a76 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/folder_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folder_h.png b/Templates/BaseGame/game/tools/gui/images/folder_h.png new file mode 100644 index 000000000..46f499d95 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/folder_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folder_i.png b/Templates/BaseGame/game/tools/gui/images/folder_i.png new file mode 100644 index 000000000..b88715065 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/folder_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/folder_n.png b/Templates/BaseGame/game/tools/gui/images/folder_n.png new file mode 100644 index 000000000..c57c08b3b Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/folder_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconAccept.png b/Templates/BaseGame/game/tools/gui/images/iconAccept.png index a24d6052d..0c8401241 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconAccept.png and b/Templates/BaseGame/game/tools/gui/images/iconAccept.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconAdd.png b/Templates/BaseGame/game/tools/gui/images/iconAdd.png index 323edb029..2407e73a8 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconAdd.png and b/Templates/BaseGame/game/tools/gui/images/iconAdd.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconCancel.png b/Templates/BaseGame/game/tools/gui/images/iconCancel.png index 744df795a..6e067a30c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconCancel.png and b/Templates/BaseGame/game/tools/gui/images/iconCancel.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconCollada.png b/Templates/BaseGame/game/tools/gui/images/iconCollada.png index 0f4017014..9661f9899 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconCollada.png and b/Templates/BaseGame/game/tools/gui/images/iconCollada.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconDelete.png b/Templates/BaseGame/game/tools/gui/images/iconDelete.png index 3ba9615b4..8f228a48e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconDelete.png and b/Templates/BaseGame/game/tools/gui/images/iconDelete.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconError.png b/Templates/BaseGame/game/tools/gui/images/iconError.png index b0947dd84..bee80b9a6 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconError.png and b/Templates/BaseGame/game/tools/gui/images/iconError.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconIcon.png b/Templates/BaseGame/game/tools/gui/images/iconIcon.png index e5c83d942..124ec3fe7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconIcon.png and b/Templates/BaseGame/game/tools/gui/images/iconIcon.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconInformation.png b/Templates/BaseGame/game/tools/gui/images/iconInformation.png index a7e472232..ccdada61c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconInformation.png and b/Templates/BaseGame/game/tools/gui/images/iconInformation.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconList.png b/Templates/BaseGame/game/tools/gui/images/iconList.png index 39b80d238..c99a455e9 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconList.png and b/Templates/BaseGame/game/tools/gui/images/iconList.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconLocked.png b/Templates/BaseGame/game/tools/gui/images/iconLocked.png index 2e72d2fb2..c33296d14 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconLocked.png and b/Templates/BaseGame/game/tools/gui/images/iconLocked.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconNew.png b/Templates/BaseGame/game/tools/gui/images/iconNew.png index 2446ae662..a539f4cdf 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconNew.png and b/Templates/BaseGame/game/tools/gui/images/iconNew.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconOpen.png b/Templates/BaseGame/game/tools/gui/images/iconOpen.png index 29e80d77a..74b7c54f6 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconOpen.png and b/Templates/BaseGame/game/tools/gui/images/iconOpen.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconRefresh.png b/Templates/BaseGame/game/tools/gui/images/iconRefresh.png index cce137ba5..56f30d47b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconRefresh.png and b/Templates/BaseGame/game/tools/gui/images/iconRefresh.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconSave.png b/Templates/BaseGame/game/tools/gui/images/iconSave.png index 50e70bd70..84f58e699 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconSave.png and b/Templates/BaseGame/game/tools/gui/images/iconSave.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconUnlocked.png b/Templates/BaseGame/game/tools/gui/images/iconUnlocked.png index a471765ff..83336bca9 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconUnlocked.png and b/Templates/BaseGame/game/tools/gui/images/iconUnlocked.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconVisible.png b/Templates/BaseGame/game/tools/gui/images/iconVisible.png index 92c857866..26f58d0ad 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconVisible.png and b/Templates/BaseGame/game/tools/gui/images/iconVisible.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconbutton.png b/Templates/BaseGame/game/tools/gui/images/iconbutton.png index b6f3bb6b7..757c10d29 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconbutton.png and b/Templates/BaseGame/game/tools/gui/images/iconbutton.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconbuttonlarge.png b/Templates/BaseGame/game/tools/gui/images/iconbuttonlarge.png new file mode 100644 index 000000000..9a9e2f66b Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/iconbuttonlarge.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/iconbuttonlarge_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/iconbuttonlarge_image.asset.taml new file mode 100644 index 000000000..209fd244b --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/iconbuttonlarge_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/iconbuttonsmall.png b/Templates/BaseGame/game/tools/gui/images/iconbuttonsmall.png index 25d5ae80b..757c10d29 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/iconbuttonsmall.png and b/Templates/BaseGame/game/tools/gui/images/iconbuttonsmall.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/inactive-overlay.png b/Templates/BaseGame/game/tools/gui/images/inactive-overlay.png index feab83209..c5f1dbc90 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/inactive-overlay.png and b/Templates/BaseGame/game/tools/gui/images/inactive-overlay.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/layers-btn_d.png b/Templates/BaseGame/game/tools/gui/images/layers-btn_d.png index 6694b71eb..b93ea6856 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/layers-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/layers-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/layers-btn_h.png b/Templates/BaseGame/game/tools/gui/images/layers-btn_h.png index ec27d03ce..4ea86f8de 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/layers-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/layers-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/layers-btn_i.png b/Templates/BaseGame/game/tools/gui/images/layers-btn_i.png new file mode 100644 index 000000000..9d546963b Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/layers-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/layers-btn_n.png b/Templates/BaseGame/game/tools/gui/images/layers-btn_n.png index eb0f253ed..a0ec3a9e2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/layers-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/layers-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/leftRight.png b/Templates/BaseGame/game/tools/gui/images/leftRight.png index c29b7a9f8..644d188f4 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/leftRight.png and b/Templates/BaseGame/game/tools/gui/images/leftRight.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/lock_d.png b/Templates/BaseGame/game/tools/gui/images/lock_d.png index b7177a257..3342e8e23 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/lock_d.png and b/Templates/BaseGame/game/tools/gui/images/lock_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/lock_h.png b/Templates/BaseGame/game/tools/gui/images/lock_h.png index b4eac3fcd..55b6524bf 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/lock_h.png and b/Templates/BaseGame/game/tools/gui/images/lock_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/lock_i.png b/Templates/BaseGame/game/tools/gui/images/lock_i.png new file mode 100644 index 000000000..6c7b33000 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/lock_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/lock_n.png b/Templates/BaseGame/game/tools/gui/images/lock_n.png index 8990de6ae..a47198513 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/lock_n.png and b/Templates/BaseGame/game/tools/gui/images/lock_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menuGrid.png b/Templates/BaseGame/game/tools/gui/images/menuGrid.png new file mode 100644 index 000000000..c2b392327 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menuGrid.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menuGrid_d.png b/Templates/BaseGame/game/tools/gui/images/menuGrid_d.png new file mode 100644 index 000000000..b286cb095 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menuGrid_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menuGrid_h.png b/Templates/BaseGame/game/tools/gui/images/menuGrid_h.png new file mode 100644 index 000000000..7bc7ba0e2 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menuGrid_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menuGrid_n.png b/Templates/BaseGame/game/tools/gui/images/menuGrid_n.png new file mode 100644 index 000000000..c2b392327 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menuGrid_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-X_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-X_d.png new file mode 100644 index 000000000..8e3c2dc5b Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-X_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-X_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-X_h.png new file mode 100644 index 000000000..bc5e9eda0 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-X_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-X_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-X_n.png new file mode 100644 index 000000000..28ad95aef Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-X_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_d.png new file mode 100644 index 000000000..6f991d7b2 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_h.png new file mode 100644 index 000000000..ca445db1c Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_n.png new file mode 100644 index 000000000..7b46beb7b Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-Y_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_d.png new file mode 100644 index 000000000..d418b4b21 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_h.png new file mode 100644 index 000000000..732891c59 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_n.png new file mode 100644 index 000000000..29ea69672 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/align-Z_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/arrow_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/arrow_d.png index 783480242..bc9317f2d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/arrow_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/arrow_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/arrow_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/arrow_h.png index 2afa04469..21f31b259 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/arrow_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/arrow_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/arrow_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/arrow_n.png index 9f924edf1..c4f6f002c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/arrow_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/arrow_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_d.png index e063a47cd..e13164687 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_h.png index 898ccfffb..2d2d54285 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_n.png index 3bcbcf525..379ff249a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/bounds-center_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_d.png new file mode 100644 index 000000000..bd46d8928 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_h.png new file mode 100644 index 000000000..033b878c4 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_i.png new file mode 100644 index 000000000..d5e352d16 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_n.png new file mode 100644 index 000000000..4a005f568 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_mesh_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_d.png new file mode 100644 index 000000000..4245e049e Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_h.png new file mode 100644 index 000000000..a7d46e768 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_i.png new file mode 100644 index 000000000..98e8995ea Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_n.png new file mode 100644 index 000000000..93086592d Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/combine_revert_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/console_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/console_d.png new file mode 100644 index 000000000..12908e168 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/console_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/console_d_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/menubar/console_d_image.asset.taml new file mode 100644 index 000000000..2b0b8892d --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/console_d_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/console_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/console_h.png new file mode 100644 index 000000000..17770798f Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/console_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/console_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/menubar/console_h_image.asset.taml new file mode 100644 index 000000000..53cfdc8bc --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/console_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/console_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/console_n.png new file mode 100644 index 000000000..894c805dd Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/console_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/console_n_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/menubar/console_n_image.asset.taml new file mode 100644 index 000000000..b8bd119eb --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/console_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_d.png index 4d1d130b3..7f9180ab2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_h.png index 90709bd63..8f6adeacc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_i.png index 49af5bf83..85e94cb85 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_i.png and b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_n.png index b5c09a25d..15a162c29 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/delete-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/dock_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/dock_d.png new file mode 100644 index 000000000..befa7a189 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/dock_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/dock_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/dock_h.png new file mode 100644 index 000000000..c3443c449 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/dock_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/dock_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/dock_n.png new file mode 100644 index 000000000..dd1eb0d56 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/dock_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_d.png index 8e27bfefd..9e7439558 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_h.png index 2ff2bf46a..211b51ac2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_i.png index 54e78d5c1..d4e6bf7fc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_i.png and b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_n.png index 09a7ddb22..3a0473955 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/explode-prefab_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_d.png new file mode 100644 index 000000000..62c2ab9e0 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_h.png new file mode 100644 index 000000000..0efc38e92 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_i.png new file mode 100644 index 000000000..67af3d25d Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_n.png new file mode 100644 index 000000000..266212c84 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/export_mesh_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_d.png index 75159d266..4e21c7957 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_h.png index a2c39cff4..5a6919d05 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_n.png index 5b159dd02..fc8d4729c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/fit-selection_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-center_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-center_d.png index 284165852..67422dfa2 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-center_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-center_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-center_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-center_h.png index bc725fd9b..99bd4c8ed 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-center_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-center_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-center_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-center_n.png index b8ea86567..e6accfdb6 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-center_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-center_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_d.png index d005211cc..e52c7c409 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_h.png index e0b74fe41..c71b2039d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_n.png index b50616a38..c79450a93 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-icon_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_d.png index 765d60e8c..78bb55972 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_h.png index 6202e4083..03473755e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_n.png index 3bcc5e3d0..e8a8bd700 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-node-lable_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_d.png index 88aa68825..87f410216 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_h.png index 46d471f2d..8c3b64460 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_n.png index 065cb1fc7..7665043b6 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/object-transform_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_d.png index 48b686e75..eeeb04354 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_h.png index 34f5439d1..d09fec68b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_n.png index 0e34db316..b11b7bae0 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/orbit-cam_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_d.png new file mode 100644 index 000000000..4cc08dff9 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_h.png new file mode 100644 index 000000000..8a50de2d8 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_i.png new file mode 100644 index 000000000..59b9a9d16 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_n.png new file mode 100644 index 000000000..4a0cc43da Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/post_effects_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/probe_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/probe_d.png index c3f34af3b..9c7ff6cf3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/probe_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/probe_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/probe_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/probe_h.png index f251ab542..5a1ebb7ce 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/probe_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/probe_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/probe_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/probe_n.png index 5ebbcd14f..537176f27 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/probe_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/probe_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_d.png new file mode 100644 index 000000000..fba6b1e5d Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_h.png new file mode 100644 index 000000000..841ad0702 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_n.png new file mode 100644 index 000000000..57efd0aed Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/reset-transform_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_d.png new file mode 100644 index 000000000..6e7869684 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_h.png new file mode 100644 index 000000000..7a8db2781 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_n.png new file mode 100644 index 000000000..a5a54d78f Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/rotate90_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/rotate_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/rotate_d.png index 597c85dcb..674d58dfc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/rotate_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/rotate_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/rotate_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/rotate_h.png index 8f0535f8f..25c865b6d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/rotate_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/rotate_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/rotate_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/rotate_n.png index 65530d3a9..24c7fde01 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/rotate_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/rotate_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/save_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/save_d.png new file mode 100644 index 000000000..66b8fea82 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/save_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/save_d_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/menubar/save_d_image.asset.taml new file mode 100644 index 000000000..5b1bae891 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/save_d_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/save_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/save_h.png new file mode 100644 index 000000000..0e29a9c02 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/save_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/save_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/menubar/save_h_image.asset.taml new file mode 100644 index 000000000..40eacd1f0 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/save_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/save_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/save_n.png new file mode 100644 index 000000000..d4baeea34 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/save_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/save_n_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/menubar/save_n_image.asset.taml new file mode 100644 index 000000000..5ec95ddef --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/save_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/scale_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/scale_d.png index eae3c8394..3f8b63f92 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/scale_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/scale_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/scale_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/scale_h.png index c43e55ff5..7d1550572 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/scale_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/scale_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/scale_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/scale_n.png index fee27ffe0..6e9e3f0d0 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/scale_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/scale_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_d.png new file mode 100644 index 000000000..d1258a5f8 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_h.png new file mode 100644 index 000000000..67b8ebc7e Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_n.png new file mode 100644 index 000000000..ae64f097c Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/screen-mode_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_d.png index 7c39417de..df5105ca5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_h.png index 4fdd99e3b..db3afea1e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_n.png index 8a322ce89..d6408456c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/select-bounds_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_d.png index 94016aa37..2897c4d5b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_h.png index 4448d3393..49eff7de9 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_i.png b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_i.png index 9f9b1c55b..9f3a2382f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_i.png and b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_n.png index d30c67f4f..2d8d5d24b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/selection-to-prefab_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/settings_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/settings_d.png index cca0f137f..d31feeb7d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/settings_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/settings_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/settings_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/settings_h.png index 7d3fbd0d5..47f549c0e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/settings_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/settings_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/settings_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/settings_n.png index d51df8269..b5cf4808a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/settings_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/settings_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_d.png index e149a7e99..85c393b7b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_h.png index 5a3f34518..014c4453d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_n.png index 618f71d52..557c11b69 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/show-grid_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_d.png index 56d08e5d3..73572a26e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_h.png index 39df58c9d..e33759dda 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_n.png index 4571767ae..2e5337c91 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/show-preview_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_d.png index 8c8e2c69c..b932b8e94 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_n.png index a6f3081fd..b9474c8f7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam-rot_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_d.png index 7b0bb6d3a..368f3d516 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_n.png index 6168a6613..0e69be86b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/smooth-cam_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_d.png index 3da4ee311..73ba13d18 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_h.png index b0f4346a0..5ef4a02d1 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_n.png index 4c6d83529..5a65f8dd5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-bounds_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_d.png index e97dd429d..361cf02e7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_h.png index fa681e049..2c09f4e64 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_n.png index ca97f4e92..736c6531e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-grid_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_d.png index 934fd5013..f01bc44bf 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_h.png index 07f0aea50..665da79e3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_n.png index 22e45dc64..054975e0d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-objects_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_d.png index 13dfc2e1e..44bb75ae3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_h.png index 47cc46b21..a997aa737 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_n.png index 4d8534c5e..ab133f546 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snap-terrain_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_d.png index a879682d1..704562c70 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_h.png index d11d45932..737c971c5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_n.png index caac7467d..df181f0ff 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/snapping-settings_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/translate_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/translate_d.png index 39a3487bd..4a96f45ba 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/translate_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/translate_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/translate_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/translate_h.png index b6e08379f..200b945ac 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/translate_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/translate_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/translate_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/translate_n.png index 17f197247..046f5f33d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/translate_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/translate_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/undock_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/undock_d.png new file mode 100644 index 000000000..de3e4caa6 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/undock_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/undock_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/undock_h.png new file mode 100644 index 000000000..e23dc3b48 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/undock_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/undock_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/undock_n.png new file mode 100644 index 000000000..3868f0eb0 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/menubar/undock_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/undock_n.taml b/Templates/BaseGame/game/tools/gui/images/menubar/undock_n.taml new file mode 100644 index 000000000..86ff0b617 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/menubar/undock_n.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_d.png index 14e658f0c..46912ab23 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_h.png index 0f2fb1f02..445cc649b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_n.png index 25a2d20d8..e7a6494d4 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/visibility-toggle_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_d.png b/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_d.png index bafcde2ba..2a60187a7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_d.png and b/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_h.png b/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_h.png index 2a34b9071..ec19d2371 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_h.png and b/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_n.png b/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_n.png index 0aa45e46c..506a8156f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_n.png and b/Templates/BaseGame/game/tools/gui/images/menubar/world-transform_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/mission_file.png b/Templates/BaseGame/game/tools/gui/images/mission_file.png new file mode 100644 index 000000000..85b289f91 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/mission_file.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/mission_file_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/mission_file_image.asset.taml new file mode 100644 index 000000000..255db089e --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/mission_file_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/move.png b/Templates/BaseGame/game/tools/gui/images/move.png index 70f9cd540..3a25e5912 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/move.png and b/Templates/BaseGame/game/tools/gui/images/move.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_d.png b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_d.png index c8a9417b4..b1bd1d25a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_h.png b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_h.png index fa7c424b7..c25c5a7df 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_i.png b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_i.png new file mode 100644 index 000000000..279e876ed Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_n.png b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_n.png index 68252b834..68dea0891 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/new-folder-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/new-folder-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new_d.png b/Templates/BaseGame/game/tools/gui/images/new_d.png index bdfc9400d..01910a2d4 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/new_d.png and b/Templates/BaseGame/game/tools/gui/images/new_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new_h.png b/Templates/BaseGame/game/tools/gui/images/new_h.png index 1f9b722c1..416971135 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/new_h.png and b/Templates/BaseGame/game/tools/gui/images/new_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new_i.png b/Templates/BaseGame/game/tools/gui/images/new_i.png new file mode 100644 index 000000000..c18a7f82e Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/new_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/new_n.png b/Templates/BaseGame/game/tools/gui/images/new_n.png index 06531327d..e7a2b9e70 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/new_n.png and b/Templates/BaseGame/game/tools/gui/images/new_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/numericslider.png b/Templates/BaseGame/game/tools/gui/images/numericslider.png new file mode 100644 index 000000000..7b915f7d1 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/numericslider.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/open-file_d.png b/Templates/BaseGame/game/tools/gui/images/open-file_d.png index 00b709b86..ccf65e482 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/open-file_d.png and b/Templates/BaseGame/game/tools/gui/images/open-file_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/open-file_h.png b/Templates/BaseGame/game/tools/gui/images/open-file_h.png index daf4b14c9..bea47c95d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/open-file_h.png and b/Templates/BaseGame/game/tools/gui/images/open-file_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/open-file_i.png b/Templates/BaseGame/game/tools/gui/images/open-file_i.png new file mode 100644 index 000000000..6b466bd78 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/open-file_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/open-file_n.png b/Templates/BaseGame/game/tools/gui/images/open-file_n.png index 8e84251c5..eb2c924f4 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/open-file_n.png and b/Templates/BaseGame/game/tools/gui/images/open-file_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_dock_d.png b/Templates/BaseGame/game/tools/gui/images/panel_dock_d.png new file mode 100644 index 000000000..84d1361a5 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_dock_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_dock_d_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_dock_d_image.asset.taml new file mode 100644 index 000000000..5e38cd4e3 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_dock_d_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_dock_h.png b/Templates/BaseGame/game/tools/gui/images/panel_dock_h.png new file mode 100644 index 000000000..e3de8bcdf Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_dock_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_dock_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_dock_h_image.asset.taml new file mode 100644 index 000000000..98897dbde --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_dock_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_dock_n.png b/Templates/BaseGame/game/tools/gui/images/panel_dock_n.png new file mode 100644 index 000000000..f7c2f0778 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_dock_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_dock_n_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_dock_n_image.asset.taml new file mode 100644 index 000000000..9ce70a86e --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_dock_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_hide_d.png b/Templates/BaseGame/game/tools/gui/images/panel_hide_d.png new file mode 100644 index 000000000..72db93430 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_hide_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_hide_d_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_hide_d_image.asset.taml new file mode 100644 index 000000000..96f6809de --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_hide_d_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_hide_h.png b/Templates/BaseGame/game/tools/gui/images/panel_hide_h.png new file mode 100644 index 000000000..e0a6bf8de Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_hide_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_hide_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_hide_h_image.asset.taml new file mode 100644 index 000000000..768ba1d3e --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_hide_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_hide_n.png b/Templates/BaseGame/game/tools/gui/images/panel_hide_n.png new file mode 100644 index 000000000..70fc576a5 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_hide_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_hide_n_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_hide_n_image.asset.taml new file mode 100644 index 000000000..f51aa2e7e --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_hide_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_show_d.png b/Templates/BaseGame/game/tools/gui/images/panel_show_d.png new file mode 100644 index 000000000..206e1c430 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_show_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_show_d_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_show_d_image.asset.taml new file mode 100644 index 000000000..1f75f9d76 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_show_d_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_show_h.png b/Templates/BaseGame/game/tools/gui/images/panel_show_h.png new file mode 100644 index 000000000..ac47ed9a6 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_show_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_show_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_show_h_image.asset.taml new file mode 100644 index 000000000..2647f0e20 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_show_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_show_n.png b/Templates/BaseGame/game/tools/gui/images/panel_show_n.png new file mode 100644 index 000000000..4c1108cae Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_show_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_show_n_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_show_n_image.asset.taml new file mode 100644 index 000000000..68d20ff1c --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_show_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_undock_d.png b/Templates/BaseGame/game/tools/gui/images/panel_undock_d.png new file mode 100644 index 000000000..747a873de Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_undock_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_undock_d_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_undock_d_image.asset.taml new file mode 100644 index 000000000..df36d713d --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_undock_d_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_undock_h.png b/Templates/BaseGame/game/tools/gui/images/panel_undock_h.png new file mode 100644 index 000000000..d0ac8c310 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_undock_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_undock_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_undock_h_image.asset.taml new file mode 100644 index 000000000..145155571 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_undock_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/panel_undock_n.png b/Templates/BaseGame/game/tools/gui/images/panel_undock_n.png new file mode 100644 index 000000000..e169f4543 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/panel_undock_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/panel_undock_n_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/panel_undock_n_image.asset.taml new file mode 100644 index 000000000..f2ffff0c1 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/panel_undock_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton.png b/Templates/BaseGame/game/tools/gui/images/radioButton.png index d5ecc9853..b60a4447f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/radioButton.png and b/Templates/BaseGame/game/tools/gui/images/radioButton.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton_blue.png b/Templates/BaseGame/game/tools/gui/images/radioButton_blue.png new file mode 100644 index 000000000..f75c91138 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/radioButton_blue.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton_blue_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/radioButton_blue_image.asset.taml new file mode 100644 index 000000000..a9548835d --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/radioButton_blue_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton_green.png b/Templates/BaseGame/game/tools/gui/images/radioButton_green.png new file mode 100644 index 000000000..7c25ddbfc Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/radioButton_green.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton_green_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/radioButton_green_image.asset.taml new file mode 100644 index 000000000..347771941 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/radioButton_green_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton_red.png b/Templates/BaseGame/game/tools/gui/images/radioButton_red.png new file mode 100644 index 000000000..89227310f Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/radioButton_red.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/radioButton_red_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/radioButton_red_image.asset.taml new file mode 100644 index 000000000..cd3125543 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/radioButton_red_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/reset-icon_d.png b/Templates/BaseGame/game/tools/gui/images/reset-icon_d.png index 6c9c08a87..feb7ee7cb 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/reset-icon_d.png and b/Templates/BaseGame/game/tools/gui/images/reset-icon_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/reset-icon_h.png b/Templates/BaseGame/game/tools/gui/images/reset-icon_h.png index c0dc85cd6..588e2c385 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/reset-icon_h.png and b/Templates/BaseGame/game/tools/gui/images/reset-icon_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/reset-icon_i.png b/Templates/BaseGame/game/tools/gui/images/reset-icon_i.png new file mode 100644 index 000000000..07c1756d7 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/reset-icon_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/reset-icon_n.png b/Templates/BaseGame/game/tools/gui/images/reset-icon_n.png index f34269670..5d5497a00 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/reset-icon_n.png and b/Templates/BaseGame/game/tools/gui/images/reset-icon_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/retarget-btn_d.png b/Templates/BaseGame/game/tools/gui/images/retarget-btn_d.png index a8854b3f8..8390c9d26 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/retarget-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/retarget-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/retarget-btn_h.png b/Templates/BaseGame/game/tools/gui/images/retarget-btn_h.png index 1cc9a078d..c207c8b4a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/retarget-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/retarget-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/retarget-btn_i.png b/Templates/BaseGame/game/tools/gui/images/retarget-btn_i.png index 60f8b3d4a..420bcc1fc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/retarget-btn_i.png and b/Templates/BaseGame/game/tools/gui/images/retarget-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/retarget-btn_n.png b/Templates/BaseGame/game/tools/gui/images/retarget-btn_n.png index 2a25e1288..31c649ebd 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/retarget-btn_n.png and b/Templates/BaseGame/game/tools/gui/images/retarget-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/rightArrowWhite.png b/Templates/BaseGame/game/tools/gui/images/rightArrowWhite.png index 2c9b2410b..29fa0cfe1 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/rightArrowWhite.png and b/Templates/BaseGame/game/tools/gui/images/rightArrowWhite.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/rl-loadingbar.png b/Templates/BaseGame/game/tools/gui/images/rl-loadingbar.png index 7116eec14..53466a66d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/rl-loadingbar.png and b/Templates/BaseGame/game/tools/gui/images/rl-loadingbar.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-all_d.png b/Templates/BaseGame/game/tools/gui/images/save-all_d.png index c2c272de5..c75a5de13 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-all_d.png and b/Templates/BaseGame/game/tools/gui/images/save-all_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-all_h.png b/Templates/BaseGame/game/tools/gui/images/save-all_h.png index 220cc9313..15edd44c5 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-all_h.png and b/Templates/BaseGame/game/tools/gui/images/save-all_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-all_i.png b/Templates/BaseGame/game/tools/gui/images/save-all_i.png index 1bc06998f..e582ef0ef 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-all_i.png and b/Templates/BaseGame/game/tools/gui/images/save-all_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-all_n.png b/Templates/BaseGame/game/tools/gui/images/save-all_n.png index 36f0d1553..1eb3912fc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-all_n.png and b/Templates/BaseGame/game/tools/gui/images/save-all_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-as_d.png b/Templates/BaseGame/game/tools/gui/images/save-as_d.png index a1905924d..61b2e8166 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-as_d.png and b/Templates/BaseGame/game/tools/gui/images/save-as_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-as_h.png b/Templates/BaseGame/game/tools/gui/images/save-as_h.png index e36c98a3b..e0b6687aa 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-as_h.png and b/Templates/BaseGame/game/tools/gui/images/save-as_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-as_i.png b/Templates/BaseGame/game/tools/gui/images/save-as_i.png index 1f52b6499..e62b7c7fe 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-as_i.png and b/Templates/BaseGame/game/tools/gui/images/save-as_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-as_n.png b/Templates/BaseGame/game/tools/gui/images/save-as_n.png index e60ceaef4..2c1806f31 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-as_n.png and b/Templates/BaseGame/game/tools/gui/images/save-as_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-icon_d.png b/Templates/BaseGame/game/tools/gui/images/save-icon_d.png index bbb28701f..766421e4d 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-icon_d.png and b/Templates/BaseGame/game/tools/gui/images/save-icon_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-icon_h.png b/Templates/BaseGame/game/tools/gui/images/save-icon_h.png index 3803ec01e..19fc00249 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-icon_h.png and b/Templates/BaseGame/game/tools/gui/images/save-icon_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-icon_i.png b/Templates/BaseGame/game/tools/gui/images/save-icon_i.png index 7da2c6fdf..41c3da368 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-icon_i.png and b/Templates/BaseGame/game/tools/gui/images/save-icon_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/save-icon_n.png b/Templates/BaseGame/game/tools/gui/images/save-icon_n.png index 9c6a959a7..56e252537 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/save-icon_n.png and b/Templates/BaseGame/game/tools/gui/images/save-icon_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/scrollBar.png b/Templates/BaseGame/game/tools/gui/images/scrollBar.png index b5d0a95c5..50509d2ab 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/scrollBar.png and b/Templates/BaseGame/game/tools/gui/images/scrollBar.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/selector-button.png b/Templates/BaseGame/game/tools/gui/images/selector-button.png new file mode 100644 index 000000000..1739813d7 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/selector-button.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/separator-h.png b/Templates/BaseGame/game/tools/gui/images/separator-h.png index e9bf98d54..059e8e454 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/separator-h.png and b/Templates/BaseGame/game/tools/gui/images/separator-h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/separator-v.png b/Templates/BaseGame/game/tools/gui/images/separator-v.png index 6a0f87361..923b7c178 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/separator-v.png and b/Templates/BaseGame/game/tools/gui/images/separator-v.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/separator-xt-h.png b/Templates/BaseGame/game/tools/gui/images/separator-xt-h.png new file mode 100644 index 000000000..5884079a6 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/separator-xt-h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/separator-xt-v.png b/Templates/BaseGame/game/tools/gui/images/separator-xt-v.png new file mode 100644 index 000000000..bcf2939da Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/separator-xt-v.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/separator-xt_h_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/separator-xt_h_image.asset.taml new file mode 100644 index 000000000..bea2317a8 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/separator-xt_h_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/separator_xt_v_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/separator_xt_v_image.asset.taml new file mode 100644 index 000000000..f72db36f7 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/separator_xt_v_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/slider-w-box.png b/Templates/BaseGame/game/tools/gui/images/slider-w-box.png index d9ef04961..d11873a8e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/slider-w-box.png and b/Templates/BaseGame/game/tools/gui/images/slider-w-box.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/slider.png b/Templates/BaseGame/game/tools/gui/images/slider.png index 92fee1e9c..410c58388 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/slider.png and b/Templates/BaseGame/game/tools/gui/images/slider.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/console.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/console.png new file mode 100644 index 000000000..a91b4063a Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/console.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/console_image.asset.taml b/Templates/BaseGame/game/tools/gui/images/stencilIcons/console_image.asset.taml new file mode 100644 index 000000000..8b52965f9 --- /dev/null +++ b/Templates/BaseGame/game/tools/gui/images/stencilIcons/console_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/cross.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/cross.png index e21d5ac10..7b12e3f58 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/cross.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/cross.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/filter.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/filter.png index f9e2864a6..6f4ae537a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/filter.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/filter.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/gear.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/gear.png index 095b4ae75..9fd567a27 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/gear.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/gear.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/import.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/import.png index 1a1278fe5..542d5b2f7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/import.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/import.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png index b7aba1dad..debe27bdb 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/larger.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/menuGrid_n.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/menuGrid_n.png index 3e92b499b..453912b4e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/menuGrid_n.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/menuGrid_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/phone.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/phone.png index 3580a6e1b..40fc8a784 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/phone.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/phone.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/plus.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/plus.png index 3f5cf3712..d9d0887cf 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/plus.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/plus.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/previous.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/previous.png index 2720365ec..70570998a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/previous.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/previous.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/return.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/return.png index 139b39afc..f838eb05b 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/return.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/return.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png index de6acb30c..4006bd032 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/smaller.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/warning.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/warning.png index 5869f57f7..ad9df53cc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/warning.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/warning.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/stencilIcons/zoom.png b/Templates/BaseGame/game/tools/gui/images/stencilIcons/zoom.png index 6485b489f..940115e8e 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/stencilIcons/zoom.png and b/Templates/BaseGame/game/tools/gui/images/stencilIcons/zoom.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/tab-border.png b/Templates/BaseGame/game/tools/gui/images/tab-border.png new file mode 100644 index 000000000..965b88dbe Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/tab-border.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/tab.png b/Templates/BaseGame/game/tools/gui/images/tab.png index 3b20d826d..b3ccf3e4f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/tab.png and b/Templates/BaseGame/game/tools/gui/images/tab.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit.png b/Templates/BaseGame/game/tools/gui/images/textEdit.png index 5a65fac3c..6d6962de7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/textEdit.png and b/Templates/BaseGame/game/tools/gui/images/textEdit.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEditFrame.png b/Templates/BaseGame/game/tools/gui/images/textEditFrame.png index 36ae65a66..6d6962de7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/textEditFrame.png and b/Templates/BaseGame/game/tools/gui/images/textEditFrame.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEditSliderBox.png b/Templates/BaseGame/game/tools/gui/images/textEditSliderBox.png index 3ae46714b..6d6962de7 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/textEditSliderBox.png and b/Templates/BaseGame/game/tools/gui/images/textEditSliderBox.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_black.png b/Templates/BaseGame/game/tools/gui/images/textEdit_black.png new file mode 100644 index 000000000..97d46582a Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_black.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_blue.png b/Templates/BaseGame/game/tools/gui/images/textEdit_blue.png new file mode 100644 index 000000000..c09ec17f4 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_blue.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_cyan.png b/Templates/BaseGame/game/tools/gui/images/textEdit_cyan.png new file mode 100644 index 000000000..1406e837f Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_cyan.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_green.png b/Templates/BaseGame/game/tools/gui/images/textEdit_green.png new file mode 100644 index 000000000..65edc755d Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_green.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_magenta.png b/Templates/BaseGame/game/tools/gui/images/textEdit_magenta.png new file mode 100644 index 000000000..a12031469 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_magenta.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_red.png b/Templates/BaseGame/game/tools/gui/images/textEdit_red.png new file mode 100644 index 000000000..643292f15 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_red.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_white.png b/Templates/BaseGame/game/tools/gui/images/textEdit_white.png new file mode 100644 index 000000000..d4fd98990 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_white.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/textEdit_yellow.png b/Templates/BaseGame/game/tools/gui/images/textEdit_yellow.png new file mode 100644 index 000000000..56c6b2764 Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/textEdit_yellow.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/thumbHightlightButton.png b/Templates/BaseGame/game/tools/gui/images/thumbHightlightButton.png index 9d83b75f3..924289e7c 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/thumbHightlightButton.png and b/Templates/BaseGame/game/tools/gui/images/thumbHightlightButton.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/toolbar-window.png b/Templates/BaseGame/game/tools/gui/images/toolbar-window.png index 4c15c893b..680b80f8a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/toolbar-window.png and b/Templates/BaseGame/game/tools/gui/images/toolbar-window.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/transp_grid.png b/Templates/BaseGame/game/tools/gui/images/transp_grid.png index e6b9db4cc..27ddc685f 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/transp_grid.png and b/Templates/BaseGame/game/tools/gui/images/transp_grid.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/treeView.png b/Templates/BaseGame/game/tools/gui/images/treeView.png index ab8bcbb7f..595b373ab 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/treeView.png and b/Templates/BaseGame/game/tools/gui/images/treeView.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/upDown.png b/Templates/BaseGame/game/tools/gui/images/upDown.png index 377217897..40ab31eef 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/upDown.png and b/Templates/BaseGame/game/tools/gui/images/upDown.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_d.png b/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_d.png index ad481414d..580a01c8a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_d.png and b/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_h.png b/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_h.png index 0de6d9ebb..a878e3a37 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_h.png and b/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_i.png b/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_i.png new file mode 100644 index 000000000..57b0a483a Binary files /dev/null and b/Templates/BaseGame/game/tools/gui/images/uv-editor-btn_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/visible_d.png b/Templates/BaseGame/game/tools/gui/images/visible_d.png index 329dc6a58..5794503f3 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/visible_d.png and b/Templates/BaseGame/game/tools/gui/images/visible_d.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/visible_h.png b/Templates/BaseGame/game/tools/gui/images/visible_h.png index 5125d50ef..a0ab2e89a 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/visible_h.png and b/Templates/BaseGame/game/tools/gui/images/visible_h.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/visible_i.png b/Templates/BaseGame/game/tools/gui/images/visible_i.png index eb5e3b267..09b833fdc 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/visible_i.png and b/Templates/BaseGame/game/tools/gui/images/visible_i.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/visible_n.png b/Templates/BaseGame/game/tools/gui/images/visible_n.png index 77d302629..78ae36312 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/visible_n.png and b/Templates/BaseGame/game/tools/gui/images/visible_n.png differ diff --git a/Templates/BaseGame/game/tools/gui/images/window.png b/Templates/BaseGame/game/tools/gui/images/window.png index 0f71a0a19..b769d89cd 100644 Binary files a/Templates/BaseGame/game/tools/gui/images/window.png and b/Templates/BaseGame/game/tools/gui/images/window.png differ diff --git a/Templates/BaseGame/game/tools/gui/postFxEditor.gui b/Templates/BaseGame/game/tools/gui/postFxEditor.gui index d8d6c4d95..c1ac975ae 100644 --- a/Templates/BaseGame/game/tools/gui/postFxEditor.gui +++ b/Templates/BaseGame/game/tools/gui/postFxEditor.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(postFXEditor) { canSaveDynamicFields = "1"; new GuiWindowCtrl(PostFXEditorWindow) { - text = "PostFX Editor - EditorTemplateLevel"; + text = ":: PostFX Editor - EditorTemplateLevel"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript index bd8dc4ad2..770c2ad61 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -27,6 +27,19 @@ function execEditorProfilesCS() $Gui::clipboardFile = expandFilename("./clipboard.gui"); +$Gui::fontTypeRegular = "Arial"; +$Gui::fontTypeLight = "Arial Light"; +$Gui::fontTypeMedium = "Arial Medium"; +$Gui::fontTypeBold = "Arial Bold"; +$Gui::fontTypeItalic = "Arial Italic"; +$Gui::fontTypeMono = "Arial"; + +$GUI::fontSize[12] = 12; +$GUI::fontSize[14] = 14; +$GUI::fontSize[16] = 16; +$GUI::fontSize[18] = 18; +$GUI::fontSize[24] = 24; +$GUI::fontSize[36] = 36; if( !isObject( ToolsGuiDefaultProfile ) ) new GuiControlProfile (ToolsGuiDefaultProfile) @@ -50,8 +63,8 @@ new GuiControlProfile (ToolsGuiDefaultProfile) borderColorNA = EditorSettings.value("Theme/dividerLightColor"); // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontCharset = ANSI; fontColor = EditorSettings.value("Theme/fieldTextColor"); @@ -122,6 +135,12 @@ new GuiControlProfile( ToolsGuiTabBorderProfile ) category = "Tools"; }; +if( !isObject( ToolsGuiDefaultIconBtnProfile ) ) +new GuiControlProfile (ToolsGuiDefaultIconBtnProfile : ToolsGuiDefaultProfile) +{ + fontSize = $GUI::fontSize[16]; +}; + if( !isObject( ToolsGuiToolTipProfile ) ) new GuiControlProfile (ToolsGuiToolTipProfile) { @@ -132,8 +151,8 @@ new GuiControlProfile (ToolsGuiToolTipProfile) borderColor = EditorSettings.value("Theme/tooltipDivColor"); // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[18]; fontColor = EditorSettings.value("Theme/tooltipTextColor"); category = "Tools"; @@ -150,7 +169,7 @@ if( !isObject( ToolsGuiFrameSetProfile ) ) new GuiControlProfile (ToolsGuiFrameSetProfile) { fillColor = EditorSettings.value("Theme/windowBackgroundColor"); - borderColor = "246 245 244"; + borderColor = "64 64 64"; border = 1; opaque = true; border = true; @@ -172,10 +191,27 @@ new GuiControlProfile (ToolsGuiWindowProfile) bevelColorLL = "0 0 0"; text = "untitled"; bitmapAsset = "ToolsModule:window_image"; - textOffset = "10 4"; + textOffset = "10 0"; hasBitmapArray = true; justify = "left"; category = "Tools"; + fontType = $Gui::fontTypeMedium; + fontSize = $GUI::fontSize[18]; +}; + +if( !isObject( ToolsGuiPaneProfile ) ) +new GuiControlProfile (ToolsGuiPaneProfile) +{ + opaque = false; + border = 1; + fillColor = EditorSettings.value("Theme/windowBackgroundColor"); + fillColorHL = EditorSettings.value("Theme/windowBackgroundColor"); + fillColorSEL = EditorSettings.value("Theme/windowBackgroundColor"); + fillColorNA = EditorSettings.value("Theme/windowBackgroundColor"); + borderColor = EditorSettings.value("Theme/windowBackgroundColor"); + category = "Tools"; + fontType = $Gui::fontTypeMedium; + fontSize = $GUI::fontSize[18]; }; if( !isObject( ToolsGuiToolbarWindowProfile ) ) @@ -195,6 +231,8 @@ new GuiControlProfile (ToolsGuiWindowCollapseProfile : ToolsGuiWindowProfile) if( !isObject( ToolsGuiTextProfile ) ) new GuiControlProfile (ToolsGuiTextProfile) { + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; opaque = true; justify = "left"; fontColor = EditorSettings.value("Theme/headerTextColor"); @@ -204,7 +242,7 @@ new GuiControlProfile (ToolsGuiTextProfile) if( !isObject( ToolsGuiTextBoldProfile ) ) new GuiControlProfile (ToolsGuiTextBoldProfile : ToolsGuiTextProfile) { - fontType = "Arial Bold"; + fontType = $Gui::fontTypeBold; }; if( !isObject( ToolsGuiXDimensionText ) ) @@ -231,8 +269,7 @@ if( !isObject( ToolsGuiTextBoldCenterProfile ) ) new GuiControlProfile (ToolsGuiTextBoldCenterProfile : ToolsGuiTextProfile) { fontColor = EditorSettings.value("Theme/headerTextColor"); - fontType = "Arial Bold"; - fontSize = 16; + fontType = $Gui::fontTypeBold; justify = "center"; category = "Tools"; }; @@ -247,8 +284,7 @@ new GuiControlProfile (ToolsGuiTextRightProfile : ToolsGuiTextProfile) if( !isObject( ToolsGuiTextBoldRightProfile ) ) new GuiControlProfile (ToolsGuiTextBoldRightProfile : ToolsGuiTextRightProfile) { - fontType = "Arial Bold"; - fontSize = 16; + fontType = $Gui::fontTypeBold; }; if( !isObject( ToolsGuiTextCenterProfile ) ) @@ -261,6 +297,7 @@ new GuiControlProfile (ToolsGuiTextCenterProfile : ToolsGuiTextProfile) if( !isObject( ToolsGuiInspectorTitleTextProfile ) ) new GuiControlProfile (ToolsGuiInspectorTitleTextProfile) { + fontType = $Gui::fontTypeBold; fontColor = EditorSettings.value("Theme/headerTextColor"); category = "Tools"; }; @@ -268,6 +305,8 @@ new GuiControlProfile (ToolsGuiInspectorTitleTextProfile) if( !isObject( ToolsGuiAutoSizeTextProfile ) ) new GuiControlProfile (ToolsGuiAutoSizeTextProfile) { + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = "215 215 215"; autoSizeWidth = true; autoSizeHeight = true; @@ -277,6 +316,8 @@ new GuiControlProfile (ToolsGuiAutoSizeTextProfile) if( !isObject( ToolsGuiMLTextProfile ) ) new GuiControlProfile( ToolsGuiMLTextProfile ) { + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorSEL = EditorSettings.value("Theme/fieldTextSELColor"); @@ -324,12 +365,13 @@ new GuiControlProfile( ToolsGuiTextEditProfile ) hasBitmapArray = true; border = -2; // fix to display textEdit img //borderWidth = "1"; // fix to display textEdit img - //borderColor = "100 100 100"; - fillColor = EditorSettings.value("Theme/dividerDarkColor"); + borderColor = " 38 38 38 255"; + fillColor = EditorSettings.value("Theme/fieldBGColor"); fillColorHL = "75 75 75 255"; fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); //fontColorSEL = EditorSettings.value("Theme/dividerMidColor"); @@ -370,8 +412,8 @@ new GuiControlProfile( ToolsGuiRLProgressBitmapProfile ) if( !isObject( ToolsGuiProgressTextProfile ) ) new GuiControlProfile( ToolsGuiProgressTextProfile ) { - fontSize = "14"; - fontType = "Arial"; + fontSize = $GUI::fontSize[18]; + fontType = $Gui::fontTypeRegular; fontColor = "215 215 215"; justify = "center"; category = "Tools"; @@ -395,6 +437,61 @@ new GuiControlProfile( ToolsGuiButtonProfile ) canKeyFocus = false; hasBitmapArray = false; category = "Tools"; + fontSize = $GUI::fontSize[16]; + fontType = $Gui::fontTypeRegular; +}; + +if( !isObject( ToolsGuiButtonGreenProfile ) ) +new GuiControlProfile( ToolsGuiButtonGreenProfile : ToolsGuiButtonProfile ) +{ + fillColor = "88 212 88"; + fillColorHL = "128 212 128"; + fontColor = "0 0 0"; + fontColorHL = "22 22 22"; + fontType = $Gui::fontTypeBold; +}; + +if( !isObject( ToolsGuiButtonRedProfile ) ) +new GuiControlProfile( ToolsGuiButtonRedProfile : ToolsGuiButtonProfile ) +{ + fillColor = "194 64 64"; + fillColorHL = "201 101 101"; + fontColor = "220 220 220"; + fontColorHL = "255 255 255"; + fontType = $Gui::fontTypeBold; +}; + +if( !isObject( ToolsGuiButtonHLRedProfile ) ) +new GuiControlProfile( ToolsGuiButtonHLRedProfile : ToolsGuiButtonProfile ) +{ + fillColorHL = "194 64 64"; + fontColorHL = "255 255 255"; +}; + +if( !isObject( ToolsGuiButtonHLYellowProfile ) ) +new GuiControlProfile( ToolsGuiButtonHLYellowProfile : ToolsGuiButtonProfile ) +{ + fillColorHL = "240 192 64"; + fontColorHL = "0 0 0"; +}; + +if( !isObject( ToolsGuiButtonActiveProfile ) ) +new GuiControlProfile( ToolsGuiButtonActiveProfile : ToolsGuiButtonProfile ) +{ + fillColor = "22 22 22"; +}; + +if( !isObject( ToolsGuiButtonLTextProfile ) ) +new GuiControlProfile( ToolsGuiButtonLTextProfile : ToolsGuiButtonProfile ) +{ + fontSize = $GUI::fontSize[18]; + fontType = $Gui::fontTypeBold; +}; + +if( !isObject( ToolsGuiButtonSTextProfile ) ) +new GuiControlProfile( ToolsGuiButtonSTextProfile : ToolsGuiButtonProfile ) +{ + fontSize = $GUI::fontSize[14]; }; if( !isObject( ToolsGuiThumbHighlightButtonProfile ) ) @@ -425,11 +522,24 @@ new GuiControlProfile( ToolsGuiIconButtonSmallProfile : ToolsGuiIconButtonProfil { bitmapAsset = "ToolsModule:iconbuttonsmall_image"; category = "Tools"; + fontSize = $GUI::fontSize[16]; + fontType = $Gui::fontTypeRegular; +}; + +if( !isObject( ToolsGuiIconButtonLargeProfile ) ) +new GuiControlProfile( ToolsGuiIconButtonLargeProfile : ToolsGuiIconButtonProfile ) +{ + bitmapAsset = "ToolsModule:iconbuttonlarge_image"; + category = "Tools"; + fontSize = $GUI::fontSize[18]; + fontType = $Gui::fontTypeMedium; }; if( !isObject( ToolsGuiEditorTabPage ) ) new GuiControlProfile(ToolsGuiEditorTabPage) { + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; opaque = true; border = false; fillColor = EditorSettings.value("Theme/tabsColor"); @@ -444,14 +554,35 @@ new GuiControlProfile(ToolsGuiEditorTabPage) category = "Tools"; }; +if( !isObject( ToolsGuiEditorTabButton ) ) +new GuiControlProfile(ToolsGuiEditorTabButton) +{ + fontType = $Gui::fontTypeMedium; + fontSize = $GUI::fontSize[16]; + opaque = true; + border = false; + fillColor = EditorSettings.value("Theme/tabsColor"); + fontColor = EditorSettings.value("Theme/fieldTextColor"); + fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); + fontColorNA = EditorSettings.value("Theme/fieldTextHLColor"); + borderColor = EditorSettings.value("Theme/dividerDarkColor"); + fixedExtent = false; + justify = "center"; + canKeyFocus = false; + bitmapAsset = "ToolsModule:buttontab_image"; + hasBitmapArray = true; + category = "Tools"; +}; + if( !isObject( ToolsGuiCheckBoxProfile ) ) new GuiControlProfile( ToolsGuiCheckBoxProfile ) { + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; opaque = false; fillColor = EditorSettings.value("Theme/fieldBGColor"); border = false; borderColor = EditorSettings.value("Theme/dividerDarkColor"); - fontSize = 14; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); @@ -462,6 +593,24 @@ new GuiControlProfile( ToolsGuiCheckBoxProfile ) category = "Tools"; }; +if( !isObject( ToolsGuiCheckBoxErrorProfile ) ) +new GuiControlProfile( ToolsGuiCheckBoxErrorProfile : ToolsGuiCheckBoxProfile) +{ + fontColor = "240 64 64"; +}; + +if( !isObject( ToolsGuiCheckBoxWarnProfile ) ) +new GuiControlProfile( ToolsGuiCheckBoxWarnProfile : ToolsGuiCheckBoxProfile) +{ + fontColor = "240 192 64"; +}; + +if( !isObject( ToolsGuiCheckBoxMsgProfile ) ) +new GuiControlProfile( ToolsGuiCheckBoxMsgProfile : ToolsGuiCheckBoxProfile) +{ + fontColor = "240 240 240"; +}; + if( !isObject( ToolsGuiCheckBoxListProfile ) ) new GuiControlProfile( ToolsGuiCheckBoxListProfile : ToolsGuiCheckBoxProfile) { @@ -480,12 +629,14 @@ if( !isObject( ToolsGuiInspectorCheckBoxTitleProfile ) ) new GuiControlProfile( ToolsGuiInspectorCheckBoxTitleProfile : ToolsGuiCheckBoxProfile ){ fontColor = EditorSettings.value("Theme/fieldTextColor"); category = "Tools"; + fontType = $Gui::fontTypeBold; }; if( !isObject( ToolsGuiRadioProfile ) ) new GuiControlProfile( ToolsGuiRadioProfile ) { - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fillColor = EditorSettings.value("Theme/fieldBGColor"); fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); @@ -495,6 +646,51 @@ new GuiControlProfile( ToolsGuiRadioProfile ) category = "Tools"; }; +// Red +if( !isObject( ToolsGuiRadioRedProfile ) ) +new GuiControlProfile( ToolsGuiRadioRedProfile ) +{ + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; + fillColor = EditorSettings.value("Theme/fieldBGColor"); + fontColor = EditorSettings.value("Theme/fieldTextColor"); + fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); + fixedExtent = true; + bitmapAsset = "ToolsModule:radioButton_red_image"; + hasBitmapArray = true; + category = "Tools"; +}; + +// Green +if( !isObject( ToolsGuiRadioGreenProfile ) ) +new GuiControlProfile( ToolsGuiRadioGreenProfile ) +{ + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; + fillColor = EditorSettings.value("Theme/fieldBGColor"); + fontColor = EditorSettings.value("Theme/fieldTextColor"); + fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); + fixedExtent = true; + bitmapAsset = "ToolsModule:radioButton_green_image"; + hasBitmapArray = true; + category = "Tools"; +}; + +// Blue +if( !isObject( ToolsGuiRadioBlueProfile ) ) +new GuiControlProfile( ToolsGuiRadioBlueProfile ) +{ + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; + fillColor = EditorSettings.value("Theme/fieldBGColor"); + fontColor = EditorSettings.value("Theme/fieldTextColor"); + fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); + fixedExtent = true; + bitmapAsset = "ToolsModule:radioButton_blue_image"; + hasBitmapArray = true; + category = "Tools"; +}; + if( !isObject( ToolsGuiScrollProfile ) ) new GuiControlProfile( ToolsGuiScrollProfile ) { @@ -551,6 +747,8 @@ new GuiControlProfile( ToolsGuiPopupMenuItemBorder : ToolsGuiButtonProfile ) if( !isObject( ToolsGuiPopUpMenuDefault ) ) new GuiControlProfile( ToolsGuiPopUpMenuDefault : ToolsGuiDefaultProfile ) { + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; opaque = true; mouseOverSelected = true; textOffset = "3 3"; @@ -577,36 +775,36 @@ new GuiControlProfile( ToolsGuiPopUpMenuDefault : ToolsGuiDefaultProfile ) if( !isObject( ToolsGuiPopUpMenuProfile ) ) new GuiControlProfile( ToolsGuiPopUpMenuProfile : ToolsGuiPopUpMenuDefault ) { - textOffset = "6 4"; - bitmapAsset = "ToolsModule:dropDown_image"; + textOffset = "6 3"; + bitmapAsset = "ToolsModule:dropDown_image"; hasBitmapArray = true; border = 1; profileForChildren = ToolsGuiPopUpMenuDefault; - category = "Tools"; + category = "Tools"; }; if( !isObject( ToolsGuiPopUpMenuTabProfile ) ) new GuiControlProfile( ToolsGuiPopUpMenuTabProfile : ToolsGuiPopUpMenuDefault ) { - bitmapAsset = "ToolsModule:dropDown_tab_image"; - textOffset = "6 4"; + bitmapAsset = "ToolsModule:dropDown_tab_image"; + textOffset = "6 3"; canKeyFocus = true; hasBitmapArray = true; border = 1; profileForChildren = ToolsGuiPopUpMenuDefault; - category = "Tools"; + category = "Tools"; }; if( !isObject( ToolsGuiPopUpMenuEditProfile ) ) new GuiControlProfile( ToolsGuiPopUpMenuEditProfile : ToolsGuiPopUpMenuDefault ) { - textOffset = "6 4"; + textOffset = "6 3"; canKeyFocus = true; - bitmapAsset = "ToolsModule:dropDown_image"; + bitmapAsset = "ToolsModule:dropDown_image"; hasBitmapArray = true; border = 1; profileForChildren = ToolsGuiPopUpMenuDefault; - category = "Tools"; + category = "Tools"; }; if( !isObject( ToolsGuiListBoxProfile ) ) @@ -618,6 +816,9 @@ new GuiControlProfile( ToolsGuiListBoxProfile ) fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[18]; + tab = true; canKeyFocus = true; category = "Tools"; @@ -631,15 +832,15 @@ new GuiControlProfile( ToolsGuiTabBookProfile ) fontColor = EditorSettings.value("Theme/headerTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; justify = "center"; bitmapAsset = "ToolsModule:tab_image"; tabWidth = 65; tabHeight = 25; tabPosition = "Top"; tabRotation = "Horizontal"; - textOffset = "10 0"; + textOffset = "10 1"; tab = true; cankeyfocus = true; category = "Tools"; @@ -655,8 +856,8 @@ new GuiControlProfile( ToolsGuiTabBookNoBitmapProfile : ToolsGuiTabBookProfile ) if( !isObject( ToolsGuiTabPageProfile ) ) new GuiControlProfile( ToolsGuiTabPageProfile : ToolsGuiDefaultProfile ) { - fontType = "Arial"; - fontSize = 10; + fontType = $Gui::fontTypeBold; + fontSize = $GUI::fontSize[16]; justify = "center"; bitmapAsset = "ToolsModule:tab_image"; opaque = false; @@ -680,7 +881,8 @@ new GuiControlProfile( ToolsGuiTreeViewProfile ) fontColorNA = "150 150 150"; borderColor = "34 34 34"; borderColorHL = "34 34 34"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; opaque = false; border = false; category = "Tools"; @@ -691,8 +893,8 @@ new GuiControlProfile( ToolsGuiTreeViewProfile ) if( !isObject( ToolsGuiTextPadProfile ) ) new GuiControlProfile( ToolsGuiTextPadProfile ) { - fontType = ($platform $= "macos") ? "Monaco" : "Lucida Console"; - fontSize = ($platform $= "macos") ? 13 : 12; + fontType = $Gui::fontTypeMono; + fontSize = $GUI::fontSize[16]; tab = true; canKeyFocus = true; @@ -732,8 +934,8 @@ singleton GuiControlProfile( GuiBackFillProfile ) fillColor = "0 94 94"; border = true; borderColor = "255 128 128"; - fontType = "Arial"; - fontSize = 12; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = "215 215 215"; fontColorHL = "50 50 50"; fixedExtent = true; @@ -800,8 +1002,8 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile ) canKeyFocus = true; // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); @@ -823,8 +1025,7 @@ singleton GuiControlProfile( GuiInspectorTextEditRightProfile : GuiInspectorText //Scene Tree GUI Inspector Dropdown menus singleton GuiControlProfile( GuiInspectorGroupProfile ) { - fontType = "Arial"; - fontSize = "14"; + fontType = $Gui::fontTypeRegular; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); @@ -860,8 +1061,8 @@ singleton GuiControlProfile( GuiInspectorFieldProfile) //bevelColorLL = "0 0 0"; // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); @@ -901,8 +1102,8 @@ singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorField canKeyFocus = true; // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; fontColor = EditorSettings.value("Theme/headerTextColor"); fontColorSEL = EditorSettings.value("Theme/fieldTextHLColor"); @@ -930,12 +1131,12 @@ singleton GuiControlProfile( GuiRolloutProfile ) singleton GuiControlProfile( GuiInspectorRolloutProfile0 ) { // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; - fontColor = "32 32 32"; - fontColorHL = "32 100 100"; - fontColorNA = "215 215 215"; + fontColor = "220 220 220"; + fontColorHL = "0 0 0"; + fontColorNA = "160 160 160"; justify = "left"; opaque = false; @@ -951,6 +1152,30 @@ singleton GuiControlProfile( GuiInspectorRolloutProfile0 ) category = "Editor"; }; +singleton GuiControlProfile( GuiInspectorRolloutProfile1 ) +{ + // font + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; + + fontColor = "200 200 200"; + fontColorHL = "0 0 0"; + fontColorNA = "160 160 160"; + + justify = "left"; + opaque = false; + + border = false; + borderColor = "190 190 190"; + borderColorHL = "156 156 156"; + borderColorNA = "255 64 64"; + + bitmapAsset = "ToolsModule:rollout_plusminus_header_darker_image"; + + textOffset = "30 0"; + category = "Editor"; +}; + singleton GuiControlProfile( GuiInspectorStackProfile ) { opaque = false; @@ -1004,8 +1229,8 @@ singleton GuiControlProfile( GuiInspectorTypeFileNameProfile ) canKeyFocus = true; // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; // Center text justify = "center"; @@ -1068,8 +1293,8 @@ singleton GuiControlProfile( GuiDirectoryTreeProfile : ToolsGuiTreeViewProfile ) fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor"); fillColorHL = EditorSettings.value("Theme/fieldBGColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; category = "Editor"; }; @@ -1079,8 +1304,8 @@ singleton GuiControlProfile( GuiDirectoryFileListProfile ) fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor"); fillColorHL = EditorSettings.value("Theme/fieldBGColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = $GUI::fontSize[16]; category = "Editor"; }; @@ -1132,8 +1357,8 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile ) //tab = true; //canKeyFocus = true; - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeBold; + fontSize = $GUI::fontSize[18]; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); @@ -1166,6 +1391,8 @@ singleton GuiControlProfile( ToolsGuiMenuBarProfile ) mouseOverSelected = true; category = "Editor"; bitmapAsset = "ToolsModule:checkbox_menubar_image"; + fontSize = $GUI::fontSize[18]; + fontType = $Gui::fontTypeRegular; }; singleton GuiControlProfile( ToolsMenubarProfile : ToolsGuiDefaultProfile ) @@ -1195,6 +1422,7 @@ singleton GuiControlProfile (menubarProfile) fontColor = EditorSettings.value("Theme/headerTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); borderColor = EditorSettings.value("Theme/dividerDarkColor"); + fontSize = 15; }; singleton GuiControlProfile (editorMenubarProfile) @@ -1284,4 +1512,75 @@ singleton GuiControlProfile (GuiDisabledTextEditProfile) tab = false; canKeyFocus = false; category = "Editor"; -}; \ No newline at end of file +}; +// ----------------------------------------------------------------------------- +if(!isObject(ToolsGuiConsoleProfile)) +new GuiControlProfile(ToolsGuiConsoleProfile) +{ + border = 0; + borderColor = EditorSettings.value("Theme/tabsColor"); + fontType = $Gui::fontTypeMono; + fontSize = $GUI::fontSize[12]; + fillColor = "24 24 24"; + fontColor = "240 240 240"; + fontColorHL = "240 192 64"; + fontColorNA = "240 64 64"; + fontColors[6] = "100 100 100"; + fontColors[7] = "100 100 0"; + fontColors[8] = "0 0 100"; + fontColors[9] = "0 100 0"; + category = "Tools"; +}; +if(!isObject(ToolsGuiConsoleTinyProfile)) +new GuiControlProfile(ToolsGuiConsoleTinyProfile : ToolsGuiConsoleProfile) +{ + fontSize = $GUI::fontSize[9]; +}; +if(!isObject(ToolsGuiConsoleSmallProfile)) +new GuiControlProfile(ToolsGuiConsoleSmallProfile : ToolsGuiConsoleProfile) +{ + fontSize = $GUI::fontSize[10]; +}; +if(!isObject(ToolsGuiConsoleMediumProfile)) +new GuiControlProfile(ToolsGuiConsoleMediumProfile : ToolsGuiConsoleProfile) +{ + fontSize = $GUI::fontSize[14]; +}; +if(!isObject(ToolsGuiConsoleLargeProfile)) +new GuiControlProfile(ToolsGuiConsoleLargeProfile : ToolsGuiConsoleProfile) +{ + fontSize = $GUI::fontSize[16]; +}; +if(!isObject(ToolsGuiConsoleTextProfile)) +new GuiControlProfile(ToolsGuiConsoleTextProfile) +{ + 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 = "Tools"; +}; +if(!isObject(ToolsConsoleScrollProfile)) +new GuiControlProfile(ToolsConsoleScrollProfile : ToolsGuiScrollProfile) +{ + opaque = true; + fillColor = "30 30 30"; + border = 1; + borderThickness = 1; + borderColor = "0 0 0"; + category = "Tools"; +}; +if(!isObject(ToolsConsoleTextEditProfile)) +new GuiControlProfile(ToolsConsoleTextEditProfile : ToolsGuiTextEditProfile) +{ + fontType = $Gui::fontTypeMono; + fontSize = $GUI::fontSize[12]; + cursorColor = "255 255 255"; + category = "Tools"; +}; +// ----------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui b/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui index ed1b0db94..2a358e105 100644 --- a/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui +++ b/Templates/BaseGame/game/tools/gui/simViewDlg.ed.gui @@ -1,142 +1,248 @@ //--- OBJECT WRITE BEGIN --- -$guiContent = new GuiControl(simViewDlg,EditorGuiGroup) { - extent = "1024 768"; - minExtent = "8 8"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - isContainer = "1"; - canSaveDynamicFields = "1"; +$guiContent = new GuiControl(simViewDlg, EditorGuiGroup) { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 0"; + Extent = "800 600"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; new GuiWindowCtrl() { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiWindowProfile"; + HorizSizing = "center"; + VertSizing = "center"; + position = "70 43"; + Extent = "685 489"; + MinExtent = "602 440"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; text = "Torque SimView"; + maxLength = "1024"; + resizeWidth = "1"; + resizeHeight = "1"; + canMove = "1"; + canClose = "1"; + canMinimize = "1"; + canMaximize = "1"; + minSize = "50 50"; closeCommand = "Canvas.popDialog(simViewDlg);"; - position = "169 139"; - extent = "685 489"; - minExtent = "602 440"; - horizSizing = "center"; - vertSizing = "center"; - profile = "ToolsGuiWindowProfile"; - tooltipProfile = "GuiToolTipProfile"; new GuiScrollCtrl() { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiScrollProfile"; + HorizSizing = "width"; + VertSizing = "height"; + position = "10 28"; + Extent = "255 448"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + willFirstRespond = "1"; hScrollBar = "dynamic"; - position = "10 51"; - extent = "255 425"; - minExtent = "8 8"; - horizSizing = "width"; - vertSizing = "height"; - profile = "ToolsGuiScrollProfile"; - tooltipProfile = "GuiToolTipProfile"; + vScrollBar = "alwaysOn"; + lockHorizScroll = "false"; + lockVertScroll = "false"; + constantThumbHeight = "0"; + childMargin = "0 0"; new GuiTreeViewCtrl(InspectTreeView) { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiTreeViewProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "2 2"; + Extent = "212 21"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + tabSize = "16"; + textOffset = "2"; + fullRowSelect = "0"; itemHeight = "21"; - position = "2 25"; - extent = "212 21"; - minExtent = "8 8"; - profile = "ToolsGuiTreeViewProfile"; - tooltipProfile = "GuiToolTipProfile"; + destroyTreeOnSleep = "1"; + MouseDragging = "1"; + MultipleSelections = "1"; + DeleteObjectAllowed = "1"; + DragToItemAllowed = "1"; }; }; new GuiScrollCtrl() { - hScrollBar = "alwaysOff"; - lockHorizScroll = "1"; + canSaveDynamicFields = "0"; + Profile = "ToolsGuiScrollProfile"; + HorizSizing = "left"; + VertSizing = "height"; position = "272 96"; - extent = "404 380"; - minExtent = "8 8"; - horizSizing = "left"; - vertSizing = "height"; - profile = "ToolsGuiScrollProfile"; - tooltipProfile = "GuiToolTipProfile"; + Extent = "404 380"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + willFirstRespond = "1"; + hScrollBar = "alwaysOff"; + vScrollBar = "alwaysOn"; + lockHorizScroll = "true"; + lockVertScroll = "false"; + constantThumbHeight = "0"; + childMargin = "0 0"; new GuiInspector(InspectFields) { - position = "1 1"; - extent = "389 8"; - minExtent = "8 8"; - horizSizing = "width"; - profile = "ToolsGuiTransparentProfile"; - tooltipProfile = "GuiToolTipProfile"; + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "1"; + canSaveDynamicFields = "0"; + Profile = "ToolsGuiTransparentProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "2 2"; + Extent = "382 8"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; }; }; - new GuiTextEditCtrl(SimViewTreeFilter) { - position = "11 27"; - extent = "255 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "GuiToolTipProfile"; - placeholderText = "Filter..."; - }; new GuiControl() { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; position = "272 28"; - extent = "403 61"; - horizSizing = "left"; - profile = "ToolsGuiButtonProfile"; - tooltipProfile = "GuiToolTipProfile"; - isContainer = "1"; + Extent = "403 61"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; new GuiTextEditCtrl(InspectObjectName) { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; position = "121 8"; - extent = "195 18"; - minExtent = "8 8"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "GuiToolTipProfile"; + Extent = "195 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + maxLength = "1024"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; }; new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Profile = "EditorTextHLRight"; + HorizSizing = "right"; + VertSizing = "bottom"; + VertSizing = "bottom"; + Extent = "44 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; text = "Sim ID:"; - position = "217 35"; - extent = "44 18"; - minExtent = "8 8"; - profile = "GuiTextProfile"; - tooltipProfile = "GuiToolTipProfile"; + maxLength = "1024"; }; - new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Profile = "EditorTextHLRight"; + HorizSizing = "right"; + VertSizing = "bottom"; + HorizSizing = "right"; + Extent = "106 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; text = "Internal Name:"; - position = "10 35"; - extent = "106 18"; - minExtent = "8 8"; - profile = "GuiTextProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiTextEditCtrl(InspectObjectInternalName) { - position = "121 35"; - extent = "93 18"; - minExtent = "8 8"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiTextCtrl() { + maxLength = "1024"; + canSaveDynamicFields = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Extent = "93 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + maxLength = "1024"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + canSaveDynamicFields = "0"; + Profile = "EditorTextHLBoldRight"; + HorizSizing = "right"; + VertSizing = "bottom"; + HorizSizing = "right"; + Extent = "106 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; text = "Selected Object:"; - position = "10 8"; - extent = "106 18"; - minExtent = "8 8"; - profile = "GuiTextProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiIconButtonCtrl() { - BitmapAsset = "ToolsModule:iconRefresh_image"; - textLocation = "Right"; + maxLength = "1024"; + canSaveDynamicFields = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Extent = "76 22"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "InspectApply();"; + hovertime = "1000"; text = "Refresh"; - position = "321 33"; - extent = "76 22"; - profile = "ToolsGuiButtonProfile"; - command = "InspectApply();"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiTextCtrl(InspectObjectSimID) { - text = "0"; - position = "265 35"; - extent = "51 18"; - minExtent = "8 8"; - profile = "GuiTextProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiIconButtonCtrl() { - BitmapAsset = "ToolsModule:iconDelete_image"; + groupNum = "-1"; + buttonType = "PushButton"; + bitmapAsset = "ToolsModule:iconRefresh_image"; + sizeIconToButton = "0"; textLocation = "Right"; + textMargin = "4"; + buttonMargin = "4 4"; + canSaveDynamicFields = "0"; + Profile = "EditorTextHLBoldCenter"; + HorizSizing = "right"; + VertSizing = "bottom"; + HorizSizing = "right"; + Extent = "51 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + text = "0"; + maxLength = "1024"; + canSaveDynamicFields = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Extent = "76 22"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "InspectDelete();"; + hovertime = "1000"; text = "Delete"; - position = "321 6"; - extent = "76 22"; - profile = "ToolsGuiButtonProfile"; - command = "InspectDelete();"; - tooltipProfile = "GuiToolTipProfile"; + groupNum = "-1"; + buttonType = "PushButton"; + bitmapAsset = "ToolsModule:iconDelete_image"; + sizeIconToButton = "0"; + textLocation = "Right"; + textMargin = "4"; + buttonMargin = "4 4"; }; }; }; @@ -235,3 +341,4 @@ function SimViewTreeFilter::onReturn(%this) else InspectTreeView.setFilterText( %text ); } + diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui index a71ce2a07..6fb643afe 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui @@ -49,6 +49,28 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSave = "1"; Visible = "1"; hovertime = "1000"; + + new GuiBitmapButtonCtrl(GHLogo) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "8 2"; + Extent = "24 24"; + MinExtent = "24 24"; + canSave = "1"; + Visible = "1"; + Command = ""; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Torque3D"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:menu_logo"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; new GuiStackControl(GuiEditorToolbarStack) { stackingType = "Horizontal"; @@ -60,8 +82,8 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { dynamicPos = "0"; changeChildSizeToFit = "0"; changeChildPosition = "1"; - position = "0 0"; - extent = "885 32"; + position = "36 2"; + extent = "885" SPC getWord(EditorGuiToolbar.extent, 1) -2; minExtent = "16 16"; horizSizing = "right"; vertSizing = "bottom"; @@ -75,8 +97,8 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; new GuiBitmapButtonCtrl(GHWorldEditor) { - bitmapAsset = "ToolsModule:world_image"; - bitmapMode = "Stretched"; + bitmapAsset = "ToolsModule:world_n_image"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "0"; buttonType = "RadioButton"; @@ -97,8 +119,8 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiBitmapButtonCtrl(GHGuiEditor) { - bitmapAsset = "ToolsModule:gui_image"; - bitmapMode = "Stretched"; + bitmapAsset = "ToolsModule:gui_n_image"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "0"; buttonType = "RadioButton"; @@ -119,7 +141,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:playbutton_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "0"; buttonType = "PushButton"; @@ -141,7 +163,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { BitmapAsset = "ToolsModule:settings_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; useModifiers = "0"; useStates = "1"; @@ -166,15 +188,17 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSave = "1"; canSaveDynamicFields = "0"; }; + new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_h_image"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + bitmapMode = "Centered"; wrap = "0"; isContainer = "0"; profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "bottom"; position = "130 3"; - extent = "2 26"; + extent = "9 26"; minExtent = "1 1"; canSave = "1"; visible = "1"; @@ -182,36 +206,43 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { hovertime = "1000"; canSaveDynamicFields = "0"; }; + new GuiBitmapButtonCtrl() { - canSaveDynamicFields = "0"; - internalName = AssetBrowserBtn; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "98 3"; - Extent = "29 27"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "AssetBrowser.toggleDialog();"; - tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Asset Browser"; - hovertime = "750"; - bitmapAsset = "ToolsModule:menuGrid_image"; - bitmapMode = "Stretched"; - buttonType = "PushButton"; - groupNum = "0"; + bitmapAsset = "ToolsModule:assetBrowser_n_image"; + bitmapMode = "Centered"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + masked = "0"; + groupNum = "-1"; + buttonType = "ToggleButton"; useMouseEvents = "0"; - }; + position = "98 3"; + Extent = "33 27"; + minExtent = "8 8"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "AssetBrowser.toggleDialog();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Open the Asset Browser"; + hovertime = "1000"; + isContainer = "0"; + internalName = "AssetBrowserBtn"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; position = "160 3"; - Extent = "2 26"; + Extent = "9 26"; MinExtent = "1 1"; - bitmapAsset = "ToolsModule:separator_h_image"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + bitmapMode = "Centered"; }; new GuiPopUpMenuCtrl(GuiEditorContentList) { maxPopupHeight = "200"; @@ -266,14 +297,15 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_h_image"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + bitmapMode = "Centered"; wrap = "0"; isContainer = "0"; profile = "ToolsGuiDefaultProfile"; horizSizing = "right"; vertSizing = "center"; position = "307 3"; - extent = "2 26"; + extent = "9 26"; minExtent = "1 1"; canSave = "1"; visible = "1"; @@ -283,7 +315,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl(GuiEditorSnapCheckBox) { bitmapAsset = "ToolsModule:snap_grid_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "ToggleButton"; @@ -304,7 +336,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl(GuiEditorEdgeSnapping_btn) { bitmapAsset = "ToolsModule:edgesnap_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "ToggleButton"; @@ -312,10 +344,10 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { isContainer = "0"; profile = "ToolsGuiButtonProfile"; horizSizing = "right"; - vertSizing = "center"; + vertSizing = "center"; position = "31 0"; extent = "29 27"; - minExtent = "21 21"; + minExtent = "21 21"; canSave = "1"; visible = "1"; command = "GuiEditor.toggleEdgeSnap();"; @@ -326,7 +358,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl(GuiEditorCenterSnapping_btn) { bitmapAsset = "ToolsModule:centersnap_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "ToggleButton"; @@ -334,10 +366,10 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { isContainer = "0"; profile = "ToolsGuiButtonProfile"; horizSizing = "right"; - vertSizing = "center"; + vertSizing = "center"; position = "62 0"; extent = "29 27"; - minExtent = "21 21"; + minExtent = "21 21"; canSave = "1"; visible = "1"; command = "GuiEditor.toggleCenterSnap();"; @@ -346,25 +378,25 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { hovertime = "1000"; canSaveDynamicFields = "0"; }; - new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_h_image"; - wrap = "0"; - isContainer = "0"; - profile = "ToolsGuiDefaultProfile"; - horizSizing = "right"; - vertSizing = "bottom"; - position = "415 3"; - extent = "2 26"; - minExtent = "1 1"; - canSave = "1"; - visible = "1"; - tooltipProfile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - canSaveDynamicFields = "0"; - }; + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:separator_xt_h_image"; + wrap = "0"; + isContainer = "0"; + profile = "ToolsGuiDefaultProfile"; + horizSizing = "right"; + vertSizing = "bottom"; + position = "415 3"; + extent = "9 26"; + minExtent = "1 1"; + canSave = "1"; + visible = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + canSaveDynamicFields = "0"; + }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:align_left_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -375,7 +407,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { vertSizing = "bottom"; position = "0 0"; extent = "29 27"; - minExtent = "21 21"; + minExtent = "21 21"; canSave = "1"; visible = "1"; command = "GuiEditor.Justify(0);"; @@ -386,7 +418,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:vertical_center_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -408,7 +440,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:align_right_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -430,7 +462,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:align_top_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -441,7 +473,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { vertSizing = "bottom"; position = "0 0"; extent = "29 27"; - minExtent = "21 21"; + minExtent = "21 21"; canSave = "1"; visible = "1"; command = "GuiEditor.Justify(3);"; @@ -452,7 +484,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:horizontal_center_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -474,7 +506,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:align_bottom_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -494,41 +526,25 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { hovertime = "1000"; canSaveDynamicFields = "0"; }; - new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_h_image"; - wrap = "0"; - isContainer = "0"; - profile = "ToolsGuiDefaultProfile"; - horizSizing = "right"; - vertSizing = "bottom"; - position = "582 3"; - extent = "2 26"; - minExtent = "1 1"; - canSave = "1"; - visible = "1"; - tooltipProfile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - canSaveDynamicFields = "0"; - }; - new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_h_image"; - wrap = "0"; - isContainer = "0"; - profile = "ToolsGuiDefaultProfile"; - horizSizing = "right"; - vertSizing = "bottom"; - position = "639 3"; - extent = "2 26"; - minExtent = "1 1"; - canSave = "1"; - visible = "1"; - tooltipProfile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - canSaveDynamicFields = "0"; - }; + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:separator_xt_h_image"; + wrap = "0"; + isContainer = "0"; + profile = "ToolsGuiDefaultProfile"; + horizSizing = "right"; + vertSizing = "bottom"; + position = "582 3"; + extent = "9 26"; + minExtent = "1 1"; + canSave = "1"; + visible = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + canSaveDynamicFields = "0"; + }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:send_to_back_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -550,7 +566,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:bring_to_front_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -570,9 +586,25 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { hovertime = "1000"; canSaveDynamicFields = "0"; }; + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:separator_xt_h_image"; + wrap = "0"; + isContainer = "0"; + profile = "ToolsGuiDefaultProfile"; + horizSizing = "right"; + vertSizing = "bottom"; + position = "639 3"; + extent = "9 26"; + minExtent = "1 1"; + canSave = "1"; + visible = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + canSaveDynamicFields = "0"; + }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:distribute_horizontal_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -594,7 +626,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:distribute_vertical_n_image"; - bitmapMode = "Stretched"; + bitmapMode = "Centered"; autoFitExtents = "0"; groupNum = "-1"; buttonType = "PushButton"; @@ -823,6 +855,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { new GuiPanel() { position = "0 0"; extent = "222 337"; + Profile = "ToolsGuiPaneProfile"; new GuiTextEditCtrl( GuiEditorTreeFilter ) { position = "2 4"; @@ -997,7 +1030,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - position = "0 349"; + position = "8 349"; Extent = "213 13"; MinExtent = "8 2"; canSave = "1"; @@ -1066,6 +1099,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { new GuiPanel() { position = "0 0"; extent = "222 337"; + Profile = "ToolsGuiPaneProfile"; new GuiTextEditCtrl( GuiEditorProfilesTreeFilter ) { position = "2 4"; @@ -1303,7 +1337,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - position = "0 349"; + position = "8" SPC getWord(GuiEditorSidebar.extent, 1) - 38; Extent = "213 13"; MinExtent = "8 2"; canSave = "1"; @@ -1318,7 +1352,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { }; new GuiBitmapButtonCtrl() { - bitmapAsset = "ToolsModule:delete_n_image"; + bitmapAsset = "ToolsModule:reset_icon_n_image"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -1337,7 +1371,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiBitmapButtonCtrl() { - bitmapAsset = "ToolsModule:delete_n_image"; + bitmapAsset = "ToolsModule:copy_btn_n_image"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -1356,7 +1390,7 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiBitmapButtonCtrl() { - bitmapAsset = "ToolsModule:delete_n_image"; + bitmapAsset = "ToolsModule:iconNew_image"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript index 0367ae1fd..b3e89a1c9 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.tscript @@ -768,22 +768,22 @@ function GuiEditorResList::init( %this ) // Non-widescreen formats. - %this.add( "640x480 (VGA, 4:3)", 640 ); - %this.add( "800x600 (SVGA, 4:3)", 800 ); - %this.add( "1024x768 (XGA, 4:3)", 1024 ); - %this.add( "1280x1024 (SXGA, 4:3)", 1280 ); - %this.add( "1600x1200 (UXGA, 4:3)", 1600 ); + %this.add( " 640 x 480 ( VGA, 4:3 ) ", 640 ); + %this.add( " 800 x 600 ( SVGA, 4:3 ) ", 800 ); + %this.add( " 1024 x 768 ( XGA, 4:3 ) ", 1024 ); + %this.add( " 1280 x 1024 ( SXGA, 4:3 ) ", 1280 ); + %this.add( " 1600 x 1200 ( UXGA, 4:3 ) ", 1600 ); // Widescreen formats. - %this.add( "1280x720 (WXGA, 16:9)", 720 ); - %this.add( "1600x900 (HD+, 16:9)", 900 ); - %this.add( "1920x1080 (FHD, 16:9)", 1080 ); - %this.add( "2560x1440 (QHD, 16:9)", 1440 ); - %this.add( "3840x2160 (4K UHD, 16:9)", 2160 ); - %this.add( "1440x900 (WXGA+, 16:10)", 900 ); - %this.add( "1680x1050 (WSXGA+, 16:10)", 1050 ); - %this.add( "1920x1200 (WUXGA, 16:10)", 1200 ); + %this.add( " 1280 x 720 ( WXGA, 16:9 ) ", 720 ); + %this.add( " 1600 x 900 ( HD+, 16:9 ) ", 900 ); + %this.add( " 1920 x 1080 ( FHD, 16:9 ) ", 1080 ); + %this.add( " 2560 x 1440 ( QHD, 16:9 ) ", 1440 ); + %this.add( " 3840 x 2160 ( 4K UHD, 16:9 ) ", 2160 ); + %this.add( " 1440 x 900 ( WXGA+, 16:10 ) ", 900 ); + %this.add( " 1680 x 1050 ( WSXGA+, 16:10 ) ", 1050 ); + %this.add( " 1920 x 1200 ( WUXGA, 16:10 ) ", 1200 ); } //--------------------------------------------------------------------------------------------- @@ -913,7 +913,7 @@ function GuiEditorTabBook::onTabSelected( %this, %text, %index ) %sidebar-->button3.setVisible( true ); %sidebar-->button4.setVisible( true ); - %sidebar-->button4.setBitmap( "ToolsModule:iconDelete_image" ); + %sidebar-->button4.setBitmap( "ToolsModule:delete_n_image" ); %sidebar-->button4.command = "GuiEditor.deleteSelection();"; %sidebar-->button4.tooltip = "Delete Selected Control(s)"; @@ -928,11 +928,11 @@ function GuiEditorTabBook::onTabSelected( %this, %text, %index ) %sidebar-->button3.setVisible( true ); %sidebar-->button4.setVisible( true ); - %sidebar-->button4.setBitmap( "ToolsModule:iconDelete_image" ); + %sidebar-->button4.setBitmap( "ToolsModule:delete_n_image" ); %sidebar-->button4.command = "GuiEditor.showDeleteProfileDialog( GuiEditorProfilesTree.getSelectedProfile() );"; %sidebar-->button4.tooltip = "Delete Selected Profile"; - %sidebar-->button3.setBitmap( "ToolsModule:new_n_image" ); + %sidebar-->button3.setBitmap( "ToolsModule:iconNew_image" ); %sidebar-->button3.command = "GuiEditor.createNewProfile( \"Unnamed\" );"; %sidebar-->button3.tooltip = "Create New Profile with Default Values"; @@ -1113,7 +1113,7 @@ function GuiEditorGui::initSettings( %this ) EditorSettings.endGroup(); EditorSettings.beginGroup( "Help" ); - EditorSettings.setDefaultValue( "documentationURL", "http://www.garagegames.com/products/torque-3d/documentation/user" ); //RDTODO: make this point to Gui Editor docs when available + EditorSettings.setDefaultValue( "documentationURL", "https://docs.torque3d.org" ); //RDTODO: make this point to Gui Editor docs when available // Create a path to the local documentation. This is a bit of guesswork here. // It assumes that the project is located in a folder of the SDK root directory diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript index 2235ab5a3..0c50b1c59 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.tscript @@ -69,7 +69,7 @@ function GuiEditCanvas::onCreateMenu(%this) %this.menuBar = new GuiMenuBar(GuiEditorMenubar) { dynamicItemInsertPos = 3; - extent = "1024 20"; + extent = getWord($pref::Video::mode, 0) SPC "29"; minExtent = "320 20"; horizSizing = "width"; profile = "ToolsGuiMenuBarProfile"; @@ -207,10 +207,16 @@ function GuiEditCanvas::onCreateMenu(%this) item[1] = "Offline User Guid..." TAB "" TAB "gotoWebPage( GuiEditor.documentationLocal );"; item[2] = "Offline Reference Guide..." TAB "" TAB "shellExecute( GuiEditor.documentationReference );"; item[3] = "-"; - item[4] = "Torque 3D Public Forums..." TAB "" TAB "gotoWebPage( \"http://www.garagegames.com/community/forums/73\" );"; - item[5] = "Torque 3D Private Forums..." TAB "" TAB "gotoWebPage( \"http://www.garagegames.com/community/forums/63\" );"; + item[4] = "Torque 3D Forums..." TAB "" TAB "gotoWebPage( \"https://torque3d.org/forums/\" );"; }; }; + + // Workaround (for some reason it doesn't size to the width of the canvas) + // TODO: After a canvas resize it still messes up the width + %position = %this.menubar.position.x SPC %this.menubar.position.y; + %extent = getWord($pref::Video::mode, 0) SPC %this.menubar.extent.y; + %this.menubar.resize(%position.x, %position.y, %extent.x, %extent.y); + %this.menuBar.attachToCanvas( Canvas, 0 ); } diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript index 3cc59381d..e6abfdbd2 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript @@ -154,7 +154,7 @@ function GuiEditorInspectFields::onInspectorDiscardFieldModification( %this ) function GuiEditorInspectFields::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - GuiEditorFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + GuiEditorFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript index 65f005e2f..29eb94b53 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript @@ -418,7 +418,7 @@ function GuiEditorProfilesTree::setSelectedProfile( %this, %profile ) function GuiEditorProfileInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - GuiEditorProfileFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + GuiEditorProfileFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/main.tscript b/Templates/BaseGame/game/tools/main.tscript index bdf0ea2e3..70d94525d 100644 --- a/Templates/BaseGame/game/tools/main.tscript +++ b/Templates/BaseGame/game/tools/main.tscript @@ -26,7 +26,7 @@ $Tools::resourcePath = "tools/"; // These must be loaded first, in this order, before anything else is loaded -$Tools::loadFirst = "editorClasses base worldEditor assetBrowser"; +$Tools::loadFirst = "editorClasses base worldEditor assetBrowser windowConsole"; //--------------------------------------------------------------------------------------------- // Object that holds the simObject id that the materialEditor uses to interpret its material list diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript index f8711a2b0..a9f67ad6a 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript @@ -31,8 +31,8 @@ singleton GuiControlProfile (GuiMatEdSliderProfile) singleton GuiControlProfile (GuiMatEdRightJustifyProfile) { // font - fontType = "Arial"; - fontSize = 14; + fontType = $Gui::fontTypeRegular; + fontSize = 16; fontCharset = ANSI; fontColor = "0 0 0"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_d.png b/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_d.png index c8b2106c2..2805f789b 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_d.png and b/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_h.png b/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_h.png index d803dc6af..74d721145 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_h.png and b/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_n.png b/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_n.png index 4cc985e1c..116416884 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_n.png and b/Templates/BaseGame/game/tools/materialEditor/gui/change-material-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui index e7606081e..c067c12de 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui @@ -22,10 +22,10 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Extent = "210 251 "; - MinExtent = "210 150"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1)-1; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 300"; + MinExtent = "300 150"; canSave = "1"; Visible = "1"; hovertime = "1000"; @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { closeCommand = "MaterialEditorPreviewWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = "Material Preview"; + text = ":: Material Editor - Preview"; /*new GuiContainer(MaterialEditorPreviewPane) { canSaveDynamicFields = "0"; @@ -76,7 +76,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "4 45"; - Extent = "202 202"; + Extent = "300 300"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -93,7 +93,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "-1 -1"; - Extent = "204 204"; + Extent = "302 302"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -106,7 +106,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; Position = "-1 -1"; - Extent = "204 204"; + Extent = "302 302"; }; new GuiMaterialPreview(matEd_previewObjectView) { canSaveDynamicFields = "0"; @@ -116,7 +116,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "1 1"; - Extent = "199 199"; + Extent = "299 299"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -168,17 +168,19 @@ $guiContent = new GuiControl() { Profile = "GuiInspectorSwatchButtonProfile"; HorizSizing = "left"; VertSizing = "top"; - position = "189 229"; - Extent = "14 14"; + position = "330 270"; + Extent = "20 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "getColorF($thisControl.color, \"MaterialEditorGui.updatePreviewBackground\");"; - color = "0 0 0 .8"; + color = "0 0 0 .7"; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; + ToolTip ="Change Background Color (preview)"; + tooltipprofile = "ToolsGuiToolTipProfile"; }; // Ambient light color picker @@ -199,6 +201,7 @@ $guiContent = new GuiControl() { hovertime = "1000"; groupNum = "-1"; ToolTip ="Change Ambient Light Color"; + tooltipprofile = "ToolsGuiToolTipProfile"; buttonType = "PushButton"; useMouseEvents = "0"; }; @@ -220,19 +223,115 @@ $guiContent = new GuiControl() { hovertime = "1000"; groupNum = "-1"; ToolTip ="Change Normal Light Color"; + tooltipprofile = "ToolsGuiToolTipProfile"; buttonType = "PushButton"; useMouseEvents = "0"; }; new GuiCheckboxCtrl(){ - position = "108 25"; + position = "254 25"; Extent = "98 18"; HorizSizing = "left"; profile = "ToolsGuiCheckBoxProfile"; Variable = "MaterialEditorGui.livePreview"; Command = "MaterialEditorGui.updateLivePreview($ThisControl.getValue());"; - text ="Preview in World"; + text = "Preview in World"; }; + // window / panel buttons + new GuiBitmapButtonCtrl(MaterialEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "MaterialEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapButtonCtrl(MaterialEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "MaterialEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MaterialEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MaterialEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + }; new GuiWindowCtrl(matEd_addCubemapWindow) { diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui index 35acf46cd..09fffd716 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui @@ -22,10 +22,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Extent = "210 446"; - MinExtent = "210 316"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MaterialEditorPreviewWindow.extent, 1) - 2; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(MaterialEditorPreviewWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 316"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MaterialEditorPreviewWindow.extent, 1) + 6; canSave = "1"; Visible = "1"; hovertime = "1000"; @@ -44,34 +44,36 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { closeCommand = "MaterialEditorPropertiesWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = "Material Properties"; + text = ":: Material Editor - Properties"; - new GuiContainer(){ // Client group + new GuiContainer(MaterialEditorGuiContent){ // Client group isContainer = "1"; Docking = "Client"; Margin = "3 1 3 3"; Position = "4 24"; - Extent = "202 668"; + Extent = "200 668"; new GuiContainer(){ // container to prevent transparent collapsing from effecting children. Position = "0 21"; - Extent = "202 39"; + Extent = "200 39"; isContainer = "1"; HorizSizing = "width"; Visible = "1"; new GuiContainer(MatEdMaterialMode){ // Edit Mode Position = "0 0"; - Extent = "202 39"; + Extent = "200 39"; isContainer = "1"; HorizSizing = "width"; Visible = "0"; new GuiTextCtrl(){ - Position = "1 1"; - Extent = "39 16"; + Position = "10 1"; + Extent = "50 16"; Profile = "ToolsGuiTextRightProfile"; - text = "Material"; + text = "Material:"; + HorizSizing = "right"; + VertSizing = "bottom"; }; new GuiTextEditCtrl(){ internalName = "selMaterialName"; @@ -79,21 +81,22 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { AltCommand = "MaterialEditorGui.setMaterialDirty();MaterialEditorGui.updateActiveMaterialName($ThisControl.getText());"; // needs hookup HorizSizing = "width"; VertSizing = "bottom"; - Position = "45 0"; - Extent = "158 18"; + Position = "70 0"; + Extent = "125 18"; text = ""; - HorizSizing = "width"; }; new GuiTextCtrl(){ - Position = "1 21"; - Extent = "39 16"; + Position = "10 20"; + Extent = "50 18"; Profile = "ToolsGuiTextRightProfile"; - text = "Target"; + text = "Target:"; + HorizSizing = "right"; + VertSizing = "bottom"; }; new GuiTextCtrl(){ // mesh name should not include the path internalName = "selMaterialMapTo"; // will use the first child found with that name if called from a previous parent even if it is invisable. - Position = "46 21"; - Extent = "141 16"; + Position = "70 20"; + Extent = "125 16"; HorizSizing = "width"; VertSizing = "bottom"; text = ""; @@ -229,7 +232,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { VertSizing = "bottom"; Position = "0 0"; Extent = "185 0"; - Caption = "Basic Texture Maps"; + Caption = " Basic Texture Maps"; Margin = "4 4 4 0"; DragSizable = false; container = true; @@ -292,8 +295,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"diffuse\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the Active Diffuse Map for this layer"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the Active Diffuse Map for this layer"; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -307,7 +310,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "56 -3"; + position = "56 0"; Extent = "72 18"; MinExtent = "8 2"; canSave = "1"; @@ -410,7 +413,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiContainer(){ // Normal Map profile="ToolsGuiDefaultProfile"; isContainer = "1"; - position = "6 79"; + position = "6 77"; Extent = "185 52"; HorizSizing = "width"; className = "materialEditorNormalMapContainer"; @@ -439,7 +442,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "56 -3"; + position = "56 0"; Extent = "72 18"; MinExtent = "8 2"; canSave = "1"; @@ -467,8 +470,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"normal\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the active Normal Map for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Normal Map for this layer."; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -537,8 +540,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "202 0"; - Caption = "Light Influence Maps"; + Extent = "300 0"; + Caption = " Light Influence Maps"; Expanded = false; Margin = "4 4 4 0"; DragSizable = false; @@ -556,7 +559,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "1 3"; - Extent = "185 16"; + Extent = "300 16"; MinExtent = "16 16"; canSave = "1"; isDecoy = "0"; @@ -568,31 +571,32 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "185 50"; - HorizSizing = "width"; + Extent = "300 120"; + HorizSizing = "left"; new GuiTextCtrl() { HorizSizing = "right"; VertSizing = "bottom"; - position = "9 4"; - Extent = "72 16"; + position = "0 4"; + Extent = "100 16"; text = "Roughness"; - Profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiTextCtrl() { HorizSizing = "right"; VertSizing = "bottom"; - position = "9 26"; - Extent = "72 16"; + position = "0 26"; + Extent = "100 16"; text = "Metalness"; - Profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiControl() { class = "AggregateControl"; - position = "91 4"; - Extent = "96 20"; + position = "120 4"; + Extent = "180 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -600,16 +604,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "0 1"; - Extent = "61 14"; + position = "0 2"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"Roughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"Roughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Sets Roughness."; hovertime = "1000"; range = "0 1"; @@ -622,10 +626,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "35 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -641,8 +645,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "91 26"; - Extent = "96 20"; + position = "120 26"; + Extent = "180 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -650,16 +655,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "0 1"; - Extent = "61 14"; + position = "0 2"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"Metalness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"Metalness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Sets Metalness."; hovertime = "1000"; range = "0 1"; @@ -672,10 +677,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "35 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -688,82 +693,72 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { text = "0"; }; }; + new GuiContainer(){ // spec Map options + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 60"; + Extent = "290 24"; + HorizSizing = "right"; + + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "isSRGBCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "5 0"; + Extent = "57 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"isSRGb[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Treat as sRGB" NL "(Substance Designer Workaround)"; + hovertime = "1000"; + text = " Is sRGB"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "invertRoughnessCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "120 0"; + Extent = "107 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"invertRoughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = " Invert Rougness" NL "(Treat as Roughest = 1.0 instead of 0.0)"; + hovertime = "1000"; + text = " Invert Roughness"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + }; + new GuiBitmapCtrl(){ + position="6 90"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset = "ToolsModule:separator_v_image"; + }; }; - new GuiContainer(){ // spec Map options - profile="ToolsGuiDefaultProfile"; - isContainer = "1"; - position = "6 364"; - Extent = "185 20"; - HorizSizing = "width"; - new GuiCheckBoxCtrl() { - canSaveDynamicFields = "0"; - internalName = "isSRGBCheckbox"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiCheckBoxProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "5 2"; - Extent = "57 16"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "MaterialEditorGui.updateActiveMaterial(\"isSRGb[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Substance Designer Workaround."; - hovertime = "1000"; - text = "isSRGB"; - groupNum = "-1"; - buttonType = "ToggleButton"; - useMouseEvents = "0"; - useInactiveState = "0"; - }; - new GuiCheckBoxCtrl() { - canSaveDynamicFields = "0"; - internalName = "invertRoughnessCheckbox"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiCheckBoxProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "70 2"; - Extent = "107 16"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "MaterialEditorGui.updateActiveMaterial(\"invertRoughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Treat as Roughest = 1.0, not 0.0"; - hovertime = "1000"; - text = "Invert Roughness"; - groupNum = "-1"; - buttonType = "ToggleButton"; - useMouseEvents = "0"; - useInactiveState = "0"; - }; - }; - new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_v_image"; - wrap = "0"; - position = "6 75"; - extent = "175 2"; - minExtent = "8 2"; - horizSizing = "width"; - vertSizing = "bottom"; - profile = "GuiDefaultProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; new GuiContainer(){ // spec Map profile="ToolsGuiDefaultProfile"; isContainer = "1"; - position = "6 364"; + position = "6 280"; Extent = "185 52"; HorizSizing = "width"; className = "materialEditorORMConfigMapContainer"; @@ -792,7 +787,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "56 -3"; + position = "56 0"; Extent = "72 18"; MinExtent = "8 2"; canSave = "1"; @@ -804,7 +799,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "ORM(Config)Map"; + text = "ORM (Config) Map"; maxLength = "1024"; }; new GuiBitmapButtonCtrl() { @@ -820,8 +815,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the packed spec map for this layer. \n Roughness (R), Ambient Occlusion (G), and Metalness(B))"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the packed Specular Map for this layer" NL " - Red: Roughness" NL " - Green: Ambient Occlusion" NL " - Blue: Metalness"; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -881,29 +876,22 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { bitmapAsset = "ToolsModule:delete_n_image"; }; }; + // todo: fix indent new GuiBitmapCtrl() { bitmapAsset = "ToolsModule:separator_v_image"; - wrap = "0"; position = "6 75"; extent = "175 2"; minExtent = "8 2"; horizSizing = "width"; - vertSizing = "bottom"; - profile = "ToolsGuiButtonProfile"; visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; }; new GuiContainer(){ // save composite Map profile="ToolsGuiDefaultProfile"; isContainer = "1"; - position = "0 364"; + position = "0 344"; Extent = "185 20"; HorizSizing = "width"; + new GuiTextCtrl() { canSaveDynamicFields = "0"; Enabled = "1"; @@ -911,7 +899,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "16 2"; + position = "86 2"; Extent = "100 18"; MinExtent = "8 2"; canSave = "1"; @@ -935,7 +923,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "125 2"; + position = "175 2"; extent = "16 16"; minExtent = "8 2"; horizSizing = "left"; @@ -944,30 +932,20 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; command = "MaterialEditorGui.saveCompositeMap();"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; canSaveDynamicFields = "0"; }; }; - new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_v_image"; - wrap = "0"; - position = "6 75"; - extent = "175 2"; - minExtent = "8 2"; - horizSizing = "width"; - vertSizing = "bottom"; - profile = "ToolsGuiButtonProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; new GuiContainer() { + new GuiBitmapCtrl(){ + position = "6 75"; + extent ="192 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiContainer() { margin = "0 0 0 0"; padding = "0 0 0 0"; anchorTop = "1"; @@ -982,7 +960,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "GuiDefaultProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "1"; canSave = "1"; @@ -1000,7 +978,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiButtonProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "aoMapDisplayBitmap"; @@ -1008,7 +986,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiTextCtrl() { - text = "ao"; + text = "AO Map"; maxLength = "1024"; margin = "0 0 0 0"; padding = "0 0 0 0"; @@ -1016,15 +994,15 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "56 5"; - extent = "35 8"; + position = "56 0"; + extent = "85 8"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + profile = "EditorTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1048,7 +1026,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; tooltip = "Change the AO map for this layer."; hovertime = "1000"; isContainer = "0"; @@ -1065,14 +1043,14 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "56 17"; - extent = "143 17"; + extent = "193 17"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "bottom"; profile = "ToolsGuiTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "aoMapNameText"; @@ -1093,7 +1071,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1117,7 +1095,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"ao\",0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1128,16 +1106,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "2"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "100 5"; + position = "160 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioRedProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setAOChan(0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1148,16 +1126,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "2"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "121 5"; + position = "184 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioGreenProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setAOChan(1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1168,16 +1146,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "2"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "142 5"; + position = "208 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioBlueProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setAOChan(2);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1188,7 +1166,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "2"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "163 5"; + position = "232 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; @@ -1197,7 +1175,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; command = "MaterialEditorGui.setAOChan(3);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1219,7 +1197,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "GuiDefaultProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "1"; canSave = "1"; @@ -1237,7 +1215,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiButtonProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "roughMapDisplayBitmap"; @@ -1245,7 +1223,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiTextCtrl() { - text = "Roughness"; + text = "Roughness Map"; maxLength = "1024"; margin = "0 0 0 0"; padding = "0 0 0 0"; @@ -1253,15 +1231,15 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "56 5"; + position = "56 0"; extent = "35 8"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + profile = "EditorTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1285,7 +1263,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; tooltip = "Change the Roughness map for this layer."; hovertime = "1000"; isContainer = "0"; @@ -1302,14 +1280,14 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "56 17"; - extent = "143 17"; + extent = "193 17"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "bottom"; profile = "ToolsGuiTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "roughMapNameText"; @@ -1330,7 +1308,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1354,7 +1332,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"rough\",0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1365,16 +1343,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "1"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "100 5"; + position = "160 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioRedProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setRoughChan(0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1385,16 +1363,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "1"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "121 5"; + position = "184 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioGreenProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setRoughChan(1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1405,16 +1383,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "1"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "142 5"; + position = "208 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioBlueProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setRoughChan(2);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1425,7 +1403,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "1"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "163 5"; + position = "232 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; @@ -1434,7 +1412,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; command = "MaterialEditorGui.setRoughChan(3);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1456,7 +1434,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "GuiDefaultProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "1"; canSave = "1"; @@ -1474,7 +1452,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiButtonProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "metalMapDisplayBitmap"; @@ -1482,7 +1460,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiTextCtrl() { - text = "metal"; + text = "Metal Map"; maxLength = "1024"; margin = "0 0 0 0"; padding = "0 0 0 0"; @@ -1490,15 +1468,15 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "56 5"; + position = "56 0"; extent = "35 8"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + profile = "EditorTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1522,7 +1500,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"metal\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; tooltip = "Change the Metalness Map for this layer."; hovertime = "1000"; isContainer = "0"; @@ -1539,14 +1517,14 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "56 17"; - extent = "143 17"; + extent = "193 17"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "bottom"; profile = "ToolsGuiTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "metalMapNameText"; @@ -1567,7 +1545,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"metal\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1591,7 +1569,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"metal\",0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1602,16 +1580,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "3"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "100 5"; + position = "160 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioRedProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setMetalChan(0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1622,16 +1600,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "3"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "121 5"; + position = "184 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioGreenProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setMetalChan(1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1642,16 +1620,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "3"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "142 5"; + position = "208 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiRadioProfile"; + profile = "ToolsGuiRadioBlueProfile"; visible = "1"; active = "1"; command = "MaterialEditorGui.setMetalChan(2);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1662,7 +1640,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "3"; buttonType = "RadioButton"; useMouseEvents = "0"; - position = "163 5"; + position = "232 7"; extent = "20 10"; minExtent = "8 2"; horizSizing = "right"; @@ -1671,30 +1649,19 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; command = "MaterialEditorGui.setMetalChan(3);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; canSaveDynamicFields = "0"; }; - }; - new GuiBitmapCtrl() { - bitmapAsset = "ToolsModule:separator_v_image"; - wrap = "0"; - position = "6 75"; - extent = "175 2"; - minExtent = "8 2"; - horizSizing = "width"; - vertSizing = "bottom"; - profile = "ToolsGuiButtonProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; + }; + new GuiBitmapCtrl(){ + position="6 74"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset = "ToolsModule:separator_v_image"; + }; new GuiContainer() { margin = "0 0 0 0"; padding = "0 0 0 0"; @@ -1703,14 +1670,14 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorLeft = "1"; anchorRight = "0"; position = "6 364"; - extent = "185 67"; + extent = "185 80"; minExtent = "8 2"; horizSizing = "width"; vertSizing = "bottom"; profile = "GuiDefaultProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "1"; canSave = "1"; @@ -1728,7 +1695,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiButtonProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "glowMapDisplayBitmap"; @@ -1736,7 +1703,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiTextCtrl() { - text = "glow"; + text = "Glow Map"; maxLength = "1024"; margin = "0 0 0 0"; padding = "0 0 0 0"; @@ -1744,15 +1711,15 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "56 5"; + position = "56 0"; extent = "35 8"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + profile = "EditorTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1776,8 +1743,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"glow\",1);"; - tooltipProfile = "GuiToolTipProfile"; - tooltip = "Change the glowness Map for this layer."; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Change the Glowness Map for this layer."; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1800,7 +1767,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiTextProfile"; visible = "1"; active = "1"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "glowMapNameText"; @@ -1821,7 +1788,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"glow\",1);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; @@ -1845,72 +1812,74 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateTextureMap(\"glow\",0);"; - tooltipProfile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; canSave = "1"; canSaveDynamicFields = "0"; }; - new GuiTextCtrl() { - HorizSizing = "right"; - VertSizing = "bottom"; - position = "9 48"; - Extent = "72 16"; - text = "GlowMul"; - Profile = "ToolsGuiTextProfile"; - }; + // todo: correct indent + new GuiTextCtrl() { + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 54"; + Extent = "100 24"; + text = "Glow Multiply"; + Profile = "ToolsGuiTextRightProfile"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 54"; + Extent = "100 30"; + HorizSizing = "width"; - new GuiControl() { - class = "AggregateControl"; - position = "91 48"; - Extent = "96 20"; - - new GuiSliderCtrl() { - canSaveDynamicFields = "0"; - internalName = "GlowMulSlider"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "0 1"; - Extent = "61 14"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; - AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Sets GlowMul."; - hovertime = "1000"; - range = "0 20"; - ticks = "0"; - value = "0"; - }; - new GuiTextEditCtrl() { - canSaveDynamicFields = "0"; - internalName = "GlowMulTextEdit"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - hovertime = "1000"; - AnchorTop = "1"; - AnchorBottom = "0"; - AnchorLeft = "1"; - AnchorRight = "0"; - text = "0"; - }; + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "GlowMulSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 6"; + Extent = "5 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Sets GlowMul."; + hovertime = "1000"; + range = "0 20"; + ticks = "0"; + value = "0"; }; - }; - }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "GlowMulTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "35 3"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + }; + }; + }; + }; }; new GuiRolloutCtrl(advancedTextureMapsRollout) { class = "BehaviorQuickEditRollout"; @@ -1920,7 +1889,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { VertSizing = "bottom"; Position = "0 0"; Extent = "185 0"; - Caption = "Advanced Texture Maps"; + Caption = " Advanced Texture Maps"; Expanded = false; Margin = "4 4 4 0"; DragSizable = false; @@ -1984,8 +1953,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"detail\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the active Detail Map for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Detail Map for this layer."; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -2130,8 +2099,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"detailNormal\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the active DetailNormal Map for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Detail Normal Map for this layer."; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -2276,8 +2245,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"overlay\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the active Overlay Map for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Overlay Map for this layer."; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -2425,8 +2394,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"light\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the active light Map for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Light Map for this layer."; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -2552,8 +2521,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateTextureMap(\"tone\", 1);"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Change the active Tone Map for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Tone Map for this layer."; hovertime = "1000"; groupNum = "-1"; buttonType = "PushButton"; @@ -2622,8 +2591,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "195 0"; - Caption = "Accumulation Properties"; + Extent = "300 0"; + Caption = " Accumulation Properties"; Expanded = false; Margin = "-1 0 0 0"; DragSizable = false; @@ -2641,19 +2610,19 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "1 3"; - Extent = "195 16"; + Extent = "300 16"; MinExtent = "16 16"; canSave = "1"; isDecoy = "0"; Visible = "1"; - tooltipprofile = "GuiToolTipProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; hovertime = "1000"; new GuiContainer(){ // enable/disable profile="GuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "195 24"; + Extent = "300 24"; HorizSizing = "width"; new GuiCheckBoxCtrl() { @@ -2665,15 +2634,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "right"; VertSizing = "bottom"; position = "8 7"; - Extent = "57 16"; + Extent = "180 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateAccuCheckbox($ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; - ToolTip = "Enables the use of Pixel Specular for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Enables the use of Pixel Specular for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; - text = "Enable"; + text = " Enable Pixel Specular"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -2685,7 +2655,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile="GuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "195 24"; + Extent = "300 24"; HorizSizing = "width"; new GuiTextCtrl() { @@ -2695,8 +2665,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 3"; - Extent = "54 16"; + position = "0 3"; + Extent = "100 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2713,8 +2683,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "70 3"; - Extent = "96 20"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -2722,10 +2693,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "GuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "0 2"; - Extent = "61 14"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2744,10 +2715,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "24 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2767,7 +2738,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile="GuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "195 24"; + Extent = "300 24"; HorizSizing = "width"; new GuiTextCtrl() { @@ -2777,8 +2748,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 3"; - Extent = "54 16"; + position = "0 3"; + Extent = "100 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2795,8 +2766,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "70 3"; - Extent = "96 20"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -2804,10 +2776,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "GuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "0 2"; - Extent = "61 14"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2826,10 +2798,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "24 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2848,7 +2820,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile="GuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "195 24"; + Extent = "300 24"; HorizSizing = "width"; new GuiTextCtrl() { @@ -2858,8 +2830,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 3"; - Extent = "54 16"; + position = "0 3"; + Extent = "100 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2876,8 +2848,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "70 3"; - Extent = "96 20"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -2885,10 +2858,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "GuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "0 2"; - Extent = "61 14"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2907,10 +2880,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "24 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2929,7 +2902,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile="GuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "195 24"; + Extent = "300 24"; HorizSizing = "width"; new GuiTextCtrl() { @@ -2939,8 +2912,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 3"; - Extent = "54 16"; + position = "0 3"; + Extent = "100 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2957,8 +2930,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "70 3"; - Extent = "96 20"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -2966,10 +2940,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "GuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "0 2"; - Extent = "61 14"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -2988,10 +2962,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "24 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -3010,7 +2984,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile="GuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "195 24"; + Extent = "300 24"; HorizSizing = "width"; new GuiTextCtrl() { @@ -3020,8 +2994,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 3"; - Extent = "54 16"; + position = "0 3"; + Extent = "100 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -3038,8 +3012,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "70 3"; - Extent = "96 20"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -3047,10 +3022,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "GuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "0 2"; - Extent = "61 14"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -3069,10 +3044,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "64 0"; - Extent = "29 18"; + position = "24 0"; + Extent = "30 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -3087,7 +3062,13 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { }; }; }; - + new GuiContainer(){ // empty space + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 10"; + HorizSizing = "width"; + }; }; }; new GuiRolloutCtrl(lightingPropertiesRollout) { @@ -3097,8 +3078,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "185 0"; - Caption = "Lighting Properties"; + Extent = "300 0"; + Caption = " Lighting Properties"; Expanded = false; Margin = "-1 0 0 0"; DragSizable = false; @@ -3116,7 +3097,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "1 3"; - Extent = "185 16"; + Extent = "300 16"; MinExtent = "16 16"; canSave = "1"; isDecoy = "0"; @@ -3128,7 +3109,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "185 22"; + Extent = "300 40"; HorizSizing = "width"; new GuiCheckBoxCtrl() { @@ -3139,16 +3120,17 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "70 4"; - Extent = "40 16"; + position = "120 4"; + Extent = "70 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"glow[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Determines if this layer will Glow or not."; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; - text = "Glow"; + text = " Glow"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -3162,16 +3144,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 4"; - Extent = "60 16"; + position = "12 4"; + Extent = "70 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"receiveShadows[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; ToolTip = "Do we recieve shadows?"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; - text = "receiveShadows"; + text = " Receive Shadows"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -3204,8 +3186,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiContainer(){ // parallax profile = "ToolsGuiTransparentProfile"; isContainer = "1"; - position = "0 0"; - Extent = "185 24"; + position = "0 20"; + Extent = "300 24"; HorizSizing = "width"; new GuiTextCtrl() { @@ -3215,8 +3197,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 3"; - Extent = "54 16"; + position = "0 3"; + Extent = "100 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -3233,8 +3215,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "70 3"; - Extent = "115 20"; + position = "120 3"; + Extent = "180 20"; + HorizSizing = "width"; new GuiSliderCtrl() { canSaveDynamicFields = "0"; @@ -3242,16 +3225,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "0 2"; - Extent = "82 15"; + Extent = "10 14"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"parallaxScale[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue(), true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateActiveMaterial(\"parallaxScale[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue(), true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Parallax Scale"; hovertime = "1000"; range = "0 1"; @@ -3264,10 +3247,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "85 0"; - Extent = "29 18"; + position = "24 0"; + Extent = "30 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -3286,7 +3269,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { profile = "ToolsGuiTransparentProfile"; isContainer = "1"; position = "0 0"; - Extent = "185 84"; + Extent = "300 84"; HorizSizing = "width"; new GuiCheckBoxCtrl() { @@ -3297,16 +3280,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 4"; - Extent = "108 16"; + position = "12 8"; + Extent = "120 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"useAnisotropic[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Enables the use of anisotropic filtering for this layer."; hovertime = "1000"; - text = "Anisotropic filtering"; + text = " Anisotropic filtering"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -3320,16 +3303,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 25"; - Extent = "102 16"; + position = "12 31"; + Extent = "102 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"vertLit[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Enables the use of vertex lighting for this layer."; hovertime = "1000"; - text = "Vertex lit"; + text = " Vertex lit"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -3343,16 +3326,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "113 25"; - Extent = "102 16"; + position = "120 31"; + Extent = "120 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"vertColor[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Multiply vertex colors with diffuse colors for this layer."; hovertime = "1000"; - text = "Vertex colors"; + text = " Vertex colors"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -3366,16 +3349,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiCheckBoxProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "8 46"; - Extent = "79 16"; + position = "12 56"; + Extent = "79 20"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"subSurface[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Enables the use of subsurface scattering for this layer."; hovertime = "1000"; - text = "Sub Surface"; + text = " Sub Surface"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -3391,8 +3374,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "185 0"; - Caption = "Animation Properties"; + Extent = "300 0"; + Caption = " Animation Properties"; Expanded = false; Margin = "-1 0 0 0"; DragSizable = false; @@ -3410,7 +3393,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "1 3"; - Extent = "185 16"; + Extent = "300 16"; MinExtent = "16 16"; canSave = "1"; isDecoy = "0"; @@ -3419,10 +3402,11 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { hovertime = "1000"; new GuiContainer(){ // Rotation Animation Properties + profile="inspectorStyleRolloutInnerProfile"; isContainer = "1"; - position = "-1 96"; - Extent = "185 94"; + position = "-1 120"; + Extent = "300 100"; HorizSizing = "width"; new GuiCheckboxCtrl() { @@ -3433,12 +3417,13 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "4 -1"; - Extent = "112 18"; + position = "4 3"; + Extent = "200 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateAnimationFlags();"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -3446,14 +3431,15 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "Rotation Animation"; + text = " Rotation Animation"; maxLength = "1024"; }; - new GuiControl(){ + new GuiControl(RotAnimAggCtrl){ class = "AggregateControl"; position = "0 29"; - Extent = "135 20"; + Extent = "290 20"; + HorizSizing = "width"; new GuiTextCtrl(){ // u profile = "ToolsGuiTextProfile"; @@ -3467,36 +3453,36 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiSliderCtrl() { // u Profile = "ToolsGuiSliderProfile"; internalName = "RotationSliderU"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "25 2"; Extent = "68 15"; Command = "MaterialEditorGui.updateRotationOffset(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationOffset(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Change U Scroll Direction"; hovertime = "1000"; range = "-1 0"; - ticks = "0"; - value = "0"; + ticks = "1"; + value = "-0.5"; }; new GuiTextEditCtrl(){ // u internalName = "RotationTextEditU"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; position = "98 0"; Extent = "34 18"; text = "0"; Command = "$ThisControl.getParent().updateFromChild($ThisControl);"; + Profile = "ToolsGuiTextEditProfile"; }; }; - - - new GuiControl() { + new GuiControl(ScrollAnimAggCtrl) { class = "AggregateControl"; position = "0 50"; - Extent = "135 20"; + Extent = "290 20"; + HorizSizing = "width"; new GuiTextCtrl(){ // v profile = "ToolsGuiTextProfile"; @@ -3510,39 +3496,41 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiSliderCtrl() { // v Profile = "ToolsGuiSliderProfile"; internalName = "RotationSliderV"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "25 2"; Extent = "68 15"; Command = "MaterialEditorGui.updateRotationOffset(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationOffset(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Change V Scroll Direction"; hovertime = "1000"; range = "-1 0"; - ticks = "0"; - value = "0"; + ticks = "1"; + value = "-0.5"; }; new GuiTextEditCtrl(){ // v internalName = "RotationTextEditV"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; position = "98 0"; Extent = "34 18"; text = "0"; + Profile = "ToolsGuiTextEditProfile"; Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationOffset();"; }; }; new GuiTextCtrl(){ // Pivot Point - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "98 16"; + position = "98 12"; Extent = "34 16"; text = "Pivot"; + profile = "ToolsGuiTextProfile"; }; new GuiBitmapCtrl(){ - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; position = "136 20"; Extent = "48 48"; @@ -3570,15 +3558,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "0 70"; - Extent = "187 20"; + position = "0 75"; + Extent = "300 35"; + HorizSizing = "width"; new GuiTextCtrl(){ // Speed - profile = "ToolsGuiTextProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "11 0"; - Extent = "43 16"; + Extent = "100 16"; text = "Speed"; }; @@ -3588,20 +3577,20 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "49 3"; - Extent = "95 16"; + position = "120 3"; + Extent = "10 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateRotationSpeed(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationSpeed(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Scrolling Speed"; hovertime = "1000"; range = "-10 10"; - ticks = "0"; + ticks = "1"; value = "0"; }; @@ -3611,9 +3600,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "150 1"; + position = "140 1"; Extent = "34 18"; MinExtent = "8 2"; canSave = "1"; @@ -3635,15 +3624,30 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { password = "0"; passwordMask = "*"; }; + new GuiTextCtrl(){ // space + profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 20"; + Extent = "300 20"; + text = " "; + }; }; }; new GuiContainer(){ // Scroll Animation Properties profile="inspectorStyleRolloutInnerProfile"; isContainer = "1"; - position = "-1 191"; - Extent = "185 94"; + position = "-1 240"; + Extent = "300 105"; HorizSizing = "width"; + new GuiBitmapCtrl(){ + position = "0 5"; + extent ="300 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiCheckboxCtrl() { canSaveDynamicFields = "0"; internalName = "ScrollAnimation"; @@ -3652,11 +3656,12 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "4 -1"; - Extent = "112 18"; + position = "4 10"; + Extent = "200 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; @@ -3665,15 +3670,15 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; Command = "MaterialEditorGui.updateAnimationFlags();"; - text = "Scroll Animation"; + text = " Scroll Animation"; maxLength = "1024"; }; - new GuiControl(){ class = "AggregateControl"; position = "0 29"; - Extent = "135 20"; + Extent = "290 20"; + HorizSizing = "width"; new GuiTextCtrl(){ // u profile = "ToolsGuiTextProfile"; @@ -3687,26 +3692,27 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiSliderCtrl() { // u Profile = "ToolsGuiSliderProfile"; internalName = "ScrollSliderU"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "25 2"; Extent = "68 15"; Command = "MaterialEditorGui.updateScrollOffset(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Change U Scroll Direction"; hovertime = "1000"; range = "-1 1"; - ticks = "0"; + ticks = "1"; value = "0"; }; new GuiTextEditCtrl(){ // u internalName = "ScrollTextEditU"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; position = "98 0"; Extent = "34 18"; text = "0"; + Profile = "ToolsGuiTextEditProfile"; Command = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset();"; }; }; @@ -3714,7 +3720,8 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; position = "0 50"; - Extent = "135 20"; + Extent = "290 20"; + HorizSizing = "width"; new GuiTextCtrl(){ // v profile = "ToolsGuiTextProfile"; @@ -3728,38 +3735,40 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiSliderCtrl() { // v Profile = "ToolsGuiSliderProfile"; internalName = "ScrollSliderV"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; position = "25 2"; Extent = "68 15"; Command = "MaterialEditorGui.updateScrollOffset(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Change V Scroll Direction"; hovertime = "1000"; range = "-1 1"; - ticks = "0"; + ticks = "1"; value = "0"; }; new GuiTextEditCtrl(){ // v internalName = "ScrollTextEditV"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; position = "98 0"; Extent = "34 18"; text = "0"; + Profile = "ToolsGuiTextEditProfile"; Command = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset();"; }; }; new GuiTextCtrl(){ // Direction Offset - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "98 16"; + position = "98 12"; Extent = "34 16"; text = "Offset"; + profile = "ToolsGuiTextProfile"; }; new GuiBitmapCtrl(){ - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; position = "136 20"; Extent = "48 48"; @@ -3794,15 +3803,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "0 70"; - Extent = "187 20"; + position = "0 75"; + Extent = "300 35"; + HorizSizing = "width"; new GuiTextCtrl(){ // Speed - profile = "ToolsGuiTextProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; position = "11 0"; - Extent = "43 16"; + Extent = "100 16"; text = "Speed"; }; @@ -3812,16 +3822,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "49 3"; - Extent = "95 16"; + position = "120 3"; + Extent = "10 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateScrollSpeed(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollSpeed(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Scrolling Speed"; hovertime = "1000"; range = "0 10"; @@ -3835,9 +3845,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "150 1"; + position = "140 1"; Extent = "34 18"; MinExtent = "8 2"; canSave = "1"; @@ -3859,26 +3869,42 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { password = "0"; passwordMask = "*"; }; + new GuiTextCtrl(){ // space + profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 20"; + Extent = "300 20"; + text = " "; + }; }; }; new GuiContainer(){ // Wave Animation Properties profile="inspectorStyleRolloutInnerProfile"; isContainer = "1"; - position = "-1 287"; - Extent = "185 85"; + position = "-1 360"; + Extent = "300 85"; HorizSizing = "width"; + new GuiBitmapCtrl(){ + position = "0 0"; + extent ="300 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiCheckboxCtrl() { Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; internalName = "WaveAnimation"; HorizSizing = "right"; VertSizing = "bottom"; - position = "4 -1"; - Extent = "155 16"; + position = "4 5"; + Extent = "200 16"; MinExtent = "8 2"; text = " Wave Animation"; Command = "MaterialEditorGui.updateAnimationFlags();"; groupNum = "-1"; + tooltipprofile = "ToolsGuiToolTipProfile"; }; new GuiCheckboxCtrl() { @@ -3886,26 +3912,27 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { internalName = "ScaleAnimation"; HorizSizing = "right"; VertSizing = "bottom"; - position = "139 24"; + position = "200 24"; Extent = "45 16"; MinExtent = "8 2"; - text = "Scale"; + text = " Scale"; Command = "MaterialEditorGui.updateAnimationFlags();"; groupNum = "-1"; + tooltipprofile = "ToolsGuiToolTipProfile"; }; new GuiTextCtrl() { - Profile = "ToolsGuiDefaultProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "10 22"; - Extent = "59 16"; + position = "1 22"; + Extent = "100 16"; text = " Wave Type"; }; new GuiContainer(){ // Wave Radio Button container profile = "ToolsGuiDefaultProfile"; internalName = "WaveButtonContainer"; - position = "72 25"; + position = "120 24"; Extent = "49 13"; isContainer = "1"; @@ -3920,6 +3947,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { hovertime = "1000"; groupNum = "0"; waveType = "Sin"; + tooltipprofile = "ToolsGuiToolTipProfile"; }; new GuiBitmapButtonCtrl(){ profile = "ToolsGuiDefaultProfile"; @@ -3932,6 +3960,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { hovertime = "1000"; groupNum = "0"; waveType = "Triangle"; + tooltipprofile = "ToolsGuiToolTipProfile"; }; new GuiBitmapButtonCtrl(){ profile = "ToolsGuiDefaultProfile"; @@ -3944,20 +3973,23 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { hovertime = "1000"; groupNum = "0"; waveType = "Square"; + tooltipprofile = "ToolsGuiToolTipProfile"; }; }; new GuiControl() { class = "AggregateControl"; position = "0 61"; - Extent = "187 20"; + Extent = "300 20"; + HorizSizing = "width"; + new GuiTextCtrl() { - Profile = "ToolsGuiDefaultProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "16 1"; - Extent = "64 16"; + position = "1 2"; + Extent = "100 16"; text = "Frequency"; }; @@ -3967,9 +3999,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "150 1"; + position = "140 1"; Extent = "34 18"; MinExtent = "8 2"; canSave = "1"; @@ -3997,20 +4029,20 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "72 3"; - Extent = "74 16"; + position = "120 4"; + Extent = "10 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateWaveFreq(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveFreq(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Changes Wave Frequency"; hovertime = "1000"; range = "0 10"; - ticks = "0"; + ticks = "9"; value = "0"; }; @@ -4019,23 +4051,24 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; position = "0 40"; - Extent = "187 20"; + Extent = "300 20"; + HorizSizing = "width"; new GuiTextCtrl() { - Profile = "ToolsGuiDefaultProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "21 1"; - Extent = "64 16"; + position = "1 2"; + Extent = "100 16"; text = "Amplitude"; }; new GuiTextEditCtrl() { // amplitude Profile = "ToolsGuiTextEditProfile"; internalName = "WaveTextEditAmp"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "150 1"; + position = "140 1"; Extent = "34 18"; Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveAmp();"; hovertime = "1000"; @@ -4047,20 +4080,20 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "72 3"; - Extent = "74 16"; + position = "120 4"; + Extent = "10 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateWaveAmp(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveAmp(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Changes Wave Amplitude"; hovertime = "1000"; range = "0 1"; - ticks = "0"; + ticks = "1"; value = "0"; }; @@ -4069,19 +4102,26 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiContainer(){ // image Sequence Animation Properties profile="inspectorStyleRolloutInnerProfile"; isContainer = "1"; - position = "-1 373"; - Extent = "185 66"; + position = "-1 480"; + Extent = "300 80"; HorizSizing = "width"; + new GuiBitmapCtrl(){ + position = "0 5"; + extent ="300 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiCheckboxCtrl() { Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; internalName = "SequenceAnimation"; HorizSizing = "right"; VertSizing = "bottom"; - position = "4 0"; - Extent = "130 16"; + position = "4 10"; + Extent = "200 16"; MinExtent = "8 2"; - text = "Image Sequence"; + text = " Image Sequence"; Command = "MaterialEditorGui.updateAnimationFlags();"; groupNum = "-1"; }; @@ -4089,15 +4129,16 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { new GuiControl() { class = "AggregateControl"; - position = "0 21"; - Extent = "187 20"; + position = "0 28"; + Extent = "300 20"; + HorizSizing = "width"; new GuiTextCtrl() { - Profile = "ToolsGuiDefaultProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "5 1"; - Extent = "64 16"; + position = "1 2"; + Extent = "100 16"; text = "Frames / Sec"; }; @@ -4107,9 +4148,9 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiTextEditProfile"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "150 1"; + position = "140 1"; Extent = "34 18"; MinExtent = "8 2"; canSave = "1"; @@ -4131,44 +4172,45 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "72 3"; - Extent = "74 16"; + position = "120 4"; + Extent = "10 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateSequenceFPS(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceFPS(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "How many frames to display per second."; hovertime = "1000"; range = "0 30"; - ticks = "0"; + ticks = "5"; value = "0"; }; }; new GuiControl() { class = "AggregateControl"; - position = "0 42"; - Extent = "187 20"; + position = "0 49"; + Extent = "300 20"; + HorizSizing = "width"; new GuiTextCtrl() { - Profile = "ToolsGuiDefaultProfile"; + profile = "ToolsGuiTextRightProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "33 1"; - Extent = "43 16"; + position = "1 2"; + Extent = "100 16"; text = "Frames"; }; new GuiTextEditCtrl() { // size Profile = "ToolsGuiTextEditProfile"; internalName = "SequenceTextEditSSS"; - HorizSizing = "right"; + HorizSizing = "left"; VertSizing = "bottom"; - position = "150 1"; + position = "140 1"; Extent = "34 18"; Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceSSS();"; hovertime = "1000"; @@ -4180,20 +4222,20 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiSliderProfile"; - HorizSizing = "right"; + HorizSizing = "width"; VertSizing = "bottom"; - position = "72 3"; - Extent = "74 16"; + position = "120 4"; + Extent = "10 16"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateSequenceSSS(true, true);"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceSSS(true, false);"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "How many frames in the sequence."; hovertime = "1000"; range = "0 100"; - ticks = "0"; + ticks = "9"; value = "0"; }; }; @@ -4208,7 +4250,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { VertSizing = "bottom"; Position = "0 0"; Extent = "202 0"; - Caption = "Advanced (all layers)"; + Caption = " Advanced (all layers)"; Expanded = false; Margin = "4 4 4 0"; DragSizable = false; @@ -4250,6 +4292,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"translucentBlendOp\",$ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Determines the type of blending to be applied on the transparent object."; hovertime = "1000"; Margin = "0 0 0 0"; @@ -4279,7 +4322,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"alphaTest\",$ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "When enabled, caused pixels under a specific alpha threshold to get discarded rather than be computed. Only valid for transparent objects."; hovertime = "1000"; text = "Alpha Threshold"; @@ -4310,7 +4353,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"alphaRef\",$ThisControl.getValue(), true, true );"; AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"alphaRef\",$ThisControl.getValue(), true, false );"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Sets the minimum transparency value that a pixel must have to be calculated. Anything below this value will simply not be rendered at all."; hovertime = "1000"; range = "0 255"; @@ -4358,7 +4401,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"translucentZWrite\",$ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Can be used to help force a proper Z-Ordering when Z-Ordering issues occur. Only valid for materials with Transparency."; hovertime = "1000"; text = "Transparent Z-Write"; @@ -4381,10 +4424,10 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"translucent\",$ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Sets material to use transparent blending modes."; hovertime = "1000"; - text = "Transparency"; + text = " Transparency"; groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; @@ -4404,7 +4447,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"castShadows\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Object casts shadows."; hovertime = "1000"; text = "Cast Shadows"; @@ -4427,7 +4470,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"castDynamicShadows\", $ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Object casts dynamic shadows."; hovertime = "1000"; text = "Dynamic Shadows"; @@ -4450,7 +4493,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { canSave = "1"; Visible = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"doubleSided\",$ThisControl.getValue());"; - tooltipprofile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Determines if this material will be rendered from both sides of the polygon, or just the \'front facing\' side. "; hovertime = "1000"; text = "Double Sided"; @@ -4545,7 +4588,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 122"; - Extent = "212 80"; + Extent = "212 100"; new GuiBitmapCtrl(){ position="2 2"; @@ -4611,7 +4654,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"showFootprints\", $ThisControl.getValue());"; - tooltipProfile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Enables Player footprints on surfaces that use this Material."; hovertime = "1000"; isContainer = "0"; @@ -4631,7 +4674,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { visible = "1"; active = "1"; Command = "MaterialEditorGui.updateActiveMaterial(\"showDust\", $ThisControl.getValue());"; - tooltipProfile = "ToolsGuiDefaultProfile"; + tooltipprofile = "ToolsGuiToolTipProfile"; tooltip = "Enables dust particles on surfaces that use this Material."; hovertime = "1000"; isContainer = "0"; @@ -4705,6 +4748,12 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { isContainer = "0"; internalName = "impactSoundPopUp"; }; + new GuiBitmapCtrl(){ + position="2 90"; + extent ="192 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; }; }; }; @@ -4726,6 +4775,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { hovertime = "1000"; bitmapAsset = "ToolsModule:folderUp_image"; tooltip = "Go back to previous editor"; + tooltipprofile = "ToolsGuiToolTipProfile"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -4745,6 +4795,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { hovertime = "1000"; bitmapAsset = "ToolsModule:open_file_n_image"; tooltip = "Open Existing Material"; + tooltipprofile = "ToolsGuiToolTipProfile"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -4767,6 +4818,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "-1"; text =""; tooltip = "Create New Material"; + tooltipprofile = "ToolsGuiToolTipProfile"; buttonType = "PushButton"; useMouseEvents = "0"; bitmap = "ToolsModule:new_n_image"; @@ -4789,6 +4841,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "-1"; text =""; tooltip = "Save Material (ALT S)"; + tooltipprofile = "ToolsGuiToolTipProfile"; buttonType = "PushButton"; useMouseEvents = "0"; bitmapAsset = "ToolsModule:save_icon_n_image"; @@ -4810,6 +4863,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { groupNum = "-1"; text =""; tooltip = "Lookup Material Instances"; + tooltipprofile = "ToolsGuiToolTipProfile"; buttonType = "PushButton"; useMouseEvents = "0"; bitmapAsset = "ToolsModule:visible_n_image"; @@ -4838,6 +4892,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Command = "MaterialEditorGui.refreshMaterial();"; hovertime = "1000"; tooltip = "Revert Material to Saved"; + tooltipprofile = "ToolsGuiToolTipProfile"; text = ""; bitmapAsset = "ToolsModule:reset_icon_n_image"; groupNum = "-1"; @@ -4860,6 +4915,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Command = "MaterialEditorGui.clearMaterial();"; hovertime = "1000"; tooltip = "Clear All Material Properties"; + tooltipprofile = "ToolsGuiToolTipProfile"; text = ""; bitmapAsset = "ToolsModule:clear_icon_n_image"; groupNum = "-1"; @@ -4882,6 +4938,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { Command = ""; hovertime = "1000"; tooltip = "Delete Material from File"; + tooltipprofile = "ToolsGuiToolTipProfile"; text = ""; bitmapAsset = "ToolsModule:delete_n_image"; groupNum = "-1"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui.orig b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui.orig new file mode 100644 index 000000000..f7365bbc4 --- /dev/null +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui.orig @@ -0,0 +1,5315 @@ +//--- OBJECT WRITE BEGIN --- +$guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { + canSaveDynamicFields = "0"; + internalName = "MatEdPropertiesWindowContainer"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "1024 768"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + + new GuiWindowCollapseCtrl(MaterialEditorPropertiesWindow) { + canSaveDynamicFields = "0"; + internalName = "MatEdPropertiesWindow"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiWindowProfile"; + HorizSizing = "windowRelative"; + VertSizing = "windowRelative"; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(MaterialEditorPreviewWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 316"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MaterialEditorPreviewWindow.extent, 1) + 6; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "4 4 4 4"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + resizeWidth = "1"; + resizeHeight = "1"; + canMove = "1"; + canClose = "0"; + canMinimize = "0"; + canMaximize = "0"; + closeCommand = "MaterialEditorPropertiesWindow.setVisible(false);"; + minSize = "50 50"; + EdgeSnap = "1"; + text = ":: Material Editor - Properties"; + + new GuiContainer(MaterialEditorGuiContent){ // Client group + isContainer = "1"; + Docking = "Client"; + Margin = "3 1 3 3"; + Position = "4 24"; + Extent = "200 668"; + + new GuiContainer(){ // container to prevent transparent collapsing from effecting children. + Position = "0 21"; + Extent = "200 39"; + isContainer = "1"; + HorizSizing = "width"; + Visible = "1"; + + new GuiContainer(MatEdMaterialMode){ // Edit Mode + Position = "0 0"; + Extent = "200 39"; + isContainer = "1"; + HorizSizing = "width"; + Visible = "0"; + + new GuiTextCtrl(){ + Position = "10 1"; + Extent = "50 16"; + Profile = "ToolsGuiTextRightProfile"; + text = "Material:"; + HorizSizing = "right"; + VertSizing = "bottom"; + }; + new GuiTextEditCtrl(){ + internalName = "selMaterialName"; + Profile = "ToolsGuiTextEditProfile"; + AltCommand = "MaterialEditorGui.setMaterialDirty();MaterialEditorGui.updateActiveMaterialName($ThisControl.getText());"; // needs hookup + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "70 0"; + Extent = "125 18"; + text = ""; + }; + new GuiTextCtrl(){ + Position = "10 20"; + Extent = "50 18"; + Profile = "ToolsGuiTextRightProfile"; + text = "Target:"; + HorizSizing = "right"; + VertSizing = "bottom"; + }; + new GuiTextCtrl(){ // mesh name should not include the path + internalName = "selMaterialMapTo"; // will use the first child found with that name if called from a previous parent even if it is invisable. + Position = "70 20"; + Extent = "125 16"; + HorizSizing = "width"; + VertSizing = "bottom"; + text = ""; + }; + }; + new GuiContainer(MatEdTargetMode){ // Selection Mode + Position = "0 0"; + Extent = "202 39"; + isContainer = "1"; + HorizSizing = "width"; + Visible = "1"; + + new GuiBitmapButtonCtrl(){ + Profile = "ToolsGuiButtonProfile"; + Position = "186 23"; + Extent = "17 17"; + HorizSizing = "left"; + tooltip = "Swap material on the object with existing"; + bitmapAsset = "ToolsModule:change_material_btn_n_image"; + command = "MaterialEditorGui.swapMaterial();"; + }; + + new GuiTextEditCtrl(){ + internalName = "selMaterialName"; + Profile = "ToolsGuiTextEditProfile"; + AltCommand = "MaterialEditorGui.setMaterialDirty();MaterialEditorGui.updateActiveMaterialName($ThisControl.getText());"; // needs hookup + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "76 21"; + Extent = "107 18"; + text = "myMaterial 1"; + HorizSizing = "width"; + }; + new GuiTextCtrl(){ // mesh name should not include the path + internalName = "selMaterialMapTo"; + Profile = "ToolsGuiTextRightProfile"; + Position = "1 1"; + Extent = "70 16"; + HorizSizing = "right"; + VertSizing = "bottom"; + text = ""; + }; + new GuiTextCtrl(){ + Profile = "ToolsGuiTextRightProfile"; + Position = "1 21"; + Extent = "70 16"; + HorizSizing = "right"; + VertSizing = "bottom"; + text = "Material"; + }; + new GuiPopupMenuCtrlEx(SubMaterialSelector){ // needs hookup will show the name of the current mesh Maped to + Profile = "ToolsGuiPopUpMenuProfile"; + Position = "76 0"; + Extent = "126 17"; + HorizSizing = "width"; + VertSizing = "bottom"; + text = ""; + tooltip = "Target Material"; + Command = "SubMaterialSelector.onSelect();"; + reverseTextList = "0"; + }; + }; + }; + + // make this shorter //////////////////////////////////////////////////////////////////////////// + new GuiScrollCtrl(matEd_scrollControl) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiScrollProfile"; + HorizSizing = "width"; + VertSizing = "height"; //height + position = "0 65"; + Extent = "202 603"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + willFirstRespond = "1"; + hScrollBar = "alwaysOff"; + vScrollBar = "dynamic"; + lockHorizScroll = "true"; + lockVertScroll = "false"; + constantThumbHeight = "0"; + childMargin = "0 0"; + + new GuiStackControl(MatEd_scrollContents) { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 0"; + Extent = "187 0"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiPopUpMenuCtrl() { + canSaveDynamicFields = "0"; + internalName = "MaterialLayerCtrl"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiPopUpMenuTabProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 0"; + Extent = "112 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.changeLayer( $ThisControl.getText() );"; + ToolTip = "Changes the material layer being edited"; + hovertime = "1000"; + text = "Layer 0"; + maxLength = "1024"; + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + }; + new GuiRolloutCtrl() { + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "185 0"; + Caption = " Basic Texture Maps"; + Margin = "4 4 4 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "185 16"; + MinExtent = "16 16"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiContainer(){ // Diffuse Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 21"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorDiffuseMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "diffuseMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"diffuse\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the Active Diffuse Map for this layer"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 0"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Diffuse Map"; + maxLength = "1024"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "diffuseMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "134 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiSwatchButtonCtrl() { + canSaveDynamicFields = "0"; + internalName = "colorTintSwatch"; + Enabled = "1"; + isContainer = "0"; + Profile = "GuiInspectorSwatchButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "55 33"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "getColorF(materialEd_PreviewMaterial.diffuseColor[MaterialEditorGui.currentLayer], \"MaterialEditorGui.updateColorMultiply\");"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiTextCtrl(){ + profile="ToolsGuiDefaultProfile"; + text = "Color"; + position = "74 34"; + Extent = "30 15"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command = "MaterialEditorGui.updateTextureMap(\"diffuse\", 1);"; + + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"diffuse\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + new GuiBitmapCtrl(){ + position="6 75"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset = "ToolsModule:separator_v_image"; + }; + new GuiContainer(){ // Normal Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 77"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorNormalMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "normalMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 0"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Normal Map"; + maxLength = "1024"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"normal\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Normal Map for this layer."; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "normalMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command = "MaterialEditorGui.updateTextureMap(\"normal\", 1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"normal\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + }; + }; + new GuiRolloutCtrl() { // Light Influence Properties Group + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "300 0"; + Caption = " Light Influence Maps"; + Expanded = false; + Margin = "4 4 4 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "300 16"; + MinExtent = "16 16"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiContainer(){ + profile = "ToolsGuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 120"; + HorizSizing = "left"; + + new GuiTextCtrl() { + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 4"; + Extent = "100 16"; + text = "Roughness"; + Profile = "ToolsGuiTextRightProfile"; + }; + + new GuiTextCtrl() { + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 26"; + Extent = "100 16"; + text = "Metalness"; + Profile = "ToolsGuiTextRightProfile"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 4"; + Extent = "180 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "RoughnessSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"Roughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"Roughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Sets Roughness."; + hovertime = "1000"; + range = "0 1"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "RoughnessTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "35 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"Roughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + }; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 26"; + Extent = "180 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "MetalnessSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"Metalness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"Metalness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Sets Metalness."; + hovertime = "1000"; + range = "0 1"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "MetalnessTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "35 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"Metalness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + }; + }; + new GuiContainer(){ // spec Map options + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 60"; + Extent = "290 24"; + HorizSizing = "right"; + + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "isSRGBCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "5 0"; + Extent = "57 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"isSRGb[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Treat as sRGB" NL "(Substance Designer Workaround)"; + hovertime = "1000"; + text = " Is sRGB"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "invertRoughnessCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "120 0"; + Extent = "107 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"invertRoughness[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = " Invert Rougness" NL "(Treat as Roughest = 1.0 instead of 0.0)"; + hovertime = "1000"; + text = " Invert Roughness"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + }; + new GuiBitmapCtrl(){ + position="6 90"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset = "ToolsModule:separator_v_image"; + }; + }; + + new GuiContainer(){ // spec Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 280"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorORMConfigMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "ORMConfigMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 0"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "ORM (Config) Map"; + maxLength = "1024"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the packed Specular Map for this layer" NL " - Red: Roughness" NL " - Green: Ambient Occlusion" NL " - Blue: Metalness"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "ORMConfigMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"ORMConfig\",0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + // todo: fix indent + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:separator_v_image"; + position = "6 75"; + extent = "175 2"; + minExtent = "8 2"; + horizSizing = "width"; + visible = "1"; + }; + new GuiContainer(){ // save composite Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "0 344"; + Extent = "185 20"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "86 2"; + Extent = "100 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Save Composite:"; + maxLength = "1024"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:save_icon_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "175 2"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.saveCompositeMap();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + }; +<<<<<<< HEAD + new GuiBitmapCtrl(){ + position = "6 75"; + extent ="192 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiContainer() { +======= + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:separator_v_image"; + wrap = "0"; + position = "6 75"; + extent = "175 2"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; new GuiContainer() { +>>>>>>> upstream/development + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "6 364"; + extent = "185 52"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + className = "materialEditorAOMapContainer"; + + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "aoMapDisplayBitmap"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { +<<<<<<< HEAD + text = "Roughness Map"; +======= + text = "ao"; +>>>>>>> upstream/development + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 0"; + extent = "85 8"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "EditorTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Change the Roughness Map for this layer."; +======= + Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);"; + tooltipProfile = "GuiToolTipProfile"; + tooltip = "Change the AO map for this layer."; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "None"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 17"; + extent = "193 17"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "aoMapNameText"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Edit"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "134 34"; + extent = "40 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:delete_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "177 34"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + Command = "MaterialEditorGui.updateTextureMap(\"rough\",0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + Command = "MaterialEditorGui.updateTextureMap(\"ao\",0);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(aoChanBtn0) { + text = "R"; + groupNum = "2"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "160 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioRedProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setRoughChan(0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setAOChan(0);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(aoChanBtn1) { + text = "G"; + groupNum = "2"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "184 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioGreenProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setRoughChan(1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setAOChan(1);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(aoChanBtn2) { + text = "B"; + groupNum = "2"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "208 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioBlueProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setRoughChan(2);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setAOChan(2);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(aoChanBtn3) { + text = "A"; + groupNum = "2"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "232 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setRoughChan(3);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setAOChan(3);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + }; + new GuiContainer() { + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "6 364"; + extent = "185 52"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + className = "materialEditorRoughnessMapContainer"; + + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "roughMapDisplayBitmap"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { +<<<<<<< HEAD + text = "AO Map"; +======= + text = "Roughness"; +>>>>>>> upstream/development + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 0"; + extent = "35 8"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "EditorTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Change the AO Map for this layer."; +======= + Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);"; + tooltipProfile = "GuiToolTipProfile"; + tooltip = "Change the Roughness map for this layer."; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "None"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 17"; + extent = "193 17"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "roughMapNameText"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Edit"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "134 34"; + extent = "40 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + Command = "MaterialEditorGui.updateTextureMap(\"ao\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + Command = "MaterialEditorGui.updateTextureMap(\"rough\",1);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:delete_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "177 34"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + Command = "MaterialEditorGui.updateTextureMap(\"ao\",0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + Command = "MaterialEditorGui.updateTextureMap(\"rough\",0);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(roughChanBtn0) { + text = "R"; + groupNum = "1"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "160 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioRedProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setAOChan(0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setRoughChan(0);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(roughChanBtn1) { + text = "G"; + groupNum = "1"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "184 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioGreenProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setAOChan(1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setRoughChan(1);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(roughChanBtn2) { + text = "B"; + groupNum = "1"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "208 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioBlueProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setAOChan(2);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setRoughChan(2);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(roughChanBtn3) { + text = "A"; + groupNum = "1"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "232 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioProfile"; + visible = "1"; + active = "1"; +<<<<<<< HEAD + command = "MaterialEditorGui.setAOChan(3);"; + tooltipProfile = "ToolsGuiToolTipProfile"; +======= + command = "MaterialEditorGui.setRoughChan(3);"; + tooltipProfile = "GuiToolTipProfile"; +>>>>>>> upstream/development + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + }; + new GuiContainer() { + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "6 364"; + extent = "185 52"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + className = "materialEditorMetalMapContainer"; + + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "metalMapDisplayBitmap"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "Metal Map"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 0"; + extent = "35 8"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "EditorTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"metal\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Change the Metalness Map for this layer."; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "None"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 17"; + extent = "193 17"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "metalMapNameText"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Edit"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "134 34"; + extent = "40 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"metal\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:delete_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "177 34"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"metal\",0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(metalChanBtn0) { + text = "R"; + groupNum = "3"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "160 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioRedProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.setMetalChan(0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(metalChanBtn1) { + text = "G"; + groupNum = "3"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "184 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioGreenProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.setMetalChan(1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(metalChanBtn2) { + text = "B"; + groupNum = "3"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "208 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioBlueProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.setMetalChan(2);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiRadioCtrl(metalChanBtn3) { + text = "A"; + groupNum = "3"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + position = "232 7"; + extent = "20 10"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiRadioProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.setMetalChan(3);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + }; + new GuiBitmapCtrl(){ + position="6 74"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset = "ToolsModule:separator_v_image"; + }; + new GuiContainer() { + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "6 364"; + extent = "185 80"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "GuiDefaultProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + className = "materialEditorGlowMapContainer"; + + new GuiBitmapCtrl() { + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "glowMapDisplayBitmap"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "Glow Map"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 0"; + extent = "35 8"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "EditorTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "1 1"; + extent = "48 48"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"glow\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Change the Glowness Map for this layer."; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiTextCtrl() { + text = "None"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "56 17"; + extent = "143 17"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiTextProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "glowMapNameText"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Edit"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "134 34"; + extent = "40 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"glow\",1);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl() { + bitmapAsset = "ToolsModule:delete_n_image"; + bitmapMode = "Stretched"; + autoFitExtents = "0"; + useModifiers = "0"; + useStates = "1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "177 34"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"glow\",0);"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + // todo: correct indent + new GuiTextCtrl() { + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 54"; + Extent = "100 24"; + text = "Glow Multiply"; + Profile = "ToolsGuiTextRightProfile"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 54"; + Extent = "100 30"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "GlowMulSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 6"; + Extent = "5 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Sets GlowMul."; + hovertime = "1000"; + range = "0 20"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "GlowMulTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "35 3"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"GlowMul[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + }; + }; + }; + }; + }; + new GuiRolloutCtrl(advancedTextureMapsRollout) { + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "185 0"; + Caption = " Advanced Texture Maps"; + Expanded = false; + Margin = "4 4 4 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "185 16"; + MinExtent = "16 16"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiContainer(){ // Detail Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 193"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorDetailMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "detailMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"detail\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Detail Map for this layer."; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + + new GuiTextCtrl() { // Detailmap Scale text + profile="ToolsGuiDefaultProfile"; + position = "56 34"; + Extent = "29 16"; + text ="Scale"; + }; + + new GuiTextEditCtrl() { // Detailmap Scale + profile="ToolsGuiNumericTextEditProfile"; + internalName = "detailScaleTextEdit"; + position = "87 33"; + Extent = "28 18"; + text ="0"; + maxLength = "2"; + AltCommand = "MaterialEditorGui.updateDetailScale($ThisControl.getText());"; + }; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 -3"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Detail Map"; + maxLength = "1024"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "detailMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command = "MaterialEditorGui.updateTextureMap(\"detail\", 1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"detail\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + new GuiBitmapCtrl(){ + position="6 246"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + + new GuiContainer(){ // Detail Normal Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 136"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorDetailNormalMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "detailNormalMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"detailNormal\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Detail Normal Map for this layer."; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + + new GuiTextCtrl() { // Detail Normal Map Strength text + profile="ToolsGuiDefaultProfile"; + position = "56 34"; + Extent = "29 16"; + text ="Strength"; + }; + + new GuiTextEditCtrl() { // Detail Normal Map Strength + profile="ToolsGuiNumericTextEditProfile"; + internalName = "detailNormalStrengthTextEdit"; + position = "87 33"; + Extent = "28 18"; + text ="0"; + maxLength = "3"; + AltCommand = "MaterialEditorGui.updateDetailNormalStrength($ThisControl.getText());"; + }; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 -3"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Detail Normal Map"; + maxLength = "1024"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "detailNormalMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command = "MaterialEditorGui.updateTextureMap(\"detailNormal\", 1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"detailNormal\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + new GuiBitmapCtrl(){ + position="6 189"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + + new GuiContainer(){ // Overlay Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 136"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorOverlayMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "overlayMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"overlay\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Overlay Map for this layer."; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 -3"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Overlay Map"; + maxLength = "1024"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "overlayMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command = "MaterialEditorGui.updateTextureMap(\"overlay\", 1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"overlay\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + new GuiBitmapCtrl(){ + position="6 189"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiContainer(){ // light Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 250"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorLightMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "lightMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 -3"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Light Map"; + maxLength = "1024"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"light\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Light Map for this layer."; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "lightMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command="MaterialEditorGui.updateTextureMap(\"light\", 1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"light\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + new GuiBitmapCtrl(){ + position="6 303"; + extent ="175 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiContainer(){ // tone Map + profile="ToolsGuiDefaultProfile"; + isContainer = "1"; + position = "6 307"; + Extent = "185 52"; + HorizSizing = "width"; + className = "materialEditorToneMapContainer"; + + new GuiBitmapCtrl() { + canSaveDynamicFields = "0"; + internalName = "toneMapDisplayBitmap"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:unknownImage_image"; + wrap = "0"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "56 -3"; + Extent = "72 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Tone Map"; + maxLength = "1024"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 1"; + Extent = "48 48"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"tone\", 1);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change the active Tone Map for this layer."; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + internalName = "toneMapNameText"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "56 16"; + Extent = "143 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(){ + profile="ToolsGuiButtonProfile"; + text ="Edit"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "134 34"; + Extent = "40 16"; + buttonType = "PushButton"; + command="MaterialEditorGui.updateTextureMap(\"tone\", 1);"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "177 34"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateTextureMap(\"tone\", 0);"; + hovertime = "1000"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:delete_n_image"; + }; + }; + }; + }; + new GuiRolloutCtrl(accumulationPropertiesRollout) { + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "300 0"; + Caption = " Accumulation Properties"; + Expanded = false; + Margin = "-1 0 0 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "GuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "300 16"; + MinExtent = "16 16"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiContainer(){ // enable/disable + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "8 7"; + Extent = "180 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateAccuCheckbox($ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Enables the use of Pixel Specular for this layer."; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + text = " Enable Pixel Specular"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + }; + + new GuiContainer(){ // scale + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "100 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Scale"; + maxLength = "1024"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuScaleSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "GuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"accuScale[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuScale[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "GuiDefaultProfile"; + ToolTip = "Sets the scale of the accu map."; + hovertime = "1000"; + range = "0.03125 32"; + ticks = "0"; + value = "1"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuScaleTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "24 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuScale[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "1"; + maxLength = "3"; + }; + }; + }; + + new GuiContainer(){ // direction + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "100 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Direction"; + maxLength = "1024"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuDirectionSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "GuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"accuDirection[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuDirection[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "GuiDefaultProfile"; + ToolTip = "Sets the direction of the accu map."; + hovertime = "1000"; + range = "-1 1"; + ticks = "0"; + value = "-1"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuDirectionTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "24 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuDirection[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "-1"; + maxLength = "3"; + }; + }; + }; + new GuiContainer(){ // strength + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "100 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Strength"; + maxLength = "1024"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuStrengthSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "GuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"accuStrength[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuStrength[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "GuiDefaultProfile"; + ToolTip = "Sets the strength of the accu map."; + hovertime = "1000"; + range = "0 1"; + ticks = "0"; + value = "0.6"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuStrengthTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "24 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuStrength[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0.6"; + maxLength = "3"; + }; + }; + }; + new GuiContainer(){ // coverage + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "100 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Coverage"; + maxLength = "1024"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuCoverageSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "GuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"accuCoverage[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuCoverage[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "GuiDefaultProfile"; + ToolTip = "Sets the coverage of the accu map."; + hovertime = "1000"; + range = "0 2"; + ticks = "0"; + value = "1"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuCoverageTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "24 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuCoverage[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "1"; + maxLength = "3"; + }; + }; + }; + new GuiContainer(){ // specular + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "100 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Specular scale"; + maxLength = "1024"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 3"; + Extent = "100 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuSpecularSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "GuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"accuSpecular[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuSpecular[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue(), true, false);"; + tooltipprofile = "GuiDefaultProfile"; + ToolTip = "Sets the specular scale over the accu map."; + hovertime = "1000"; + range = "0 2"; + ticks = "0"; + value = "1"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "accuSpecularTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "24 0"; + Extent = "30 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"accuSpecular[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "1"; + maxLength = "3"; + }; + }; + }; + new GuiContainer(){ // empty space + profile="GuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 10"; + HorizSizing = "width"; + }; + }; + }; + new GuiRolloutCtrl(lightingPropertiesRollout) { + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "300 0"; + Caption = " Lighting Properties"; + Expanded = false; + Margin = "-1 0 0 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "300 16"; + MinExtent = "16 16"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiContainer(){ // glow emissive + profile = "ToolsGuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 40"; + HorizSizing = "width"; + + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "glowCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "120 4"; + Extent = "70 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"glow[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Determines if this layer will Glow or not."; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + text = " Glow"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "emissiveCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "12 4"; + Extent = "70 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"emissive[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue());"; + ToolTip = "Emissive causes an object to not be affected by lights. Good for light sources."; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + text = " Emissive"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + }; + new GuiContainer(){ // parallax + profile = "ToolsGuiTransparentProfile"; + isContainer = "1"; + position = "0 20"; + Extent = "300 24"; + HorizSizing = "width"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "100 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Parallax"; + maxLength = "1024"; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "120 3"; + Extent = "180 20"; + HorizSizing = "width"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "parallaxSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 2"; + Extent = "10 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"parallaxScale[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue(), true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateActiveMaterial(\"parallaxScale[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue(), true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Parallax Scale"; + hovertime = "1000"; + range = "0 1"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "parallaxTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "24 0"; + Extent = "30 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateActiveMaterial(\"parallaxScale[\" @ MaterialEditorGui.currentLayer @ \"]\",$ThisControl.getValue());"; + hovertime = "1000"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + maxLength = "3"; + }; + }; + }; + new GuiContainer(){ + profile = "ToolsGuiTransparentProfile"; + isContainer = "1"; + position = "0 0"; + Extent = "300 84"; + HorizSizing = "width"; + + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "useAnisoCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "12 8"; + Extent = "120 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"useAnisotropic[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Enables the use of anisotropic filtering for this layer."; + hovertime = "1000"; + text = " Anisotropic filtering"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "vertLitCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "12 31"; + Extent = "102 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"vertLit[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Enables the use of vertex lighting for this layer."; + hovertime = "1000"; + text = " Vertex lit"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "vertLitCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "120 31"; + Extent = "120 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"vertColor[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Multiply vertex colors with diffuse colors for this layer."; + hovertime = "1000"; + text = " Vertex colors"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "subSurfaceCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "12 56"; + Extent = "79 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"subSurface[\" @ MaterialEditorGui.currentLayer @ \"]\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Enables the use of subsurface scattering for this layer."; + hovertime = "1000"; + text = " Sub Surface"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + }; + }; + }; + new GuiRolloutCtrl(materialAnimationPropertiesRollout) { + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "185 0"; + Caption = " Animation Properties"; + Expanded = false; + Margin = "-1 0 0 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "185 16"; + MinExtent = "16 16"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + + new GuiContainer(){ // Rotation Animation Properties + profile="inspectorStyleRolloutInnerProfile"; + isContainer = "1"; + position = "-1 96"; + Extent = "185 94"; + HorizSizing = "width"; + + new GuiCheckboxCtrl() { + canSaveDynamicFields = "0"; + internalName = "RotationAnimation"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "4 -1"; + Extent = "112 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateAnimationFlags();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Rotation Animation"; + maxLength = "1024"; + }; + + new GuiControl(){ + class = "AggregateControl"; + position = "0 29"; + Extent = "135 20"; + + new GuiTextCtrl(){ // u + profile = "ToolsGuiTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "11 1"; + Extent = "12 16"; + text = "U"; + }; + + new GuiSliderCtrl() { // u + Profile = "ToolsGuiSliderProfile"; + internalName = "RotationSliderU"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "25 2"; + Extent = "68 15"; + Command = "MaterialEditorGui.updateRotationOffset(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationOffset(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change U Scroll Direction"; + hovertime = "1000"; + range = "-1 0"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl(){ // u + internalName = "RotationTextEditU"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "98 0"; + Extent = "34 18"; + text = "0"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl);"; + }; + }; + + + + new GuiControl() { + class = "AggregateControl"; + position = "0 50"; + Extent = "135 20"; + + new GuiTextCtrl(){ // v + profile = "ToolsGuiTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "11 1"; + Extent = "12 16"; + text = "V"; + }; + + new GuiSliderCtrl() { // v + Profile = "ToolsGuiSliderProfile"; + internalName = "RotationSliderV"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "25 2"; + Extent = "68 15"; + Command = "MaterialEditorGui.updateRotationOffset(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationOffset(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change V Scroll Direction"; + hovertime = "1000"; + range = "-1 0"; + ticks = "0"; + value = "0"; + }; + + new GuiTextEditCtrl(){ // v + internalName = "RotationTextEditV"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "98 0"; + Extent = "34 18"; + text = "0"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationOffset();"; + }; + }; + new GuiTextCtrl(){ // Pivot Point + HorizSizing = "right"; + VertSizing = "bottom"; + position = "98 16"; + Extent = "34 16"; + text = "Pivot"; + }; + new GuiBitmapCtrl(){ + HorizSizing = "right"; + VertSizing = "bottom"; + position = "136 20"; + Extent = "48 48"; + isContainer = true; + bitmapAsset=""; + + new GuiBitmapCtrl(){ + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 0"; + Extent = "48 48"; + bitmapAsset="ToolsModule:cubemapBtnBorder_n_image"; + }; + + new GuiBitmapCtrl(){ //horizontal bar + internalName = "RotationCrosshair"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "20 20"; + Extent = "7 7"; + MinExtent = "0 0"; + bitmapAsset="ToolsModule:crosshair_blue_image"; + }; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "0 70"; + Extent = "187 20"; + + new GuiTextCtrl(){ // Speed + profile = "ToolsGuiTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "11 0"; + Extent = "43 16"; + text = "Speed"; + }; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "RotationSpeedSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "49 3"; + Extent = "95 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateRotationSpeed(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationSpeed(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Scrolling Speed"; + hovertime = "1000"; + range = "-10 10"; + ticks = "0"; + value = "0"; + }; + + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "RotationSpeedTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "150 1"; + Extent = "34 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateRotationSpeed();"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + maxLength = "1024"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + }; + }; + }; + new GuiContainer(){ // Scroll Animation Properties + profile="inspectorStyleRolloutInnerProfile"; + isContainer = "1"; + position = "-1 191"; + Extent = "185 94"; + HorizSizing = "width"; + + new GuiCheckboxCtrl() { + canSaveDynamicFields = "0"; + internalName = "ScrollAnimation"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "4 -1"; + Extent = "112 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + Command = "MaterialEditorGui.updateAnimationFlags();"; + text = "Scroll Animation"; + maxLength = "1024"; + }; + + + new GuiControl(){ + class = "AggregateControl"; + position = "0 29"; + Extent = "135 20"; + + new GuiTextCtrl(){ // u + profile = "ToolsGuiTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "11 1"; + Extent = "12 16"; + text = "U"; + }; + + new GuiSliderCtrl() { // u + Profile = "ToolsGuiSliderProfile"; + internalName = "ScrollSliderU"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "25 2"; + Extent = "68 15"; + Command = "MaterialEditorGui.updateScrollOffset(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change U Scroll Direction"; + hovertime = "1000"; + range = "-1 1"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl(){ // u + internalName = "ScrollTextEditU"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "98 0"; + Extent = "34 18"; + text = "0"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset();"; + }; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "0 50"; + Extent = "135 20"; + + new GuiTextCtrl(){ // v + profile = "ToolsGuiTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "11 1"; + Extent = "12 16"; + text = "V"; + }; + + new GuiSliderCtrl() { // v + Profile = "ToolsGuiSliderProfile"; + internalName = "ScrollSliderV"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "25 2"; + Extent = "68 15"; + Command = "MaterialEditorGui.updateScrollOffset(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Change V Scroll Direction"; + hovertime = "1000"; + range = "-1 1"; + ticks = "0"; + value = "0"; + }; + new GuiTextEditCtrl(){ // v + internalName = "ScrollTextEditV"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "98 0"; + Extent = "34 18"; + text = "0"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollOffset();"; + }; + }; + new GuiTextCtrl(){ // Direction Offset + HorizSizing = "right"; + VertSizing = "bottom"; + position = "98 16"; + Extent = "34 16"; + text = "Offset"; + }; + new GuiBitmapCtrl(){ + HorizSizing = "right"; + VertSizing = "bottom"; + position = "136 20"; + Extent = "48 48"; + isContainer = true; + bitmapAsset=""; + + new GuiBitmapCtrl(){ + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 0"; + Extent = "48 48"; + bitmapAsset="ToolsModule:cubemapBtnBorder_n_image"; + }; + new GuiBitmapCtrl(){ //vertical bar + HorizSizing = "right"; + VertSizing = "bottom"; + position = "20 20"; + Extent = "7 7"; + MinExtent = "7 7"; + bitmapAsset="ToolsModule:crosshair_image"; + }; + new GuiBitmapCtrl(){ //horizontal bar + internalName = "ScrollCrosshair"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "20 20"; + Extent = "7 7"; + MinExtent = "0 0"; + bitmapAsset="ToolsModule:crosshair_blue_image"; + }; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "0 70"; + Extent = "187 20"; + + new GuiTextCtrl(){ // Speed + profile = "ToolsGuiTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "11 0"; + Extent = "43 16"; + text = "Speed"; + }; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "ScrollSpeedSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "49 3"; + Extent = "95 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateScrollSpeed(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollSpeed(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Scrolling Speed"; + hovertime = "1000"; + range = "0 10"; + ticks = "0"; + value = "0"; + }; + + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "ScrollSpeedTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "150 1"; + Extent = "34 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl);MaterialEditorGui.updateScrollSpeed();"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + maxLength = "1024"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + }; + }; + }; + new GuiContainer(){ // Wave Animation Properties + profile="inspectorStyleRolloutInnerProfile"; + isContainer = "1"; + position = "-1 287"; + Extent = "185 85"; + HorizSizing = "width"; + + new GuiCheckboxCtrl() { + Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; + internalName = "WaveAnimation"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "4 -1"; + Extent = "155 16"; + MinExtent = "8 2"; + text = " Wave Animation"; + Command = "MaterialEditorGui.updateAnimationFlags();"; + groupNum = "-1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + }; + + new GuiCheckboxCtrl() { + Profile = "ToolsGuiCheckBoxProfile"; + internalName = "ScaleAnimation"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "139 24"; + Extent = "45 16"; + MinExtent = "8 2"; + text = "Scale"; + Command = "MaterialEditorGui.updateAnimationFlags();"; + groupNum = "-1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + }; + + new GuiTextCtrl() { + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "10 22"; + Extent = "59 16"; + text = " Wave Type"; + }; + new GuiContainer(){ // Wave Radio Button container + profile = "ToolsGuiDefaultProfile"; + internalName = "WaveButtonContainer"; + position = "72 25"; + Extent = "49 13"; + isContainer = "1"; + + new GuiBitmapButtonCtrl(){ + profile = "ToolsGuiDefaultProfile"; + buttonType = "RadioButton"; + position = "1 0"; + Extent = "13 13"; + bitmapAsset = "ToolsModule:wav_sine_n_image"; + command = "MaterialEditorGui.updateWaveType();"; + tooltip="Sine Wave"; + hovertime = "1000"; + groupNum = "0"; + waveType = "Sin"; + tooltipprofile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl(){ + profile = "ToolsGuiDefaultProfile"; + buttonType = "RadioButton"; + position = "17 0"; + Extent = "13 13"; + bitmapAsset = "ToolsModule:wav_triangle_n_image"; + command = "MaterialEditorGui.updateWaveType();"; + tooltip="Triangle Wave"; + hovertime = "1000"; + groupNum = "0"; + waveType = "Triangle"; + tooltipprofile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl(){ + profile = "ToolsGuiDefaultProfile"; + buttonType = "RadioButton"; + position = "33 0"; + Extent = "13 13"; + bitmapAsset = "ToolsModule:wav_square_n_image"; + command = "MaterialEditorGui.updateWaveType();"; + tooltip="Square Wave"; + hovertime = "1000"; + groupNum = "0"; + waveType = "Square"; + tooltipprofile = "ToolsGuiToolTipProfile"; + }; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "0 61"; + Extent = "187 20"; + + new GuiTextCtrl() { + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "16 1"; + Extent = "64 16"; + text = "Frequency"; + }; + + new GuiTextEditCtrl() { // frequence + canSaveDynamicFields = "0"; + internalName = "WaveTextEditFreq"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "150 1"; + Extent = "34 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveFreq();"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + maxLength = "1024"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + }; + new GuiSliderCtrl() { // freqency + canSaveDynamicFields = "0"; + internalName = "WaveSliderFreq"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "72 3"; + Extent = "74 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateWaveFreq(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveFreq(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Changes Wave Frequency"; + hovertime = "1000"; + range = "0 10"; + ticks = "0"; + value = "0"; + }; + + }; + + new GuiControl() { + class = "AggregateControl"; + position = "0 40"; + Extent = "187 20"; + + new GuiTextCtrl() { + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "21 1"; + Extent = "64 16"; + text = "Amplitude"; + }; + + new GuiTextEditCtrl() { // amplitude + Profile = "ToolsGuiTextEditProfile"; + internalName = "WaveTextEditAmp"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "150 1"; + Extent = "34 18"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveAmp();"; + hovertime = "1000"; + text = "0"; + }; + new GuiSliderCtrl() { // amplitude + canSaveDynamicFields = "0"; + internalName = "WaveSliderAmp"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "72 3"; + Extent = "74 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateWaveAmp(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateWaveAmp(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Changes Wave Amplitude"; + hovertime = "1000"; + range = "0 1"; + ticks = "0"; + value = "0"; + }; + + }; + }; + new GuiContainer(){ // image Sequence Animation Properties + profile="inspectorStyleRolloutInnerProfile"; + isContainer = "1"; + position = "-1 373"; + Extent = "185 66"; + HorizSizing = "width"; + + new GuiCheckboxCtrl() { + Profile = "ToolsGuiInspectorCheckBoxTitleProfile"; + internalName = "SequenceAnimation"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "4 0"; + Extent = "130 16"; + MinExtent = "8 2"; + text = "Image Sequence"; + Command = "MaterialEditorGui.updateAnimationFlags();"; + groupNum = "-1"; + }; + + + new GuiControl() { + class = "AggregateControl"; + position = "0 21"; + Extent = "187 20"; + + new GuiTextCtrl() { + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "5 1"; + Extent = "64 16"; + text = "Frames / Sec"; + }; + + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "SequenceTextEditFPS"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "150 1"; + Extent = "34 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceFPS();"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "0"; + maxLength = "1024"; + }; + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "SequenceSliderFPS"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "72 3"; + Extent = "74 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateSequenceFPS(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceFPS(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "How many frames to display per second."; + hovertime = "1000"; + range = "0 30"; + ticks = "0"; + value = "0"; + }; + }; + + new GuiControl() { + class = "AggregateControl"; + position = "0 42"; + Extent = "187 20"; + + new GuiTextCtrl() { + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "33 1"; + Extent = "43 16"; + text = "Frames"; + }; + + new GuiTextEditCtrl() { // size + Profile = "ToolsGuiTextEditProfile"; + internalName = "SequenceTextEditSSS"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "150 1"; + Extent = "34 18"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceSSS();"; + hovertime = "1000"; + text = "0"; + }; + new GuiSliderCtrl() { //size + canSaveDynamicFields = "0"; + internalName = "SequenceSliderSSS"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "72 3"; + Extent = "74 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateSequenceSSS(true, true);"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateSequenceSSS(true, false);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "How many frames in the sequence."; + hovertime = "1000"; + range = "0 100"; + ticks = "0"; + value = "0"; + }; + }; + }; + }; + }; + new GuiRolloutCtrl(materialAdvancedPropertiesRollout) { // Advanced Properties Group + class = "BehaviorQuickEditRollout"; + superclass = LBQuickEditRollout; + Profile = "GuiRolloutProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "202 0"; + Caption = " Advanced (all layers)"; + Expanded = false; + Margin = "4 4 4 0"; + DragSizable = false; + container = true; + + new GuiStackControl() { + StackingType = "Vertical"; + HorizStacking = "Left to Right"; + VertStacking = "Top to Bottom"; + Padding = "0"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "1 3"; + Extent = "202 16"; + + new GuiContainer(){ // Transparentcy Properties + Profile = "ToolsGuiDefaultProfile"; + isContainer = "1"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "210 89"; + + new GuiPopUpMenuCtrl() { + internalName = "blendingTypePopUp"; + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiPopUpMenuProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "3 2"; + Extent = "83 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"translucentBlendOp\",$ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Determines the type of blending to be applied on the transparent object."; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "LerpAlpha"; + maxLength = "1024"; + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "alphaTestCheckBox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "3 39"; + Extent = "106 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"alphaTest\",$ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "When enabled, caused pixels under a specific alpha threshold to get discarded rather than be computed. Only valid for transparent objects."; + hovertime = "1000"; + text = "Alpha Threshold"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + + new GuiControl() { + class = "AggregateControl"; + HorizSizing = "width"; + position = "100 39"; + Extent = "187 20"; + + new GuiSliderCtrl() { + canSaveDynamicFields = "0"; + internalName = "alphaRefSlider"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiSliderProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "0 3"; + Extent = "45 14"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"alphaRef\",$ThisControl.getValue(), true, true );"; + AltCommand = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"alphaRef\",$ThisControl.getValue(), true, false );"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Sets the minimum transparency value that a pixel must have to be calculated. Anything below this value will simply not be rendered at all."; + hovertime = "1000"; + range = "0 255"; + ticks = "0"; + value = "0"; + }; + + new GuiTextEditCtrl() { + canSaveDynamicFields = "0"; + internalName = "alphaRefTextEdit"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "49 0"; + Extent = "27 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "$ThisControl.getParent().updateFromChild($ThisControl); MaterialEditorGui.updateActiveMaterial(\"alphaRef\",$ThisControl.getValue());"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "100"; + maxLength = "1024"; + }; + }; + + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "transZWriteCheckBox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "3 23"; + Extent = "112 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"translucentZWrite\",$ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Can be used to help force a proper Z-Ordering when Z-Ordering issues occur. Only valid for materials with Transparency."; + hovertime = "1000"; + text = "Transparent Z-Write"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "translucentCheckbox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "89 3"; + Extent = "107 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"translucent\",$ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Sets material to use transparent blending modes."; + hovertime = "1000"; + text = " Transparency"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "castShadows"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "3 55"; + Extent = "112 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"castShadows\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Object casts shadows."; + hovertime = "1000"; + text = "Cast Shadows"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "castDynamicShadows"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "3 70"; + Extent = "112 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"castDynamicShadows\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Object casts dynamic shadows."; + hovertime = "1000"; + text = "Dynamic Shadows"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + new GuiCheckBoxCtrl() { + canSaveDynamicFields = "0"; + internalName = "doubleSidedCheckBox"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiCheckBoxProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "105 55"; + Extent = "85 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"doubleSided\",$ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Determines if this material will be rendered from both sides of the polygon, or just the \'front facing\' side. "; + hovertime = "1000"; + text = "Double Sided"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + useInactiveState = "0"; + }; + }; + new GuiContainer(){ // Reflection Properties + Profile = "ToolsGuiDefaultProfile"; + isContainer = "1"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 95"; + Extent = "212 25"; + visible = "0"; + + new GuiBitmapCtrl(){ + position="2 2"; + extent ="192 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + // Reflection Properties Text + new GuiTextCtrl(matEd_reflectionPropertiesText) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "91 6"; + Extent = "80 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Reflection"; + maxLength = "1024"; + }; + + new GuiPopUpMenuCtrl() { + canSaveDynamicFields = "0"; + internalName = "reflectionTypePopUp"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiPopUpMenuProfile"; + HorizSizing = "width"; + VertSizing = "bottom"; + position = "3 6"; + Extent = "84 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.updateReflectionType($ThisControl.getText());"; + ToolTip = "Determines the type of blending to be applied on the transparent object."; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + }; + new GuiButtonCtrl(matEd_cubemapEditBtn){ + internalName = "matEd_cubemapEditBtn"; + profile ="ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "143 6 28"; + Extent = "33 18"; + Command = "MaterialEditorGui.showCubemapEditor();"; + text = "Edit"; + }; + }; + new GuiContainer(){ // Behavior Properties + Profile = "ToolsGuiDefaultProfile"; + isContainer = "1"; + HorizSizing = "width"; + VertSizing = "bottom"; + Position = "0 122"; + Extent = "212 100"; + + new GuiBitmapCtrl(){ + position="2 2"; + extent ="192 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + new GuiTextCtrl() { + text = "Effect Colors[0:1]"; + position = "1 6"; + extent = "86 15"; + profile = "ToolsGuiDefaultProfile"; + }; + new GuiSwatchButtonCtrl() { + color = "1 1 1 1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "89 6"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiInspectorSwatchButtonProfile"; + visible = "1"; + active = "1"; + command = "getColorF(materialEd_PreviewMaterial.effectColor[0], \"MaterialEditorGui.updateEffectColor0\");"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "effectColor0Swatch"; + }; + new GuiSwatchButtonCtrl() { + color = "1 1 1 1"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "109 6"; + extent = "16 16"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "GuiInspectorSwatchButtonProfile"; + visible = "1"; + active = "1"; + command = "getColorF(materialEd_PreviewMaterial.effectColor[1], \"MaterialEditorGui.updateEffectColor1\");"; + tooltipProfile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + internalName = "effectColor1Swatch"; + }; + new GuiCheckBoxCtrl() { + text = "Show Footprints"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "1 24"; + extent = "93 16"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiCheckBoxProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"showFootprints\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + tooltip = "Enables Player footprints on surfaces that use this Material."; + hovertime = "1000"; + isContainer = "0"; + internalName = "showFootprintsCheckbox"; + }; + new GuiCheckBoxCtrl() { + text = "Show Dust"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "110 24"; + extent = "68 16"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiCheckBoxProfile"; + visible = "1"; + active = "1"; + Command = "MaterialEditorGui.updateActiveMaterial(\"showDust\", $ThisControl.getValue());"; + tooltipprofile = "ToolsGuiToolTipProfile"; + tooltip = "Enables dust particles on surfaces that use this Material."; + hovertime = "1000"; + isContainer = "0"; + internalName = "showDustCheckbox"; + }; + new GuiTextCtrl() { + text = "Footstep sound"; + position = "1 43"; + extent = "77 15"; + profile = "ToolsGuiDefaultProfile"; + }; + new GuiPopUpMenuCtrl() { + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + text = "None"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "80 42"; + extent = "105 18"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiPopUpMenuProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.updateBehaviorSound(\"Footstep\", $ThisControl.getText());"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Determines the footstep sound to use when the Player walks on this Material."; + hovertime = "1000"; + isContainer = "0"; + internalName = "footstepSoundPopUp"; + }; + new GuiTextCtrl() { + text = "Impact sound"; + position = "1 63"; + extent = "64 15"; + profile = "ToolsGuiDefaultProfile"; + }; + new GuiPopUpMenuCtrl() { + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + text = "None"; + maxLength = "1024"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + position = "80 62"; + extent = "105 18"; + minExtent = "8 2"; + horizSizing = "width"; + vertSizing = "bottom"; + profile = "ToolsGuiPopUpMenuProfile"; + visible = "1"; + active = "1"; + command = "MaterialEditorGui.updateBehaviorSound(\"Impact\", $ThisControl.getText());"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Determines the impact sound to use when an object collides with this Material."; + hovertime = "1000"; + isContainer = "0"; + internalName = "impactSoundPopUp"; + }; + new GuiBitmapCtrl(){ + position="2 90"; + extent ="192 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + }; + }; + }; + }; + + }; + new GuiBitmapButtonCtrl(MatEd_phoBreadcrumb) { //Go back to previous editor + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "-1 0"; + Extent = "20 19"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "0"; + //Command = "materialSelector.showDialog(\"MaterialEditorGui.switchMaterial\");"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:folderUp_image"; + tooltip = "Go back to previous editor"; + tooltipprofile = "ToolsGuiToolTipProfile"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MatEd_editMaterial) { //Select and Edit an Existing Material + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "66 1"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "AssetBrowser.showDialog(\"MaterialAsset\", \"MaterialEditorGui.selectMaterialAsset\");"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:open_file_n_image"; + tooltip = "Open Existing Material"; + tooltipprofile = "ToolsGuiToolTipProfile"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + // New Button + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "86 1"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.createNewMaterial();"; + hovertime = "1000"; + groupNum = "-1"; + text =""; + tooltip = "Create New Material"; + tooltipprofile = "ToolsGuiToolTipProfile"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmap = "ToolsModule:new_n_image"; + }; + // Save Button + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "106 1"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.save();"; + hovertime = "1000"; + groupNum = "-1"; + text =""; + tooltip = "Save Material (ALT S)"; + tooltipprofile = "ToolsGuiToolTipProfile"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:save_icon_n_image"; + }; + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "126 1"; + Extent = "16 16"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.lookupMaterialInstances();"; + hovertime = "1000"; + groupNum = "-1"; + text =""; + tooltip = "Lookup Material Instances"; + tooltipprofile = "ToolsGuiToolTipProfile"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:visible_n_image"; + }; + new GuiBitmapCtrl(){ + position = "147 1"; + Extent = "2 16"; + minExtent = "2 16"; + HorizSizing = "left"; + VertSizing = "bottom"; + bitmapAsset = "ToolsModule:separator_h_image"; + }; + // Revert Material + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "151 1"; + Extent = "17 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.refreshMaterial();"; + hovertime = "1000"; + tooltip = "Revert Material to Saved"; + tooltipprofile = "ToolsGuiToolTipProfile"; + text = ""; + bitmapAsset = "ToolsModule:reset_icon_n_image"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + // Clear Material + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "168 1"; + Extent = "17 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.clearMaterial();"; + hovertime = "1000"; + tooltip = "Clear All Material Properties"; + tooltipprofile = "ToolsGuiToolTipProfile"; + text = ""; + bitmapAsset = "ToolsModule:clear_icon_n_image"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + // Delete Material + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = "185 1"; + Extent = "17 17"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = ""; + hovertime = "1000"; + tooltip = "Delete Material from File"; + tooltipprofile = "ToolsGuiToolTipProfile"; + text = ""; + bitmapAsset = "ToolsModule:delete_n_image"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + Command = "MaterialEditorGui.deleteMaterial();"; + }; + }; + }; +}; + +// Here are all of the other gui elements that were included in the original gui============================================ +// EDIT: Instead of showing the faded bitmap, were going to just go ahead and push the controls; that way they are sitting +// on top of the editor gui, while being nonmodal +new GuiControl(matEdNonModalGroup, EditorGuiGroup) { + canSaveDynamicFields = "0"; + Profile = "ToolsGuiOverlayProfile"; + Enabled = "1"; + isContainer = "1"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "1024 768"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + + new GuiWindowCtrl(matEdSaveDialog) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiWindowProfile"; + HorizSizing = "center"; + VertSizing = "center"; + position = "197 221"; + Extent = "336 104"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "0"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + resizeWidth = "0"; + resizeHeight = "0"; + canMove = "0"; + canClose = "0"; + canMinimize = "0"; + canMaximize = "0"; + minSize = "50 50"; + EdgeSnap = "1"; + text = "Material Not Saved!"; + + new GuiButtonCtrl(matEd_notSavedWindow_Save) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "8 69"; + Extent = "121 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "matEdSaveDialog.dialogSave();"; + hovertime = "1000"; + text = "Save"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiTextCtrl(matEd_materialNotSavedText) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextCenterProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "7 35"; + Extent = "318 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "This material has unsaved changes. Do you wish to save?"; + maxLength = "1024"; + }; + new GuiButtonCtrl(matEd_notSavedWindow_DontSave) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "157 69"; + Extent = "80 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "matEdSaveDialog.dialogDontSave();"; + hovertime = "1000"; + text = "Don\'t Save"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiButtonCtrl(matEd_notSavedWindow_Cancel) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "245 69"; + Extent = "80 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "matEdSaveDialog.dialogCancel();"; + hovertime = "1000"; + text = "Cancel"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + }; + new GuiWindowCtrl(matEd_changeCategoryDialog) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiWindowProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "288 144"; + Extent = "248 133"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "0"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + resizeWidth = "0"; + resizeHeight = "0"; + canMove = "0"; + canClose = "0"; + canMinimize = "0"; + canMaximize = "0"; + minSize = "50 50"; + EdgeSnap = "1"; + text = "Change Material Category"; + + new GuiPopUpMenuCtrl(matEd_changeCategory_categoryList) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiPopUpMenuProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "10 32"; + Extent = "183 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + maxLength = "1024"; + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + }; + new GuiButtonCtrl(matEd_changeCategory_okayBtn) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "10 97"; + Extent = "137 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.okayChangeCategoryDialog();"; + hovertime = "1000"; + text = "Update Category"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiButtonCtrl(matEd_changeCategory_cancelBtn) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "159 97"; + Extent = "80 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.cancelChangeCategoryDialog();"; + hovertime = "1000"; + text = "Cancel"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiButtonCtrl(matEd_changeCategory_addCatBtn) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "200 60"; + Extent = "39 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.addCategory();"; + hovertime = "1000"; + text = "New"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiTextEditCtrl(matEd_changeCategory_catNameEntry) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextEditProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "10 60"; + Extent = "183 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + maxLength = "1024"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + password = "0"; + passwordMask = "*"; + }; + new GuiWindowCtrl(matEd_changeCategory_ErrorDialog) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiWindowProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "8 18"; + Extent = "232 113"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "0"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + resizeWidth = "0"; + resizeHeight = "0"; + canMove = "0"; + canClose = "0"; + canMinimize = "0"; + canMaximize = "0"; + minSize = "50 50"; + EdgeSnap = "1"; + text = "Category Change Error"; + + new GuiButtonCtrl(matEd_changeCategory_Error_Button) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "72 81"; + Extent = "80 24"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "MaterialEditorGui.okChangeCategoryErrorDialog();"; + hovertime = "1000"; + text = "Ok"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiTextCtrl(matEd_changeCategory_error_Text) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextCenterProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "8 31"; + Extent = "215 40"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Text goes here!"; + maxLength = "1024"; + }; + }; + }; +}; +//--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_d.png b/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_d.png index 081e06e98..8a310889d 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_d.png and b/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_d.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_h.png b/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_h.png index 88795fd44..717a7f730 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_h.png and b/Templates/BaseGame/game/tools/materialEditor/gui/materialSelectorIcon_h.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_d.png b/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_d.png index 81aa03f2d..8885c54c6 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_d.png and b/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_h.png b/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_h.png index 5ccbd9835..b8bf5f221 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_h.png and b/Templates/BaseGame/game/tools/materialEditor/gui/mesh-selector-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/new-material_d.png b/Templates/BaseGame/game/tools/materialEditor/gui/new-material_d.png index 681da25dc..3dc842d82 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/new-material_d.png and b/Templates/BaseGame/game/tools/materialEditor/gui/new-material_d.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/new-material_h.png b/Templates/BaseGame/game/tools/materialEditor/gui/new-material_h.png index d13a6e4a5..56294ca8a 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/new-material_h.png and b/Templates/BaseGame/game/tools/materialEditor/gui/new-material_h.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/new-material_n.png b/Templates/BaseGame/game/tools/materialEditor/gui/new-material_n.png index 4c509a909..fc717b914 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/new-material_n.png and b/Templates/BaseGame/game/tools/materialEditor/gui/new-material_n.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/unknownImage.png b/Templates/BaseGame/game/tools/materialEditor/gui/unknownImage.png index 21d75f311..f96116196 100644 Binary files a/Templates/BaseGame/game/tools/materialEditor/gui/unknownImage.png and b/Templates/BaseGame/game/tools/materialEditor/gui/unknownImage.png differ diff --git a/Templates/BaseGame/game/tools/materialEditor/main.tscript b/Templates/BaseGame/game/tools/materialEditor/main.tscript index 3b7fa5c4b..7f50b9329 100644 --- a/Templates/BaseGame/game/tools/materialEditor/main.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/main.tscript @@ -140,6 +140,9 @@ function MaterialEditorPlugin::onActivated( %this ) MaterialEditorGui.open(); %this.map.push(); + // Do resize the windows at start + MaterialEditorGui.onWake(); + Parent::onActivated(%this); } diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index 0ffb9eac3..518dfdcd6 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -21,6 +21,7 @@ //----------------------------------------------------------------------------- // Material Editor originally created by Dave Calabrese and Travis Vroman of Gaslight Studios + $MaterialEditor::emptyMaterialImage = "ToolsModule:unknownImage_image"; function MaterialEditorGui::establishMaterials(%this) @@ -249,6 +250,266 @@ function MaterialEditorGui::selectMaterialAsset(%this, %assetId) AssetBrowser.editAsset(%assetId); } +//----------------------------------------------------------------------------- + +function MaterialEditorGui::onWake(%this) +{ + %fixedWindow = MaterialEditorPreviewWindow; + %fluidWindow = MaterialEditorPropertiesWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function MaterialEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = MaterialEditorPreviewWindow; + %fluidWindow = MaterialEditorPropertiesWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function MaterialEditorPreviewWindow::onMouseDragged(%this) +{ + %parent = MaterialEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function MaterialEditorPropertiesWindow::onMouseDragged(%this) +{ + %parent = MaterialEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function MaterialEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = MaterialEditorPreviewWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function MaterialEditorGui::dockSidePanel() +{ + %parent = MaterialEditorGui; + %fixedWindow = MaterialEditorPreviewWindow; + %fluidWindow = MaterialEditorPropertiesWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + MaterialEditorGui_UnDockBtn.Visible = "1"; + MaterialEditorGui_DockBtn.Visible = "0"; + + MaterialEditorGui_showBtn.Visible = "0"; + MaterialEditorGui_hideBtn.Visible = "1"; +} + +function MaterialEditorGui::releaseSidePanel() +{ + %parent = MaterialEditorGui; + %fixedWindow = MaterialEditorPreviewWindow; + %fluidWindow = MaterialEditorPropertiesWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + MaterialEditorGui_UnDockBtn.Visible = "0"; + MaterialEditorGui_DockBtn.Visible = "1"; + + MaterialEditorGui_showBtn.Visible = "0"; + MaterialEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function MaterialEditorGui::hideSidePanel() +{ + %parent = MaterialEditorGui; + %fixedWindow = MaterialEditorPreviewWindow; + %fluidWindow = MaterialEditorPropertiesWindow; + + MaterialEditorGui_showBtn.Visible = "1"; + MaterialEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + matEd_previewPanel.Visible = "0"; + matEd_quickPreview_Popup.Visible = "0"; + + %fluidWindow.text = ""; + MaterialEditorGuiContent.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function MaterialEditorGui::showSidePanel() +{ + %parent = MaterialEditorGui; + %fixedWindow = MaterialEditorPreviewWindow; + %fluidWindow = MaterialEditorPropertiesWindow; + + MaterialEditorGui_showBtn.Visible = "0"; + MaterialEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + // hide the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + matEd_previewPanel.Visible = "1"; + matEd_quickPreview_Popup.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + MaterialEditorGuiContent.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- + + //============================================================================== // SubMaterial(Material Target) -- Supports different ways to grab the // material from the dropdown list. We're here either because- @@ -522,8 +783,8 @@ function MaterialEditorGui::isMatEditorMaterial(%this, %material) function MaterialEditorGui::setMaterialNotDirty(%this) { - %propertyText = "Material Properties"; - %previewText = "Material Preview"; + %propertyText = ":: Material Editor - Properties"; + %previewText = ":: Material Editor - Preview"; MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPreviewWindow.text = %previewText; @@ -533,8 +794,8 @@ function MaterialEditorGui::setMaterialNotDirty(%this) function MaterialEditorGui::setMaterialDirty(%this) { - %propertyText = "Material Properties *"; - %previewText = "Material Preview *"; + %propertyText = ":: Material Editor - Properties *"; + %previewText = ":: Material Editor - Preview *"; MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPreviewWindow.text = %previewText; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui index 6d50e7fbc..501c8f576 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui @@ -40,6 +40,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { HoverNodeColor = "255 255 255 255"; new GuiWindowCollapseCtrl(MeshRoadEditorTreeWindow) { + canCollapse = "0"; internalName = ""; canSaveDynamicFields = "0"; Enabled = "1"; @@ -47,10 +48,10 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 167"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 300"; + MinExtent = "300 100"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -63,16 +64,16 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = "Mesh Roads"; + text = ":: Mesh Road Editor - Roads"; - new GuiContainer(){ + new GuiContainer(MeshRoadEditorRoadsPanel){ profile = "ToolsGuiDefaultProfile"; Position = "5 25"; Extent = "200 120"; @@ -140,8 +141,102 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { }; }; }; + // window / panel buttons + new GuiBitmapButtonCtrl(MeshRoadEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "MeshRoadEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MeshRoadEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "MeshRoadEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MeshRoadEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "MeshRoadEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MeshRoadEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "MeshRoadEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; new GuiWindowCollapseCtrl(MeshRoadEditorOptionsWindow) { + canCollapse = "0"; internalName = "Window"; canSaveDynamicFields = "0"; Enabled = "1"; @@ -149,10 +244,10 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MeshRoadEditorTreeWindow.extent, 1) - 2; - Extent = "210 530"; - MinExtent = "210 298"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MeshRoadEditorTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(MeshRoadEditorTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 240"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -165,16 +260,16 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Mesh Road Editor - Properties"; - new GuiContainer(){ //Node Properties + new GuiContainer(MeshRoadNodesPanel){ //Node Properties isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -185,7 +280,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { Margin = "3 3 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -266,7 +361,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { AltCommand = "MeshRoadEditorGui.editNodeDetails();"; }; }; - new GuiContainer(){ //Mesh Road Properties + new GuiContainer(MeshRoadPropertiesPanel){ //Mesh Road Properties isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -277,7 +372,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { Margin = "0 0 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -285,7 +380,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { text = "Mesh Road Properties"; }; }; - new GuiScrollCtrl() { + new GuiScrollCtrl(MeshRoadInspectorPanel) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; @@ -336,21 +431,21 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { dividerMargin = "5"; }; }; - new GuiMLTextCtrl(MeshFieldInfoControl) { + new GuiMLTextCtrl(MeshRoadFieldInfoControl) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "0"; Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - Position = "1 485"; - Extent = "202 42"; + position = "8" SPC getWord(MeshRoadEditorOptionsWindow.extent, 1) - 40; + Extent = "320 42"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; - lineSpacing = "2"; + lineSpacing = "1"; allowColorChars = "0"; maxChars = "-1"; useURLMouseCursor = "0"; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript index b29185746..8f472816b 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript @@ -27,11 +27,275 @@ $MeshRoad::showRoad = true; $MeshRoad::showRoadProfile = false; $MeshRoad::breakAngle = 3.0; + +// MeshRoadEditorGui Script Methods + +//----------------------------------------------------------------------------- + +function MeshRoadEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function MeshRoadEditorTreeWindow::onMouseDragged(%this) +{ + %parent = MeshRoadEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function MeshRoadEditorOptionsWindow::onMouseDragged(%this) +{ + %parent = MeshRoadEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function MeshRoadEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = MeshRoadEditorOptionsWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function MeshRoadEditorGui::dockSidePanel() +{ + %parent = MeshRoadEditorGui; + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + MeshRoadEditorGui_UnDockBtn.Visible = "1"; + MeshRoadEditorGui_DockBtn.Visible = "0"; + + MeshRoadEditorGui_showBtn.Visible = "0"; + MeshRoadEditorGui_hideBtn.Visible = "1"; +} + +function MeshRoadEditorGui::releaseSidePanel() +{ + %parent = MeshRoadEditorGui; + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + MeshRoadEditorGui_UnDockBtn.Visible = "0"; + MeshRoadEditorGui_DockBtn.Visible = "1"; + + MeshRoadEditorGui_showBtn.Visible = "0"; + MeshRoadEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function MeshRoadEditorGui::hideSidePanel() +{ + %parent = MeshRoadEditorGui; + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + + MeshRoadEditorGui_showBtn.Visible = "1"; + MeshRoadEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + MeshRoadEditorRoadsPanel.Visible = "0"; + + %fluidWindow.text = ""; + MeshRoadNodesPanel.Visible = "0"; + MeshRoadPropertiesPanel.Visible = "0"; + MeshRoadInspectorPanel.Visible = "0"; + MeshRoadFieldInfoControl.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function MeshRoadEditorGui::showSidePanel() +{ + %parent = MeshRoadEditorGui; + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + + MeshRoadEditorGui_showBtn.Visible = "0"; + MeshRoadEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + // hide the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + MeshRoadEditorRoadsPanel.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + MeshRoadNodesPanel.Visible = "1"; + MeshRoadPropertiesPanel.Visible = "1"; + MeshRoadInspectorPanel.Visible = "1"; + MeshRoadFieldInfoControl.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//------------------------------------------------------------------------------ function MeshRoadEditorGui::onWake( %this ) { $MeshRoad::EditorOpen = true; + // Maximize windows when set ------------------------------------ + %fixedWindow = MeshRoadEditorTreeWindow; + %fluidWindow = MeshRoadEditorOptionsWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } + // -------------------------------------------------------------- + %count = EWorldEditor.getSelectionSize(); for ( %i = 0; %i < %count; %i++ ) { @@ -123,7 +387,6 @@ function MeshRoadEditorGui::onNodeSelected( %this, %nodeIdx ) } } - function MeshRoadEditorGui::onNodeModified( %this, %nodeIdx ) { MeshRoadEditorOptionsWindow-->position.setValue( %this.getNodePosition() ); @@ -134,7 +397,6 @@ function MeshRoadEditorGui::onNodeModified( %this, %nodeIdx ) function MeshRoadEditorGui::editNodeDetails( %this ) { - %this.setNodePosition( MeshRoadEditorOptionsWindow-->position.getText() ); %this.setNodeNormal( MeshRoadEditorOptionsWindow-->rotation.getText() ); %this.setNodeWidth( MeshRoadEditorOptionsWindow-->width.getText() ); @@ -172,7 +434,7 @@ function MeshRoadInspector::inspect( %this, %obj ) if ( isObject( %obj ) ) %name = %obj.getName(); else - MeshFieldInfoControl.setText( "" ); + MeshRoadFieldInfoControl.setText( "" ); //RiverInspectorNameEdit.setValue( %name ); Parent::inspect( %this, %obj ); @@ -186,7 +448,7 @@ function MeshRoadInspector::onInspectorFieldModified( %this, %object, %fieldName function MeshRoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - MeshFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + MeshRoadFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function MeshRoadTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_d.png b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_d.png index 356cf1f41..d9c261a07 100644 Binary files a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_d.png and b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_d.png differ diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_h.png b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_h.png index e4d4e1cc0..39a578403 100644 Binary files a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_h.png and b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_h.png differ diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_n.png b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_n.png index 5817fb9e7..b59e8b7ff 100644 Binary files a/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_n.png and b/Templates/BaseGame/game/tools/missionAreaEditor/images/mission-area_n.png differ diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui index 487b49c7f..b1ca56a32 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui @@ -36,6 +36,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) GizmoProfile = "GlobalGizmoProfile"; new GuiWindowCollapseCtrl(MissionAreaEditorTerrainWindow) { + canCollapse = "0"; internalName = ""; canSaveDynamicFields = "0"; Enabled = "1"; @@ -43,10 +44,10 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 230"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 300"; + MinExtent = "300 100"; canSave = "1"; isDecoy = "0"; Visible = "1"; @@ -60,18 +61,18 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Mission Area"; + text = ":: Mission Area"; - new GuiContainer(){ + new GuiContainer(MissionAreaEditorTerrainPanel){ profile = "ToolsGuiDefaultProfile"; Position = "5 25"; - Extent = "200 200"; + Extent = "300 300"; Docking = "Client"; Margin = "3 1 3 3 "; HorizSizing = "width"; @@ -82,11 +83,11 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) canSaveDynamicFields = "0"; isContainer = "0"; Profile = "EditorDefaultProfile"; - HorizSizing = "width"; - VertSizing = "height"; + HorizSizing = "center"; + VertSizing = "center"; position = "0 0"; - Extent = "200 200"; - MinExtent = "8 8"; + Extent = "256 256"; + MinExtent = "256 256"; canSave = "1"; Visible = "1"; hovertime = "1000"; @@ -107,8 +108,103 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) handleBitmapAsset = "ToolsModule:DefaultHandle_image"; }; }; + // window / panel buttons + new GuiBitmapButtonCtrl(MissionAreaEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "MissionAreaEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MissionAreaEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "MissionAreaEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MissionAreaEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "MissionAreaEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(MissionAreaEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "MissionAreaEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; + new GuiWindowCollapseCtrl(MissionAreaEditorPropertiesWindow) { + canCollapse = "0"; internalName = "Window"; canSaveDynamicFields = "0"; Enabled = "1"; @@ -116,10 +212,10 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MissionAreaEditorTerrainWindow.extent, 1) - 2; - Extent = "210 466"; - MinExtent = "210 300"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(MissionAreaEditorTerrainWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(MissionAreaEditorTerrainWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 300"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -132,15 +228,15 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Mission Area Editor - Properties"; - new GuiContainer(){ //Mission Area Properties + new GuiContainer(MissionAreaEditorPropertiesPanel){ //Mission Area Properties isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -151,16 +247,16 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) Margin = "0 0 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; Extent = "121 18"; - text = "Mission Area Properties"; + text = "Inspector"; }; }; - new GuiScrollCtrl() { + new GuiScrollCtrl(MissionAreaInspectorPanel) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; @@ -211,13 +307,13 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) dividerMargin = "5"; }; }; - new GuiContainer(){ //Mission Area Properties + new GuiContainer(MissionAreaFieldInfoControlPanel){ //Mission Area Properties isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; HorizSizing = "width"; VertSizing = "bottom"; Position = "1 0"; - Extent = "202 42"; + Extent = "320 42"; Docking = "Bottom"; Margin = "0 0 3 3"; @@ -228,8 +324,8 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - Position = "0 0"; - Extent = "202 42"; + Position = "8 0"; + Extent = "320 42"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript index 3b13670aa..00fb08f31 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript @@ -19,6 +19,266 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. //----------------------------------------------------------------------------- + +//------------------------------------------------------------------------------ + +function MissionAreaEditorGui::onWake(%this) +{ + %fixedWindow = MissionAreaEditorTerrainWindow; + %fluidWindow = MissionAreaEditorPropertiesWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function MissionAreaEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = MissionAreaEditorTerrainWindow; + %fluidWindow = MissionAreaEditorPropertiesWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function MissionAreaEditorTerrainWindow::onMouseDragged(%this) +{ + %parent = MissionAreaEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function MissionAreaEditorPropertiesWindow::onMouseDragged(%this) +{ + %parent = MissionAreaEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function MissionAreaEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = MissionAreaEditorPropertiesWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function MissionAreaEditorGui::dockSidePanel() +{ + %parent = MissionAreaEditorGui; + %fixedWindow = MissionAreaEditorTerrainWindow; + %fluidWindow = MissionAreaEditorPropertiesWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + MissionAreaEditorGui_UnDockBtn.Visible = "1"; + MissionAreaEditorGui_DockBtn.Visible = "0"; + + MissionAreaEditorGui_showBtn.Visible = "0"; + MissionAreaEditorGui_hideBtn.Visible = "1"; +} + +function MissionAreaEditorGui::releaseSidePanel() +{ + %parent = MissionAreaEditorGui; + %fixedWindow = MissionAreaEditorTerrainWindow; + %fluidWindow = MissionAreaEditorPropertiesWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + MissionAreaEditorGui_UnDockBtn.Visible = "0"; + MissionAreaEditorGui_DockBtn.Visible = "1"; + + MissionAreaEditorGui_showBtn.Visible = "0"; + MissionAreaEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function MissionAreaEditorGui::hideSidePanel() +{ + %parent = MissionAreaEditorGui; + %fixedWindow = MissionAreaEditorTerrainWindow; + %fluidWindow = MissionAreaEditorPropertiesWindow; + + MissionAreaEditorGui_showBtn.Visible = "1"; + MissionAreaEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + MissionAreaEditorTerrainPanel.Visible = "0"; + + %fluidWindow.text = ""; + MissionAreaEditorPropertiesPanel.Visible = "0"; + MissionAreaInspectorPanel.Visible = "0"; + MissionAreaFieldInfoControlPanel.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function MissionAreaEditorGui::showSidePanel() +{ + %parent = MissionAreaEditorGui; + %fixedWindow = MissionAreaEditorTerrainWindow; + %fluidWindow = MissionAreaEditorPropertiesWindow; + + MissionAreaEditorGui_showBtn.Visible = "0"; + MissionAreaEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + MissionAreaEditorTerrainPanel.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + MissionAreaEditorPropertiesPanel.Visible = "1"; + MissionAreaInspectorPanel.Visible = "1"; + MissionAreaFieldInfoControlPanel.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//------------------------------------------------------------------------------ function MissionAreaEditorGui::onEditorActivated( %this ) { @@ -80,5 +340,5 @@ function MissionAreaInspector::onInspectorFieldModified( %this, %object, %fieldN function MissionAreaInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - MissionAreaFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + MissionAreaFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui index f415a43fa..cb0b0f098 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui @@ -43,10 +43,10 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 167"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 180"; + MinExtent = "300 120"; canSave = "1"; isDecoy = "0"; Visible = "1"; @@ -66,7 +66,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Navigation"; + text = ":: Navigation Editor"; new GuiButtonCtrl() { Profile = "ToolsGuiButtonProfile"; @@ -79,7 +79,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { command = "Canvas.pushDialog(CreateNewNavMeshDlg);"; }; - new GuiContainer(){ + new GuiContainer(NavEditorTreePanel){ profile = GuiDefaultProfile; Position = "5 25"; Extent = "200 120"; @@ -147,6 +147,99 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { }; }; }; + // window / panel buttons + new GuiBitmapButtonCtrl(NavEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "NavEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(NavEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "NavEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(NavEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "NavEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(NavEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "NavEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; new GuiWindowCollapseCtrl(NavEditorOptionsWindow) { internalName = "Window"; @@ -156,10 +249,10 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(NavEditorTreeWindow.extent, 1) - 2; - Extent = "210 530"; - MinExtent = "210 300"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(NavEditorTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(NavEditorTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 300"; canSave = "1"; Visible = "1"; tooltipprofile = "GuiToolTipProfile"; @@ -178,9 +271,9 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Navigation Editor - Properties"; - new GuiContainer(){ //Actions + new GuiContainer(NavEditorOptionsPanel){ //Actions isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -192,7 +285,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { internalName = "ActionsBox"; new GuiTextCtrl(){ - Profile = "ToolsGuiTextProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -397,7 +490,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { }; }; }; - new GuiContainer(){ + new GuiContainer(NavEditorInspector){ isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -408,17 +501,16 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { Margin = "0 0 3 3"; new GuiTextCtrl(){ - profile = "ToolsGuiTextProfile"; - Profile = "GuiDefaultProfile"; + profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; Extent = "121 18"; - text = "Properties"; + text = "Inspector"; }; }; - new GuiScrollCtrl() { + new GuiScrollCtrl(NavEditorOptScroll) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; @@ -836,8 +928,8 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - Position = "1 485"; - Extent = "202 42"; + position = "8" SPC getWord(NavEditorOptionsWindow.extent, 1) - 40; + Extent = "330 42"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-cover_d.png b/Templates/BaseGame/game/tools/navEditor/images/nav-cover_d.png index 973f360eb..cb965769b 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-cover_d.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-cover_d.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-cover_h.png b/Templates/BaseGame/game/tools/navEditor/images/nav-cover_h.png index 91ce9fbdb..90fbe1688 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-cover_h.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-cover_h.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-cover_n.png b/Templates/BaseGame/game/tools/navEditor/images/nav-cover_n.png index 4080a20cc..48d7e1cb9 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-cover_n.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-cover_n.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-editor_d.png b/Templates/BaseGame/game/tools/navEditor/images/nav-editor_d.png index 066ce2367..bfc32ca4c 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-editor_d.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-editor_h.png b/Templates/BaseGame/game/tools/navEditor/images/nav-editor_h.png index dde52710a..610dace1b 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-editor_h.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-editor_n.png b/Templates/BaseGame/game/tools/navEditor/images/nav-editor_n.png index 6b7778bea..f438ea54c 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-editor_n.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-link_d.png b/Templates/BaseGame/game/tools/navEditor/images/nav-link_d.png index 77f1499b3..af2f923c9 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-link_d.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-link_d.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-link_h.png b/Templates/BaseGame/game/tools/navEditor/images/nav-link_h.png index 4fa204f63..dd6b241b5 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-link_h.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-link_h.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/images/nav-link_n.png b/Templates/BaseGame/game/tools/navEditor/images/nav-link_n.png index 05ef3d748..0fb76d97e 100644 Binary files a/Templates/BaseGame/game/tools/navEditor/images/nav-link_n.png and b/Templates/BaseGame/game/tools/navEditor/images/nav-link_n.png differ diff --git a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript index 39bf862af..c1d9ea04f 100644 --- a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript +++ b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript @@ -35,6 +35,268 @@ function NavEditorGui::onEditorDeactivated(%this) %this.deselect(); } +//------------------------------------------------------------------------------ + +function NavEditorGui::onWake(%this) +{ + %fixedWindow = NavEditorTreeWindow; + %fluidWindow = NavEditorOptionsWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function NavEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = NavEditorTreeWindow; + %fluidWindow = NavEditorOptionsWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function NavEditorTreeWindow::onMouseDragged(%this) +{ + %parent = NavEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function NavEditorOptionsWindow::onMouseDragged(%this) +{ + %parent = NavEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function NavEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = NavEditorOptionsWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function NavEditorGui::dockSidePanel() +{ + %parent = NavEditorGui; + %fixedWindow = NavEditorTreeWindow; + %fluidWindow = NavEditorOptionsWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + NavEditorGui_UnDockBtn.Visible = "1"; + NavEditorGui_DockBtn.Visible = "0"; + + NavEditorGui_showBtn.Visible = "0"; + NavEditorGui_hideBtn.Visible = "1"; +} + +function NavEditorGui::releaseSidePanel() +{ + %parent = NavEditorGui; + %fixedWindow = NavEditorTreeWindow; + %fluidWindow = NavEditorOptionsWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + NavEditorGui_UnDockBtn.Visible = "0"; + NavEditorGui_DockBtn.Visible = "1"; + + NavEditorGui_showBtn.Visible = "0"; + NavEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function NavEditorGui::hideSidePanel() +{ + %parent = NavEditorGui; + %fixedWindow = NavEditorTreeWindow; + %fluidWindow = NavEditorOptionsWindow; + + NavEditorGui_showBtn.Visible = "1"; + NavEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + NavEditorTreePanel.Visible = "0"; + + %fluidWindow.text = ""; + NavEditorOptionsPanel.Visible = "0"; + NavEditorInspector.Visible = "0"; + NavEditorOptScroll.Visible = "0"; + NavFieldInfoControl.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function NavEditorGui::showSidePanel() +{ + %parent = NavEditorGui; + %fixedWindow = NavEditorTreeWindow; + %fluidWindow = NavEditorOptionsWindow; + + NavEditorGui_showBtn.Visible = "0"; + NavEditorGui_hideBtn.Visible = "1"; + + // showthe content of the panels + %fixedWindow.text = %fixedWindow.titleText; + NavEditorTreePanel.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + NavEditorOptionsPanel.Visible = "1"; + NavEditorInspector.Visible = "1"; + NavEditorOptScroll.Visible = "1"; + NavFieldInfoControl.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//------------------------------------------------------------------------------ + function NavEditorGui::onModeSet(%this, %mode) { // Callback when the nav editor changes mode. Set the appropriate dynamic @@ -307,7 +569,7 @@ function NavInspector::onInspectorFieldModified(%this, %object, %fieldName, %arr function NavInspector::onFieldSelected(%this, %fieldName, %fieldTypeStr, %fieldDoc) { - NavFieldInfoControl.setText("" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc); + NavFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function NavTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui index 594a4dd92..c0326cfaa 100644 --- a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui +++ b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui @@ -21,14 +21,15 @@ $PE_guielement_ext_colorpicker = "18 18"; //--- OBJECT WRITE BEGIN --- $guiContent = new GuiWindowCollapseCtrl(PE_Window) { + canCollapse = "0"; canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; Profile = "ToolsGuiWindowProfile"; - Position = firstWord($pref::Video::mode) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) -1; - Extent = "210 696"; - MinExtent = "210 140"; + Position = firstWord($pref::Video::mode) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 140"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; canSave = "1"; @@ -42,14 +43,14 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; + canMove = "0"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = ""; EdgeSnap = "0"; - text = "Particle Editor"; + text = ":: Particle Editor"; new GuiTabBookCtrl(PE_TabBook) { canSaveDynamicFields = "0"; @@ -1508,6 +1509,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { text = "Blend Type"; }; new GuiPopUpMenuCtrl() { + Profile = "ToolsGuiPopUpMenuProfile"; internalName = "PEE_blendType"; HorizSizing = "left"; VertSizing = "bottom"; diff --git a/Templates/BaseGame/game/tools/particleEditor/images/play_btn_d.png b/Templates/BaseGame/game/tools/particleEditor/images/play_btn_d.png index 518a15685..1b69b1654 100644 Binary files a/Templates/BaseGame/game/tools/particleEditor/images/play_btn_d.png and b/Templates/BaseGame/game/tools/particleEditor/images/play_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/particleEditor/images/play_btn_h.png b/Templates/BaseGame/game/tools/particleEditor/images/play_btn_h.png index 87543b362..91f112438 100644 Binary files a/Templates/BaseGame/game/tools/particleEditor/images/play_btn_h.png and b/Templates/BaseGame/game/tools/particleEditor/images/play_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/particleEditor/images/play_btn_n.png b/Templates/BaseGame/game/tools/particleEditor/images/play_btn_n.png index 7fadf843d..eee888545 100644 Binary files a/Templates/BaseGame/game/tools/particleEditor/images/play_btn_n.png and b/Templates/BaseGame/game/tools/particleEditor/images/play_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript index 4156e38d6..eb9cb23bc 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript @@ -160,7 +160,7 @@ function ParticleEditor::createParticleList( %this ) function ParticleEditor::openEmitterPane( %this ) { - PE_Window.text = "Particle Editor - Emitters"; + PE_Window.text = ":: Particle Editor - Emitters"; PE_EmitterEditor.guiSync(); ParticleEditor.activeEditor = PE_EmitterEditor; @@ -172,7 +172,7 @@ function ParticleEditor::openEmitterPane( %this ) function ParticleEditor::openParticlePane( %this ) { - PE_Window.text = "Particle Editor - Particles"; + PE_Window.text = ":: Particle Editor - Particles"; PE_ParticleEditor.guiSync(); ParticleEditor.activeEditor = PE_ParticleEditor; @@ -253,3 +253,91 @@ function PE_TabBook::onTabSelected( %this, %text, %idx ) else ParticleEditor.openParticlePane(); } + +//------------------------------------------------------------------------------ +// PE Window +//------------------------------------------------------------------------------ + +//------------------------------------------------------------------------------ + +function ParticleEditor::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %window.position.x = Canvas.extent.x - %window.extent.x; + %window.position.y = %top; + + // don't go beyond the canvas + %window.extent.y = %maxHeight + 42; + + %position = %window.position.x SPC %window.position.y; + %extent = %window.extent.x SPC %window.extent.y; + %window.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function PE_Window::onMouseDragged(%this) +{ + %parent = ParticleEditor; + + if(%parent.resizing == false) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function ParticleEditor::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = PE_Window; + + if(%this.resizing == false) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } + + FieldInfoControl.position = 5 SPC EWInspectorWindow.extent.y - 40; +} + +//------------------------------------------------------------------------------ \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui index c0ff6e162..d042e253a 100644 --- a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui +++ b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui @@ -40,6 +40,8 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { HoverNodeColor = "255 255 255 255"; new GuiWindowCollapseCtrl(RiverEditorTreeWindow) { + canCollapse = "0"; + canMove = "0"; internalName = ""; canSaveDynamicFields = "0"; Enabled = "1"; @@ -47,10 +49,10 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 167"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 167"; + MinExtent = "300 100"; canSave = "1"; isDecoy = "0"; Visible = "1"; @@ -64,13 +66,12 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Rivers"; + text = ":: River Editor - Rivers"; /* new GuiBitmapButtonCtrl() { @@ -122,7 +123,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { }; */ - new GuiContainer(){ + new GuiContainer(RiverEditorTreeWPanel){ profile = "ToolsGuiDefaultProfile"; Position = "5 25"; Extent = "200 120"; @@ -190,8 +191,103 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { }; }; }; + // window / panel buttons + new GuiBitmapButtonCtrl(RiverEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "RiverEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(RiverEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "RiverEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(RiverEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "RiverEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(RiverEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "RiverEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; new GuiWindowCollapseCtrl(RiverEditorOptionsWindow) { + canCollapse = "0"; + canMove = "0"; internalName = "Window"; canSaveDynamicFields = "0"; Enabled = "1"; @@ -199,10 +295,10 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) + getWord(RiverEditorTreeWindow.extent, 1) - 2; - Extent = "210 530"; - MinExtent = "210 300"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(RiverEditorTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(RiverEditorTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 300"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -215,15 +311,14 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Properties"; + text = ":: River Editor - Properties"; - new GuiContainer(){ //Node Properties + new GuiContainer(RiverEditorOptionsPanel){ //Node Properties isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -234,7 +329,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { Margin = "3 3 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -315,7 +410,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { AltCommand = "RiverEditorGui.editNodeDetails();"; }; }; - new GuiContainer(){ //River Properties + new GuiContainer(RiverEditorPropPanel){ //River Properties isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -326,7 +421,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { Margin = "0 0 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -335,7 +430,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { }; }; - new GuiScrollCtrl() { + new GuiScrollCtrl(RiverEditorPropScroll) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; @@ -390,11 +485,11 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "0"; - Profile = "GuiInspectorFieldInfoMLTextProfile"; + position = "8" SPC getWord(RiverEditorOptionsWindow.extent, 1) - 40; HorizSizing = "width"; VertSizing = "top"; Position = "1 485"; - Extent = "202 42"; + Extent = "330 42"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript index 247ed643c..c36141774 100644 --- a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript +++ b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript @@ -25,6 +25,267 @@ $River::wireframe = true; $River::showSpline = true; $River::showRiver = true; $River::showWalls = true; + +//----------------------------------------------------------------------------- + +function RiverEditorGui::onWake(%this) +{ + %fixedWindow = RiverEditorTreeWindow; + %fluidWindow = RiverEditorOptionsWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function RiverEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = RiverEditorTreeWindow; + %fluidWindow = RiverEditorOptionsWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function RiverEditorTreeWindow::onMouseDragged(%this) +{ + %parent = RiverEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function RiverEditorOptionsWindow::onMouseDragged(%this) +{ + %parent = RiverEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function RiverEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = RiverEditorOptionsWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function RiverEditorGui::dockSidePanel() +{ + %parent = RiverEditorGui; + %fixedWindow = RiverEditorTreeWindow; + %fluidWindow = RiverEditorOptionsWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + RiverEditorGui_UnDockBtn.Visible = "1"; + RiverEditorGui_DockBtn.Visible = "0"; + + RiverEditorGui_showBtn.Visible = "0"; + RiverEditorGui_hideBtn.Visible = "1"; +} + +function RiverEditorGui::releaseSidePanel() +{ + %parent = RiverEditorGui; + %fixedWindow = RiverEditorTreeWindow; + %fluidWindow = RiverEditorOptionsWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + RiverEditorGui_UnDockBtn.Visible = "0"; + RiverEditorGui_DockBtn.Visible = "1"; + + RiverEditorGui_showBtn.Visible = "0"; + RiverEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function RiverEditorGui::hideSidePanel() +{ + %parent = RiverEditorGui; + %fixedWindow = RiverEditorTreeWindow; + %fluidWindow = RiverEditorOptionsWindow; + + RiverEditorGui_showBtn.Visible = "1"; + RiverEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + RiverEditorTreeWPanel.Visible = "0"; + + %fluidWindow.text = ""; + RiverEditorOptionsPanel.Visible = "0"; + RiverEditorPropPanel.Visible = "0"; + RiverEditorPropScroll.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function RiverEditorGui::showSidePanel() +{ + %parent = RiverEditorGui; + %fixedWindow = RiverEditorTreeWindow; + %fluidWindow = RiverEditorOptionsWindow; + + RiverEditorGui_showBtn.Visible = "0"; + RiverEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + // hide the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + RiverEditorTreeWPanel.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + RiverEditorOptionsPanel.Visible = "1"; + RiverEditorPropPanel.Visible = "1"; + RiverEditorPropScroll.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- function RiverEditorGui::onEditorActivated( %this ) { @@ -182,7 +443,7 @@ function RiverInspector::onInspectorFieldModified( %this, %object, %fieldName, % function RiverInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - RiverFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + RiverFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function RiverTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui index 5340f7ac0..437c96b03 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui @@ -41,6 +41,8 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { HoverNodeColor = "255 255 255 255"; new GuiWindowCollapseCtrl(RoadEditorTreeWindow) { + canCollapse = "0"; + canMove = "0"; internalName = ""; canSaveDynamicFields = "0"; Enabled = "1"; @@ -48,10 +50,10 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 167"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 200"; + MinExtent = "300 200"; canSave = "1"; isDecoy = "0"; Visible = "1"; @@ -71,7 +73,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Roads & Paths"; + text = ":: Decal Road Editor - Roads & Paths"; /* new GuiBitmapButtonCtrl() { @@ -122,7 +124,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { useMouseEvents = "0"; }; */ - new GuiContainer(){ + new GuiContainer(RoadEditorTreeWPanel){ profile = "ToolsGuiDefaultProfile"; Position = "5 25"; Extent = "200 120"; @@ -190,8 +192,103 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { }; }; }; + // window / panel buttons + new GuiBitmapButtonCtrl(RoadEditorGui_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "RoadEditorGui.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(RoadEditorGui_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "RoadEditorGui.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(RoadEditorGui_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "RoadEditorGui.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(RoadEditorGui_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "RoadEditorGui.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; new GuiWindowCollapseCtrl(RoadEditorOptionsWindow) { + canCollapse = "0"; + canMove = "0"; internalName = "Window"; canSaveDynamicFields = "0"; Enabled = "1"; @@ -199,10 +296,10 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 SPC - getWord(EditorGuiToolbar.extent, 1) + getWord(RoadEditorTreeWindow.extent, 1) - 2; - Extent = "210 530"; - MinExtent = "210 298"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(RoadEditorTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(RoadEditorTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 65; + MinExtent = "300 300"; canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -215,13 +312,12 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Decal Road Editor - Properties"; new GuiContainer(RoadEditorProperties){ //Node Properties isContainer = "1"; @@ -234,7 +330,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { Margin = "3 3 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -279,7 +375,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { AltCommand = "RoadEditorGui.editNodeDetails();"; }; }; - new GuiContainer(){ //Decal Road Properties + new GuiContainer(RoadEditorPropPanel){ //Decal Road Properties isContainer = "1"; Profile = "inspectorStyleRolloutDarkProfile"; HorizSizing = "width"; @@ -290,7 +386,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { Margin = "0 0 3 3"; new GuiTextCtrl(){ - Profile = "ToolsGuiDefaultProfile"; + Profile = "EditorTextProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "5 0"; @@ -299,7 +395,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { }; }; - new GuiContainer(){ + new GuiContainer(RoadEditorPropScroll){ profile = ToolsGuiDefaultProfile; Position = "4 108"; Extent = "202 377"; @@ -365,11 +461,11 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "0"; - Profile = "GuiInspectorFieldInfoMLTextProfile"; + position = "8" SPC getWord(RoadEditorOptionsWindow.extent, 1) - 40; HorizSizing = "width"; VertSizing = "top"; Position = "1 485"; - Extent = "202 42"; + Extent = "330 42"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui index b2d2ae39a..b2b1319ae 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorSettingsTab.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(RoadEditorSettingsTab,EditorGuiGroup) { new GuiTabPageCtrl(ERoadEditorSettingsPage) { fitBook = "1"; - text = "Road Editor"; + text = "Decal Road Editor"; maxLength = "1024"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/roadEditor/main.tscript b/Templates/BaseGame/game/tools/roadEditor/main.tscript index 60a0fe538..2583ab305 100644 --- a/Templates/BaseGame/game/tools/roadEditor/main.tscript +++ b/Templates/BaseGame/game/tools/roadEditor/main.tscript @@ -82,7 +82,7 @@ function RoadEditorPlugin::onWorldEditorStartup( %this ) exec( "./RoadEditorSettingsTab.gui" ); //ESettingsWindow.addTabPage( ERoadEditorSettingsPage ); - ESettingsWindow.addEditorSettingsPage("RoadEditor", "Road Editor"); + ESettingsWindow.addEditorSettingsPage("RoadEditor", "Decal Road Editor"); } function RoadEditorPlugin::onActivated( %this ) @@ -105,7 +105,7 @@ function RoadEditorPlugin::onActivated( %this ) %this.map.push(); // Set the status bar here until all tool have been hooked up - EditorGuiStatusBar.setInfo("Road editor."); + EditorGuiStatusBar.setInfo("Decal Road Editor."); EditorGuiStatusBar.setSelection(""); Parent::onActivated(%this); diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript index f24f1a229..f4cd9c147 100644 --- a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript @@ -24,6 +24,24 @@ function RoadEditorGui::onWake( %this ) { $DecalRoad::EditorOpen = true; + %fixedWindow = RoadEditorTreeWindow; + %fluidWindow = RoadEditorOptionsWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } + %count = EWorldEditor.getSelectionSize(); for ( %i = 0; %i < %count; %i++ ) { @@ -42,6 +60,246 @@ function RoadEditorGui::onSleep( %this ) $DecalRoad::EditorOpen = false; } +//----------------------------------------------------------------------------- + +function RoadEditorGui::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = RoadEditorTreeWindow; + %fluidWindow = RoadEditorOptionsWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function RoadEditorTreeWindow::onMouseDragged(%this) +{ + %parent = RoadEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function RoadEditorOptionsWindow::onMouseDragged(%this) +{ + %parent = RoadEditorGui; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function RoadEditorGui::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = RoadEditorOptionsWindow; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function RoadEditorGui::dockSidePanel() +{ + %parent = RoadEditorGui; + %fixedWindow = RoadEditorTreeWindow; + %fluidWindow = RoadEditorOptionsWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + RoadEditorGui_UnDockBtn.Visible = "1"; + RoadEditorGui_DockBtn.Visible = "0"; + + RoadEditorGui_showBtn.Visible = "0"; + RoadEditorGui_hideBtn.Visible = "1"; +} + +function RoadEditorGui::releaseSidePanel() +{ + %parent = RoadEditorGui; + %fixedWindow = RoadEditorTreeWindow; + %fluidWindow = RoadEditorOptionsWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + RoadEditorGui_UnDockBtn.Visible = "0"; + RoadEditorGui_DockBtn.Visible = "1"; + + RoadEditorGui_showBtn.Visible = "0"; + RoadEditorGui_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function RoadEditorGui::hideSidePanel() +{ + %parent = RoadEditorGui; + %fixedWindow = RoadEditorTreeWindow; + %fluidWindow = RoadEditorOptionsWindow; + + RoadEditorGui_showBtn.Visible = "1"; + RoadEditorGui_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + RoadEditorTreeWPanel.Visible = "0"; + + %fluidWindow.text = ""; + RoadEditorProperties.Visible = "0"; + RoadEditorPropPanel.Visible = "0"; + RoadEditorPropScroll.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function RoadEditorGui::showSidePanel() +{ + %parent = RoadEditorGui; + %fixedWindow = RoadEditorTreeWindow; + %fluidWindow = RoadEditorOptionsWindow; + + RoadEditorGui_showBtn.Visible = "0"; + RoadEditorGui_hideBtn.Visible = "1"; + + // show the content of the panels + // hide the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + RoadEditorTreeWPanel.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + RoadEditorProperties.Visible = "1"; + RoadEditorPropPanel.Visible = "1"; + RoadEditorPropScroll.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- + function RoadEditorGui::paletteSync( %this, %mode ) { %evalShortcut = "ToolsPaletteArray-->" @ %mode @ ".setStateOn(1);"; @@ -182,7 +440,7 @@ function RoadInspector::onInspectorFieldModified( %this, %object, %fieldName, %a function RoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - RoadFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + RoadFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function RoadTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/settings.xml b/Templates/BaseGame/game/tools/settings.xml index abb4d07a5..efec48b49 100644 --- a/Templates/BaseGame/game/tools/settings.xml +++ b/Templates/BaseGame/game/tools/settings.xml @@ -40,6 +40,8 @@ name="Browser"> Edit Asset + 0 1047 2200 360 1 40 40 40 255 180 180 180 255 + name="tabsHLColor">100 100 100 255 100 110 120 255 899 && isObject(ShapeEdSelectWindow) && isObject(ShapeEdPropWindow)) +{ + $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 360 SPC getWord(ShapeEdSelectWindow.extent, 1) + getWord(ShapeEdPropWindow.extent, 1) + getWord(EditorGuiToolbar.extent, 1) + 12; +} +else +{ + $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 720 SPC getWord(EditorGuiToolbar.extent, 1) + 6; +} + //--- OBJECT WRITE BEGIN --- $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { - text = "Advanced Properties"; + text = ":: Shape Editor - Advanced Properties"; resizeWidth = "0"; resizeHeight = "0"; canMove = "1"; @@ -15,9 +25,9 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - position = getWord($pref::Video::mode, 0) - 209 - 209 SPC getWord(EditorGuiToolbar.extent, 1) - 1; - extent = "210 272"; - MinExtent = "210 253"; + Position = $ShapeEdAdvancedWindowPos; + extent = "360 300"; + MinExtent = "300 300"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; Profile = "ToolsGuiWindowProfile"; @@ -41,7 +51,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; position = "4 24"; - extent = "202 243"; + extent = "220 243"; MinExtent = "8 -500"; HorizSizing = "width"; VertSizing = "height"; @@ -64,7 +74,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; Position = "0 19"; - extent = "202 224"; + extent = "220 224"; MinExtent = "0 -500"; HorizSizing = "width"; VertSizing = "height"; @@ -105,9 +115,9 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { Profile = "inspectorStyleRolloutDarkProfile"; new GuiTextCtrl() { - text = "Levels"; + text = "Levels:"; position = "4 1"; - Extent = "192 16"; + Extent = "272 16"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; @@ -145,7 +155,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; Variable = "ShapeEdShapeView.currentDL"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -159,12 +169,11 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { new GuiBitmapCtrl(){ bitmapAsset = "ToolsModule:inactive_overlay_image"; position = "57 19"; - Extent = "122 20"; + Extent = "290 20"; tooltip = "Levels needs to be selected to enable the detail level slider"; hovertime = "500"; isContainer = true; internalName = "levelsInactive"; - color = "128 128 128 255"; }; new GuiTextCtrl() { text = "0"; @@ -206,7 +215,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "0"; - position = "67 40"; + position = "77 40"; Extent = "40 16"; MinExtent = "8 2"; HorizSizing = "right"; @@ -267,7 +276,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "0"; - position = "67 60"; + position = "77 60"; Extent = "40 16"; MinExtent = "8 2"; HorizSizing = "right"; @@ -327,7 +336,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = ""; - position = "67 80"; + position = "77 80"; extent = "40 16"; MinExtent = "8 2"; HorizSizing = "right"; @@ -387,7 +396,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = ""; - position = "67 100"; + position = "77 100"; extent = "40 16"; MinExtent = "8 2"; HorizSizing = "right"; @@ -441,7 +450,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = ""; - position = "67 120"; + position = "74 120"; extent = "40 16"; horizSizing = "right"; vertSizing = "bottom"; @@ -466,7 +475,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiContainer() { position = "0 138"; - Extent = "202 87"; + Extent = "202 90"; MinExtent = "8 8"; HorizSizing = "width"; VertSizing = "bottom"; @@ -474,8 +483,8 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { isContainer = "1"; new GuiTextCtrl() { // Header - text = "Imposters"; - position = "4 1"; + text = "Imposters:"; + position = "5 1"; Extent = "192 16"; MinExtent = "8 2"; HorizSizing = "right"; @@ -488,10 +497,10 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { groupNum = "-1"; buttonType = "ToggleButton"; useMouseEvents = "0"; - position = "113 2"; + position = "72 2"; Extent = "83 13"; MinExtent = "8 2"; - HorizSizing = "left"; + HorizSizing = "right"; VertSizing = "bottom"; Profile = "ToolsGuiCheckBoxProfile"; Visible = "1"; @@ -557,7 +566,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { canSaveDynamicFields = "0"; }; new GuiTextEditCtrl() { - position = "68 43"; + position = "72 43"; Extent = "36 18"; MinExtent = "8 2"; HorizSizing = "right"; @@ -692,9 +701,8 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiBitmapCtrl(){ bitmapAsset = "ToolsModule:inactive_overlay_image"; - color = "128 128 128 255"; position = "4 18"; - Extent = "193 64"; + Extent = "193 68"; tooltip = "Imposters must be enabled, and an imposter detail level selected to edit these properties"; hovertime = "500"; isContainer = "1"; @@ -713,7 +721,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; Position = "0 19"; - extent = "202 224"; + extent = "220 224"; MinExtent = "0 -500"; HorizSizing = "width"; VertSizing = "height"; @@ -730,7 +738,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { Margin = "0 0 0 0"; Profile = "ToolsGuiScrollProfile"; position = "0 0"; - extent = "202 224"; + extent = "294 224"; }; new GuiContainer(ShapeEdMountWindow) { @@ -743,7 +751,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorRight = "0"; isContainer = "1"; position = "0 0"; - extent = "202 224"; + extent = "220 224"; MinExtent = "8 8"; HorizSizing = "width"; vertSizing = "height"; @@ -761,7 +769,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { buttonType = "ToggleButton"; useMouseEvents = "0"; position = "2 2"; - extent = "139 13"; + extent = "200 13"; MinExtent = "8 2"; HorizSizing = "right"; VertSizing = "bottom"; @@ -797,7 +805,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 8"; HorizSizing = "width"; VertSizing = "height"; - Profile = "GuiShapeEdScrollProfile"; + Profile = "ToolsGuiShapeEdScrollProfile"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; @@ -821,7 +829,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 11"; HorizSizing = "right"; VertSizing = "bottom"; - Profile = "GuiShapeEdTextListProfile"; + Profile = "ToolsGuiShapeEdTextListProfile"; Visible = "1"; Command = "ShapeEdMountWindow.update_onMountSelectionChanged();"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -845,7 +853,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiBitmapButtonCtrl() { bitmapAsset = "ToolsModule:delete_n_image"; @@ -912,7 +920,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiPopUpMenuCtrl(ShapeEdMountShapeMenu) { position = "42 20"; @@ -929,7 +937,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextRightProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiPopUpMenuCtrl() { position = "42 41"; @@ -949,7 +957,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "left"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiPopUpMenuCtrl() { position = "138 41"; @@ -981,7 +989,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "top"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Drag the slider to scrub through the sequence keyframes"; @@ -1024,7 +1032,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; Position = "0 19"; - extent = "202 224"; + extent = "220 224"; MinExtent = "0 -500"; HorizSizing = "width"; VertSizing = "height"; @@ -1071,7 +1079,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiScrollCtrl() { willFirstRespond = "1"; @@ -1093,7 +1101,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 8"; HorizSizing = "right"; VertSizing = "height"; - Profile = "GuiShapeEdScrollProfile"; + Profile = "ToolsGuiShapeEdScrollProfile"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; @@ -1109,7 +1117,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 11"; HorizSizing = "right"; VertSizing = "bottom"; - Profile = "GuiShapeEdTextListProfile"; + Profile = "ToolsGuiShapeEdTextListProfile"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; @@ -1124,7 +1132,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiScrollCtrl() { willFirstRespond = "1"; @@ -1142,11 +1150,11 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; position = "46 17"; - extent = "157 124"; + extent = "202 124"; MinExtent = "8 8"; HorizSizing = "width"; VertSizing = "height"; - Profile = "GuiShapeEdScrollProfile"; + Profile = "ToolsGuiShapeEdScrollProfile"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; @@ -1158,11 +1166,11 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { fitParentWidth = "1"; clipColumnText = "1"; Position = "1 1"; - extent = "155 11"; + extent = "202 11"; MinExtent = "8 11"; HorizSizing = "right"; VertSizing = "bottom"; - Profile = "GuiShapeEdTextListProfile"; + Profile = "ToolsGuiShapeEdTextListProfile"; Visible = "1"; Command = "ShapeEdSequenceList.setSelectedById( $ThisControl.getSelectedId() );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1221,7 +1229,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "top"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; ToolTip = "Drag the slider to scrub through the sequence keyframes"; @@ -1336,7 +1344,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "left"; vertSizing = "top"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiTextCtrl() { text = "Transition to"; @@ -1345,7 +1353,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "top"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiPopUpMenuCtrl() { position = "68 185"; @@ -1363,7 +1371,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { minExtent = "8 2"; horizSizing = "right"; vertSizing = "top"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextProfile"; }; new GuiPopUpMenuCtrl() { position = "68 206"; @@ -1387,7 +1395,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; Position = "0 19"; - extent = "202 224"; + extent = "220 224"; MinExtent = "0 -500"; HorizSizing = "width"; VertSizing = "height"; @@ -1421,16 +1429,16 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { canSaveDynamicFields = "0"; new GuiTextCtrl() { - Profile = "ToolsGuiTextProfile"; text = "Fit Type"; position = "5 5"; - extent = "41 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiPopUpMenuCtrl() { - position = "70 4"; - extent = "108 18"; + position = "85 4"; + extent = "170 18"; horizSizing = "right"; vertSizing = "bottom"; Profile = "ToolsGuiPopUpMenuProfile"; @@ -1439,16 +1447,16 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { internalName = "colType"; }; new GuiTextCtrl() { - Profile = "ToolsGuiTextProfile"; text = "Fit Target"; position = "5 25"; - extent = "45 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiPopUpMenuCtrl() { - position = "70 24"; - extent = "108 18"; + position = "85 24"; + extent = "170 18"; horizSizing = "right"; vertSizing = "bottom"; Profile = "ToolsGuiPopUpMenuProfile"; @@ -1459,22 +1467,22 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { new GuiTextCtrl() { text = "Max Depth"; position = "5 47"; - extent = "53 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "0 8"; ticks = "4"; snap = "0"; value = "4"; - position = "70 48"; - extent = "104 14"; + position = "80 48"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullDepthText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1485,32 +1493,32 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "4"; - position = "181 47"; - extent = "18 16"; + position = "320 47"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullDepthText"; }; new GuiTextCtrl() { text = "Merge %"; position = "5 68"; - extent = "53 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "0 60"; ticks = "4"; snap = "0"; value = "30"; - position = "70 69"; - extent = "104 14"; + position = "80 69"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullMergeText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1521,32 +1529,32 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "30"; - position = "179 68"; - extent = "18 16"; + position = "320 68"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullMergeText"; }; new GuiTextCtrl() { text = "Concavity %"; position = "5 89"; - extent = "59 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "0 60"; ticks = "4"; snap = "0"; value = "30"; - position = "70 90"; - extent = "104 14"; + position = "80 90"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullConcaveText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1557,32 +1565,32 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "30"; - position = "179 89"; - extent = "18 16"; + position = "320 89"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullConcaveText"; }; new GuiTextCtrl() { text = "Max Verts"; position = "5 110"; - extent = "53 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "8 64"; ticks = "4"; snap = "0"; value = "32"; - position = "70 111"; - extent = "104 14"; + position = "80 111"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullMaxVertsText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1593,32 +1601,32 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "32"; - position = "179 110"; - extent = "18 16"; + position = "320 110"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullMaxVertsText"; }; new GuiTextCtrl() { text = "Box %"; position = "5 131"; - extent = "53 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "0 100"; ticks = "4"; snap = "0"; value = "30"; - position = "70 132"; - extent = "104 14"; + position = "80 132"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullMaxBoxErrorText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1629,32 +1637,32 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "30"; - position = "179 131"; - extent = "18 16"; + position = "320 131"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullMaxBoxErrorText"; }; new GuiTextCtrl() { text = "Sphere %"; position = "5 152"; - extent = "53 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "0 100"; ticks = "4"; snap = "0"; value = "30"; - position = "70 153"; - extent = "104 14"; + position = "80 153"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullMaxSphereErrorText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1665,32 +1673,32 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "30"; - position = "179 152"; - extent = "18 16"; + position = "320 152"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullMaxSphereErrorText"; }; new GuiTextCtrl() { text = "Capsule %"; position = "5 173"; - extent = "53 16"; + extent = "70 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; }; new GuiSliderCtrl() { range = "0 100"; ticks = "4"; snap = "0"; value = "30"; - position = "70 174"; - extent = "104 14"; + position = "80 174"; + extent = "90 14"; MinExtent = "8 2"; HorizSizing = "width"; VertSizing = "bottom"; - Profile = "ToolsGuiSliderProfile"; + Profile = "ToolsGuiSliderBoxProfile"; Visible = "1"; AltCommand = "ShapeEdColWindow-->hullMaxCapsuleErrorText.setText( mFloor($ThisControl.getValue()) );"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -1701,11 +1709,11 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { }; new GuiTextCtrl() { text = "30"; - position = "179 173"; - extent = "18 16"; + position = "320 173"; + extent = "25 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiTextRightProfile"; internalName = "hullMaxCapsuleErrorText"; }; new GuiButtonCtrl() { @@ -1714,7 +1722,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { buttonType = "PushButton"; useMouseEvents = "0"; position = "7 200"; - extent = "88 18"; + extent = "100 20"; MinExtent = "8 2"; HorizSizing = "right"; vertSizing = "bottom"; @@ -1733,8 +1741,8 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "105 200"; - extent = "88 18"; + position = "115 200"; + extent = "100 20"; MinExtent = "8 2"; HorizSizing = "right"; vertSizing = "bottom"; @@ -1751,10 +1759,10 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) { new GuiBitmapCtrl() { bitmapAsset = "ToolsModule:inactive_overlay_image"; position = "0 47"; - extent = "199 175"; + extent = "199 178"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiDefaultProfile"; + Profile = "ToolsGuiDefaultProfile"; visible = "0"; canSave = "1"; canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui index 4e261f726..12e648cae 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui @@ -5,7 +5,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) { Profile = "ToolsGuiToolbarWindowProfile"; HorizSizing = "width"; VertSizing = "top"; - Position = -1 SPC getWord(ShapeEdPreviewGui.extent,0)-94; + Position = "1" SPC getWord($pref::Video::mode, 1) - 160; Extent = "817 53"; MinExtent = "475 53"; canSave = "1"; @@ -36,7 +36,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) { HorizSizing = "width"; VertSizing = "top"; Position = "5 10"; - Extent = "809 "; + Extent = "809 53"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -435,5 +435,3 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) { }; }; }; - -//--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui index c931ae1ca..1cca63acc 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui @@ -5,10 +5,10 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 + Position = getWord($pref::Video::mode, 0) - 360 SPC getWord(EditorGuiToolbar.extent, 1) + getWord(ShapeEdSelectWindow.extent, 1) - 2; - Extent = "210 484"; - MinExtent = "210 352"; + Extent = "360 350"; + MinExtent = "300 350"; canSave = "1"; Visible = "0"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -27,7 +27,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Properties"; + text = ":: Shape Editor - Properties"; //--------------------------------------------------------------------- // Sequence and Node editors diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui index c92f2ac3b..91e2c6751 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui @@ -21,10 +21,10 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 - SPC getWord(EditorGuiToolbar.extent, 1) - 1; - Extent = "210 213"; - MinExtent = "210 114"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 165"; + MinExtent = "300 165"; canSave = "1"; Visible = "0"; tooltipprofile = "ToolsGuiToolTipProfile"; @@ -43,7 +43,7 @@ $guiContent = new GuiControl() { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Shapes"; + text = ":: Shape Editor - Select"; new GuiTabBookCtrl(ShapeEditorTabbook) { internalName = "tabBook"; @@ -53,7 +53,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "4 24"; - Extent = "202 165"; + Extent = "202 150"; MinExtent = "8 -500"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_d.png index 41a33f548..217840de7 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_h.png index ce9a266c5..46c016ebb 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_n.png index 5daf81682..e179c9708 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/back_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_d.png index 83969b176..f6439dcae 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_h.png index 378c734e8..a607e8ca2 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_n.png index 743bc4091..029b198ac 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/collision-shape_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_d.png index 4bfa56aa3..4ff821248 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_h.png index 8ca5a0b1c..6864762f4 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_n.png index f7788fb21..519ec03f5 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/detail-levels_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_d.png index 0dd59b856..1bf338a75 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_h.png index 65147daa6..e12fa3a1e 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_n.png index ba5f67aab..7e14ec32e 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/fwd_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_d.png index ce7522ebf..c87253c6c 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_h.png index efc103ef8..01f4bf998 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_n.png index 79d2cebf7..495dda859 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/ghost_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/highlight_material.png b/Templates/BaseGame/game/tools/shapeEditor/images/highlight_material.png index 78ac974a3..ffaa8d4a1 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/highlight_material.png and b/Templates/BaseGame/game/tools/shapeEditor/images/highlight_material.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_d.png index 98253e586..bdf77f45b 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_h.png index aa41d5ac7..c2d7c8b06 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_n.png index 3bd3633e8..6fefe4d95 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/object-bounds_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_d.png index 8071e25b5..1d2bbad14 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_h.png index a0a4cd3bc..1ac3d9800 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_n.png index aaaed8e10..981d80abd 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/object-fit-bounds_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_d.png index 3caa5f8f8..8f4f03ac4 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_h.png index 361275542..5c7eaeba9 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_n.png index d9a398521..d09ca342f 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/pause_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_d.png index 3d26cabb7..d2fda1d0b 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_h.png index ecdf5a3c0..66ad8e690 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_n.png index 60a9c1548..4cff09a79 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/pingpong_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_d.png index ef0e45000..9c076170c 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_h.png index 73837b5d5..f0cc1f1fc 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_n.png index 6e5f277bc..402627696 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/playbkwd_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_d.png index 835e3f6fa..9536955b6 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_h.png index 87543b362..b7e364a9c 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_n.png index 7fadf843d..73bd0987b 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/playfwd_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_d.png index dedef925e..33de9cb27 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_h.png index c443af280..0fab3c998 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_n.png index cf5091875..98e036737 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-in_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_d.png index 540f5a9b1..faaddec13 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_h.png index 2feb3bfb6..ccc76f489 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_n.png index cac5d5b54..84d62f2b9 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/seq_bar-out_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_d.png index 6f94d00d4..83e8f5527 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_h.png index d88297ec2..4898322d1 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_n.png index bab4eb253..621d02b64 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/show-wireframe_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_d.png index a9a358d46..a6dee4329 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_h.png index 6958e6ab8..515974122 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_n.png index 599deaba4..60506048f 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/shownodes_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_d.png index e4c0fb52a..e5ec0dba5 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_h.png index 46fbd79fa..830aba2df 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_n.png index f0c114002..1f12934af 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/stepback_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_d.png index f0160a16a..4b15c22c7 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_h.png index 4513970b5..52aa681cc 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_n.png index eb98eb498..3ece21628 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/stepfwd_btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_d.png b/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_d.png index c357d6889..21db540b3 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_d.png and b/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_d.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_h.png b/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_h.png index 813b0a7b6..d42d56f2e 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_h.png and b/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_h.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_n.png b/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_n.png index 70152a8be..c80e06a55 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_n.png and b/Templates/BaseGame/game/tools/shapeEditor/images/sun-btn_n.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/images/transition_slider.png b/Templates/BaseGame/game/tools/shapeEditor/images/transition_slider.png index 9aa51ab50..0091f99d0 100644 Binary files a/Templates/BaseGame/game/tools/shapeEditor/images/transition_slider.png and b/Templates/BaseGame/game/tools/shapeEditor/images/transition_slider.png differ diff --git a/Templates/BaseGame/game/tools/shapeEditor/main.tscript b/Templates/BaseGame/game/tools/shapeEditor/main.tscript index 958d609f6..ad64611cb 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/main.tscript +++ b/Templates/BaseGame/game/tools/shapeEditor/main.tscript @@ -30,12 +30,13 @@ function initializeShapeEditor() exec("./gui/Profiles.ed." @ $TorqueScriptFileExtension); + // Order of GUI loading is important exec("./gui/shapeEdPreviewWindow.ed.gui"); - exec("./gui/shapeEdAnimWindow.ed.gui"); - exec("./gui/shapeEdAdvancedWindow.ed.gui"); exec("./gui/ShapeEditorToolbar.ed.gui"); exec("./gui/shapeEdSelectWindow.ed.gui"); exec("./gui/shapeEdPropWindow.ed.gui"); + exec("./gui/shapeEdAdvancedWindow.ed.gui"); + exec("./gui/shapeEdAnimWindow.ed.gui"); exec("./scripts/shapeEditor.ed." @ $TorqueScriptFileExtension); exec("./scripts/shapeEditorHints.ed." @ $TorqueScriptFileExtension); diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript index 5edcb77ef..b4b08c627 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript @@ -1580,6 +1580,29 @@ function ShapeEdSeqFromMenu::onBrowseSelect( %this, %assetId ) ShapeEdSequences.onEditSequenceSource( %shapePath ); } +//------------------------------------------------------------------------------ + +function ShapeEdAnimWIndow::onWake(%this) +{ + %animWindow = ShapeEdAnimWIndow; + %position = "1" SPC Canvas.extent.y - 112; + + if(isObject(ShapeEdPropWindow)) + { + // Fit the the whole window together with the prop and select windows + %extent = Canvas.extent.x - ShapeEdPropWindow.extent.x - 2 SPC %animWindow.extent.y; + } + else + { + // If we can't get the prop window then use a default width + // (when the order of GUI loading has changed for example) + %extent = Canvas.extent.x - 360 - 2 SPC %animWindow.extent.y; + } + + // resize and position accordingly + %animWindow.resize(%position.x, %position.y, %extent.x, %extent.y); +} + //------------------------------------------------------------------------------ // Threads and Animation //------------------------------------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui new file mode 100644 index 000000000..04abab4b3 --- /dev/null +++ b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui @@ -0,0 +1,439 @@ +//--- OBJECT WRITE BEGIN --- +$guiContent = new GuiControl(windowConsoleDlg) { + position = "0 0"; + extent = "1024 768"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiDefaultNonModalProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiWindowCtrl(windowConsoleControl) { + text = ":: Console Log"; + resizeWidth = "1"; + resizeHeight = "1"; + canMove = "1"; + canClose = "1"; + canMinimize = "0"; + canMaximize = "1"; + canCollapse = "0"; + closeCommand = "windowConsoleDlg.hideWindow();"; + edgeSnap = "1"; + margin = "0 0 0 0"; + padding = "0 0 0 0"; + anchorTop = "1"; + anchorBottom = "0"; + anchorLeft = "1"; + anchorRight = "0"; + //position = "204 80"; + Position = "0" SPC getWord($pref::Video::mode, 1) - 300 - 60; + extent = "720 300"; + minExtent = "920 120"; + horizSizing = "windowRelative"; + vertSizing = "windowRelative"; + profile = "ToolsGuiWindowProfile"; + visible = "1"; + active = "1"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "1"; + canSave = "1"; + canSaveDynamicFields = "0"; + + new GuiContainer() { + position = "16 23"; + extent = "691 21"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + horizSizing = "width"; + + new GuiTextCtrl() { + text = "Filters:"; + position = "8 0"; + extent = "40 20"; + profile = "ToolsGuiTextBoldRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiCheckBoxCtrl(windowConsoleDlgErrorFilterBtn) { + text = " Errors ( )"; + position = "70 1"; + extent = "113 20"; + profile = "ToolsGuiCheckBoxErrorProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiCheckBoxCtrl(windowConsoleDlgWarnFilterBtn) { + text = " Warnings ( )"; + position = "170 1"; + extent = "113 20"; + profile = "ToolsGuiCheckBoxWarnProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiCheckBoxCtrl(windowConsoleDlgNormalFilterBtn) { + text = " Normal Messages ( )"; + position = "290 1"; + extent = "113 20"; + profile = "ToolsGuiCheckBoxMsgProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiButtonCtrl() { + text = "Clear Log !"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "610 1"; + extent = "80 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonHLYellowProfile"; + visible = "1"; + active = "1"; + command = "cls();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "WARNING: This will clear the console!"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Quit Torque !"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "520 1"; + extent = "80 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonHLRedProfile"; + visible = "1"; + active = "1"; + command = "quit();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "WARNING: Quit the engine without saving!"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsoleResetTimeBtn) { + text = "0:00"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "481 1"; + extent = "30 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.timeStampReset();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Set the timestamp to 0"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsoleTimestampBtn) { + text = "Time: Off"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "400 1"; + extent = "80 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.timeStamp();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Show the time stamp to console messages"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsoleDumpBtn) { + text = "Profiler: Off"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + position = "310 1"; + extent = "80 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.profilerDump();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Turn the profiler on"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowInfoDumpBtn) { + text = "Info"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "250 1"; + extent = "50 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.infoDump();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Show the engine, app and build info"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConLargerBtn) { + text = "A +"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "210 1"; + extent = "30 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonLTextProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.incFont();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Increase font size"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConSmallerBtn) { + text = "A -"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "179 1"; + extent = "30 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "bottom"; + profile = "ToolsGuiButtonSTextProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleDlg.decFont();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Decrease font size"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + }; + new GuiScrollCtrl() { + margin = "2 2 2 2"; + position = "0 48"; + extent = "718 217"; + minExtent = "8 8"; + horizSizing = "width"; + vertSizing = "height"; + profile = "ToolsConsoleScrollProfile"; + tooltipProfile = "GuiConsoleProfile"; + internalName = "Scroll"; + + new GuiConsole(windowConsoleMessageLogView) { + position = "1 1"; + extent = "482 217"; + horizSizing = "width"; + profile = "ToolsGuiConsoleProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + }; + new GuiConsoleEditCtrl(windowConsoleEntry) { + historySize = "40"; + maxLength = "255"; + anchorTop = "0"; + anchorBottom = "1"; + position = "54 272"; + extent = "520 16"; + minExtent = "8 8"; + horizSizing = "width"; + vertSizing = "top"; + profile = "ToolsConsoleTextEditProfile"; + altCommand = "windowConsoleEntry::eval();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextCtrl() { + text = "Cmd:"; + position = "12 270"; + extent = "30 20"; + horizSizing = "right"; + vertSizing = "top"; + profile = "ToolsGuiTextBoldRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiButtonCtrl() { + text = "Repeat Last"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "590 270"; + extent = "80 20"; + minExtent = "8 2"; + horizSizing = "left"; + vertSizing = "top"; + profile = "ToolsGuiButtonProfile"; + visible = "1"; + active = "1"; + command = "windowConsoleEntry.repeatLast();"; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Show the last entry in the command line."; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsole_Tab1) { + text = "Tab1 Text 1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "5 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsole_Tab2) { + text = "Tab1 Text 2"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "105 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsole_Tab3) { + text = "Tab Text 3"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "205 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl(windowConsole_Tab4) { + text = "Tab Text 3"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "305 1"; + extent = "95 20"; + minExtent = "8 2"; + horizSizing = "right"; + vertSizing = "bottom"; + profile = "ToolsGuiEditorTabButton"; + visible = "1"; + hidden = "1"; + active = "1"; + command = ""; + tooltipProfile = "ToolsGuiToolTipProfile"; + ToolTip = "Bring this window to the front"; + hovertime = "1000"; + isContainer = "0"; + canSave = "0"; + canSaveDynamicFields = "0"; + }; + new GuiBitmapButtonCtrl(windowConsole_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "660 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "windowConsoleControl.releasePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Panel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(windowConsole_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "660 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "windowConsoleControl.dockPanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Panel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + }; +}; +//--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/windowConsole/main.tscript b/Templates/BaseGame/game/tools/windowConsole/main.tscript new file mode 100644 index 000000000..1fe32d8a3 --- /dev/null +++ b/Templates/BaseGame/game/tools/windowConsole/main.tscript @@ -0,0 +1,31 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +function initializeWindowConsole() +{ + exec("./scripts/window_console." @ $TorqueScriptFileExtension); + exec("./guis/window_console.gui"); +} + +function destroyWindowConsole() +{ +} \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript new file mode 100644 index 000000000..26686e8cd --- /dev/null +++ b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript @@ -0,0 +1,378 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- + +// Start the timer when initializing the console +$Con::useTimestamp = "1"; +// but hide the timestamp until requested +$Con::useTimestamp = "0"; + +function windowConsoleDlg::onWake(%this) +{ + windowConsoleDlgErrorFilterBtn.setStateOn(windowConsoleMessageLogView.getErrorFilter()); + windowConsoleDlgWarnFilterBtn.setStateOn(windowConsoleMessageLogView.getWarnFilter()); + windowConsoleDlgNormalFilterBtn.setStateOn(windowConsoleMessageLogView.getNormalFilter()); + + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleProfile); + $Con::font = 12; + + windowConsoleMessageLogView.refresh(); + + // Make the window fit next to the side panel + // We do a simple resize so that we don't have to redo the whole GUI layout + %newWidth = getWord($pref::Video::mode, 0) - 360; + %vertPos = getWord($pref::Video::mode, 1) - 360 - 35; + windowConsoleControl.resize("0", %vertPos, %newWidth, "360"); + windowConsoleControl.dockPanel(); +} + +//----------------------------------------------------------------------------- + +function windowConsoleEntry::eval() +{ + %text = trim(windowConsoleEntry.getValue()); + if(%text $= "") + return; + + $Con::lastCommand = %text; + + // If it's missing a trailing () and it's not a variable, + // append the parentheses. + if(strpos(%text, "(") == -1 && !isDefined(%text)) { + if(strpos(%text, "=") == -1 && strpos(%text, " ") == -1) { + if(strpos(%text, "{") == -1 && strpos(%text, "}") == -1) { + %text = %text @ "()"; + } + } + } + + // Append a semicolon if need be. + %pos = strlen(%text) - 1; + if(strpos(%text, ";", %pos) == -1 && strpos(%text, "}") == -1) { + %text = %text @ ";"; + } + + // Turn off warnings for assigning from void + // and evaluate the snippet. + if(!isDefined("$Con::warnVoidAssignment")) + %oldWarnVoidAssignment = true; + else + %oldWarnVoidAssignment = $Con::warnVoidAssignment; + $Con::warnVoidAssignment = false; + + echo("==>" @ %text); + eval(%text); + $Con::warnVoidAssignment = %oldWarnVoidAssignment; + + windowConsoleEntry.setValue(""); +} + +function windowConsoleEntry::repeatLast(%this) +{ + if($Con::lastCommand !$="") + windowConsoleEntry.setText($Con::lastCommand); +} + +//----------------------------------------------------------------------------- + +function windowConsoleDlg::hideWindow(%this) +{ + $WindowConsole::Open = false; + Canvas.popDialog(%this); + %this-->Scroll.setVisible(false); +} + +function windowConsoleDlg::showWindow(%this) +{ + $WindowConsole::Open = true; + Canvas.pushDialog(%this); + %this-->Scroll.setVisible(true); + + // Add a tab to the asset browser + if($AssetBrowser::Open) + { + %text = "Asset Browser"; + %command = "AssetBrowser.putToFront();"; + + AssetBrowserWindow.text = ""; + windowConsoleControl.text = ""; + + windowConsoleControl.setTab(windowConsole_Tab1, "Console Log", ""); + windowConsole_Tab1.setHidden(false); + windowConsole_Tab1.setActive(false); + + if(windowConsole_Tab2.text $= %text || windowConsole_Tab3.text $= %text || windowConsole_Tab4.text $= %text) + { + // we have a tab, don't do anything + } + else if(windowConsole_Tab2.hidden == true) + { + windowConsoleControl.setTab(windowConsole_Tab2, %text, %command); + } + else if(windowConsole_Tab3.hidden == true) + { + windowConsoleControl.setTab(windowConsole_Tab3, %text, %command); + } + else if(windowConsole_Tab4.hidden == true) + { + windowConsoleControl.setTab(windowConsole_Tab4, %text, %command); + } + else + { + warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()"); + } + } +} + +//----------------------------------------------------------------------------- + +function windowConsoleControl::setTab(%this, %tab, %text, %command) +{ + if(isObject(%tab)) + { + %tab.setActive(true); + %tab.setHidden(false); + %tab.setText(%text); + %tab.command = %command; + } +} + +function windowConsoleControl::putToFront(%this) +{ + // Close the object + windowConsoleDlg.hideWindow(); + // Create the object again so it will render on top + windowConsoleDlg.showWindow(); + // Put the focus on this window + %this.selectWindow(); +} + +//----------------------------------------------------------------------------- + +function windowConsoleDlgErrorFilterBtn::onClick(%this) +{ + windowConsoleMessageLogView.toggleErrorFilter(); +} + +function windowConsoleDlgWarnFilterBtn::onClick(%this) +{ + windowConsoleMessageLogView.toggleWarnFilter(); +} + +function windowConsoleDlgNormalFilterBtn::onClick(%this) +{ + windowConsoleMessageLogView.toggleNormalFilter(); +} + +function windowConsoleMessageLogView::onNewMessage(%this, %errorCount, %warnCount, %normalCount) +{ + windowConsoleDlgErrorFilterBtn.setText(" Errors ( " @ %errorCount @ " )"); + windowConsoleDlgWarnFilterBtn.setText(" Warnings ( " @ %warnCount @ " )"); + windowConsoleDlgNormalFilterBtn.setText(" Messages ( " @ %normalCount @ " )"); +} + +//----------------------------------------------------------------------------- + +function windowConsoleDlg::timeStamp(%this) +{ + %state = windowConsoleTimestampBtn.getValue(); + + if(%state) + { + %label = "Time: On"; + %profile = "ToolsGuiButtonActiveProfile"; + %toolTip = "Hide the time stamp to console messages"; + $Con::useTimestamp = "1"; + } + else + { + %label = "Time: Off"; + %profile = "ToolsGuiButtonProfile"; + %toolTip = "Show the time stamp to console messages"; + $Con::useTimestamp = "0"; + } + + windowConsoleTimestampBtn.setText(%label); + windowConsoleTimestampBtn.setProfile(%profile); + windowConsoleTimestampBtn.ToolTip = %toolTip; +} + +function windowConsoleDlg::timeStampReset(%this) +{ + resetTimeStamp(); + echo(">>>> Resetting timestamp"); +} + +function windowConsoleDlg::profilerDump(%this) +{ + %state = windowConsoleDumpBtn.getValue(); + + if(%state) + { + echo(">>>> Start profiler ---------------------------------------------"); + profilerEnable(true); + %label = "Profiler: On"; + %toolTip = "Turn the profiler off and show the results"; + %profile = "ToolsGuiButtonGreenProfile"; + } + else + { + + profilerDump(); + %label = "Profiler: Off"; + %toolTip = "Turn the profiler on"; + %profile = "ToolsGuiButtonProfile"; + %this.schedule(1000, stopProfiler); + } + + windowConsoleDumpBtn.setProfile(%profile); + windowConsoleDumpBtn.setText(%label); + windowConsoleDumpBtn.ToolTip = %toolTip; +} + +function windowConsoleDlg::stopProfiler(%this) +{ + profilerEnable(false); + echo(">>>> Stop profiler ----------------------------------------------"); +} + +function windowConsoleDlg::infoDump(%this) +{ + echo(">>>> ------------------------------------------------------------"); + %EngineName = getEngineName(); + %VersionString = getVersionString(); + %AppVersionString = getAppVersionString(); + %BuildString = getBuildString(); + %CompileTimeString = getCompileTimeString(); + echo(" o Engine :" SPC %EngineName); + echo(" o Engine version :" SPC %VersionString); + echo(" o App version :" SPC %AppVersionString); + echo(" o Build :" SPC %BuildString); + echo(" o Compile time :" SPC %CompileTimeString); + echo(">>>> ------------------------------------------------------------"); +} + +function windowConsoleDlg::incFont() +{ + switch ($Con::font) + { + case 14: + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleLargeProfile); + $Con::font = 16; + windowConsoleMessageLogView.refresh(); + case 12: + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleMediumProfile); + $Con::font = 14; + windowConsoleMessageLogView.refresh(); + } +} + +function windowConsoleDlg::decFont() +{ + switch ($Con::font) + { + case 14: + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleProfile); + $Con::font = 12; + windowConsoleMessageLogView.refresh(); + case 16: + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleMediumProfile); + $Con::font = 14; + windowConsoleMessageLogView.refresh(); + } +} + +//----------------------------------------------------------------------------- + +function windowConsoleControl::dockPanel(%this) +{ + if(%this.docked == true) + return; + + %this.resizing = true; + + %this.docked = true; + + %this.canCollapse = "0"; + %this.canMove = "0"; + %this.resizeWidth = "0"; + + windowConsole_UnDockBtn.Visible = "1"; + windowConsole_DockBtn.Visible = "0"; + + EditorGui.updateSideBar(); +} + +function windowConsoleControl::releasePanel(%this) +{ + if(%this.docked == false) + return; + + %this.canCollapse = "1"; + %this.canMove = "1"; + %this.resizeWidth = "1"; + + windowConsole_UnDockBtn.Visible = "0"; + windowConsole_DockBtn.Visible = "1"; + + // Let's do a small resize so it's visually clear we're "undocking" + %position = %this.position.x + 6 SPC %this.position.y - 6; + %extent = %this.extent.x SPC %this.extent.y; + %this.resize(%position.x, %position.y, %extent.x, %extent.y); + + %this.docked = false; + %this.resizing = false; + + EditorGui.updateSideBar(); +} + +//----------------------------------------------------------------------------- + +function windowConsoleDlg::addToolbarButton(%this) +{ + %button = new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + internalName = windowConsoleBtn; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "180 0"; + Extent = "25 19"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "windowConsoleDlg.showWindow();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Console (Windowed)"; + hovertime = "750"; + bitmapAsset = "ToolsModule:console_n_image"; + bitmapMode = "Stretched"; + buttonType = "PushButton"; + groupNum = "0"; + useMouseEvents = "0"; + }; + ToolsToolbarArray.add(%button); + EWToolsToolbar.setExtent((29 + 4) * (ToolsToolbarArray.getCount()) + 4 SPC "32"); +} + +// windowConsoleDlg.addToolbarButton(); \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index f8185f554..4f5891b93 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -26,13 +26,37 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; - Position = "0 10"; - Extent = "800 32"; + Position = "0 6"; + Extent = "800 37"; MinExtent = "8 8"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; canSave = "1"; Visible = "1"; hovertime = "1000"; + new GuiBitmapButtonCtrl(EHLogo) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "center"; + Position = "8 0"; + Extent = "24 24"; + MinExtent = "24 24"; + canSave = "1"; + Visible = "1"; + Command = ""; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Torque3D"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:menu_logo"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiStackControl(EditorGuiToolbarStack) { stackingType = "Horizontal"; horizStacking = "Left to Right"; @@ -43,11 +67,11 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { dynamicPos = "0"; changeChildSizeToFit = "0"; changeChildPosition = "1"; - position = "0 0"; - extent = "885 32"; + position = "36 4"; + extent = "885 36"; minExtent = "16 16"; horizSizing = "right"; - vertSizing = "bottom"; + vertSizing = "top"; profile = "GuiDefaultProfile"; visible = "1"; active = "1"; @@ -56,83 +80,188 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { isContainer = "1"; canSave = "1"; canSaveDynamicFields = "0"; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "0 3"; + Extent = "9 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; + }; + + new GuiBitmapButtonCtrl(WorldSaveBtn) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 3"; + Extent = "29 27"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "EditorSaveMissionMenu();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Save the Level"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:save_n_image"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "0 3"; + Extent = "2 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; + }; - new GuiBitmapButtonCtrl(EHWorldEditor) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "4 3"; - Extent = "29 27"; - MinExtent = "8 8"; - canSave = "1"; - Visible = "1"; - Command = ""; - tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Open the WorldEditor"; - hovertime = "1000"; - bitmapAsset = "ToolsModule:world_image"; - groupNum = "0"; - buttonType = "RadioButton"; - useMouseEvents = "0"; - }; - new GuiBitmapButtonCtrl(EHGuiEditor) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "34 3"; - Extent = "29 27"; - MinExtent = "8 8"; - canSave = "1"; - Visible = "1"; - Command = "toggleGuiEditor(true); $GuiEditorBtnPressed = true;"; - tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Open the GuiEditor"; - hovertime = "1000"; - bitmapAsset = "ToolsModule:gui_image"; - groupNum = "0"; - buttonType = "RadioButton"; - useMouseEvents = "0"; - }; - new GuiBitmapButtonCtrl() { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "64 3"; - Extent = "29 27"; - MinExtent = "8 8"; - canSave = "1"; - Visible = "1"; - Command = "Editor.close(ProjectSettings.value(\"UI/playGUIName\"));"; - tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Play Game"; - hovertime = "1000"; - bitmapAsset = "ToolsModule:playbutton_n_image"; - groupNum = "0"; - buttonType = "PushButton"; - useMouseEvents = "0"; - }; - - new GuiBitmapCtrl() { - Enabled = "1"; - Profile = "ToolsGuiDefaultProfile"; - position = "98 3"; - Extent = "2 26"; - MinExtent = "1 1"; - bitmapAsset = "ToolsModule:separator_h_image"; - }; - + new GuiBitmapButtonCtrl(EHWorldEditor) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 3"; + Extent = "29 27"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = ""; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Open the WorldEditor"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:world_n_image"; + groupNum = "0"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapButtonCtrl(EHGuiEditor) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "34 3"; + Extent = "29 27"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "toggleGuiEditor(true); $GuiEditorBtnPressed = true;"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Open the GuiEditor"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:gui_n_image"; + groupNum = "0"; + buttonType = "RadioButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "0 0"; + Extent = "9 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; + }; + + new GuiBitmapButtonCtrl(AssetBrowserBtn) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 0"; + Extent = "29 27"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + active = "1"; + Command = "AssetBrowser.toggleDialog();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + tooltip = "Open the Asset Browser"; + hovertime = "750"; + bitmapAsset = "ToolsModule:assetBrowser_n_image"; + buttonType = "PushButton"; + useStates = "1"; + groupNum = "0"; + useMouseEvents = "0"; + internalName = "AssetBrowserBtn"; + }; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "0 3"; + Extent = "9 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; + }; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "0 3"; + Extent = "2 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; + }; + + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 3"; + Extent = "29 27"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "Editor.close(ProjectSettings.value(\"UI/playGUIName\"));"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Play Game"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:playbutton_n_image"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "0 3"; + Extent = "9 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; + }; + new GuiBitmapButtonCtrl() { BitmapAsset = "ToolsModule:settings_n_image"; - bitmapMode = "Stretched"; autoFitExtents = "0"; useModifiers = "0"; useStates = "1"; @@ -140,11 +269,11 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "572 0"; + position = "574 0"; extent = "29 27"; minExtent = "8 8"; horizSizing = "right"; - vertSizing = "bottom"; + VertSizing = "bottom"; profile = "ToolsGuiButtonProfile"; visible = "1"; active = "1"; @@ -158,100 +287,164 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { canSaveDynamicFields = "0"; }; - new GuiBitmapCtrl() { - Enabled = "1"; - Profile = "ToolsGuiDefaultProfile"; - position = "98 3"; - Extent = "2 26"; - MinExtent = "1 1"; - bitmapAsset = "ToolsModule:separator_h_image"; - }; - - new GuiBitmapButtonCtrl() { + new GuiBitmapButtonCtrl(windowConsoleBtn) { canSaveDynamicFields = "0"; - internalName = AssetBrowserBtn; Enabled = "1"; isContainer = "0"; Profile = "ToolsGuiButtonProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "180 0"; + position = "0 0"; Extent = "29 27"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; - Command = "AssetBrowser.toggleDialog();"; + active = "1"; + Command = "windowConsoleDlg.showWindow();"; tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Asset Browser"; + tooltip = "Open the Console in a window"; hovertime = "750"; - bitmapAsset = "ToolsModule:menuGrid_n_image"; - bitmapMode = "Stretched"; + bitmapAsset = "ToolsModule:console_n_image"; buttonType = "PushButton"; + useStates = "1"; groupNum = "0"; useMouseEvents = "0"; + internalName = "windowConsoleBtn"; }; new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "98 3"; - Extent = "2 26"; + position = "0 3"; + Extent = "9 26"; MinExtent = "1 1"; - bitmapAsset = "ToolsModule:separator_h_image"; + bitmapAsset = "ToolsModule:separator_xt_h_image"; + horizSizing = "right"; + vertSizing = "bottom"; }; - new GuiBitmapButtonCtrl(EWorldEditorToggleCamera) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "102 3"; - Extent = "29 27"; - MinExtent = "8 8"; - canSave = "1"; - Visible = "1"; - Command = "CameraTypesDropdownToggle();"; - tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Toggle Camera Modes"; - hovertime = "1000"; - bitmapAsset = "ToolsModule:player_n_image"; - groupNum = "-1"; - buttonType = "ToggleButton"; - useMouseEvents = "0"; - - new GuiBitmapCtrl(){ - HorizSizing = "left"; - VertSizing = "top"; - Position = getWord(EWorldEditorToggleCamera.extent, 0)-6 SPC getWord(EWorldEditorToggleCamera.extent, 1)-6; - Extent = "4 4"; - MinExtent = "4 4"; - bitmapAsset = "ToolsModule:dropdown_button_arrow_image"; - }; - }; - new GuiControl(CameraSpeedDropdownContainer, EditorGuiGroup) { - canSaveDynamicFields = "0"; - isContainer = "1"; - Profile = "ToolsGuiTransparentProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "136 5"; - Extent = "136 27"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - hovertime = "1000"; - - new GuiTextCtrl() { + new GuiBitmapButtonCtrl(EWorldEditorToggleCamera) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "0"; - Profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiButtonProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "0 6"; - Extent = "78 10"; + Position = "102 3"; + Extent = "29 27"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "CameraTypesDropdownToggle();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Toggle Camera Modes"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:player_n_image"; + groupNum = "-1"; + buttonType = "ToggleButton"; + useMouseEvents = "0"; + + new GuiBitmapCtrl() { + HorizSizing = "left"; + VertSizing = "top"; + Position = getWord(EWorldEditorToggleCamera.extent, 0)-6 SPC getWord(EWorldEditorToggleCamera.extent, 1)-6; + Extent = "4 4"; + MinExtent = "4 4"; + bitmapAsset = "ToolsModule:dropdown_button_arrow_image"; + }; + }; + + new GuiControl(CameraSpeedDropdownContainer, EditorGuiGroup) { + canSaveDynamicFields = "0"; + isContainer = "1"; + Profile = "ToolsGuiTransparentProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "136 5"; + Extent = "136 27"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextRightProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "0 6"; + Extent = "72 10"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "Cam Speed: "; + maxLength = "1024"; + }; + + new GuiTextEditCtrl(EWorldEditorCameraSpeed) { + canSaveDynamicFields = "0"; + internalName = "textEdit"; + isContainer = "0"; + profile="ToolsGuiNumericDropSliderTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "78 2"; + Extent = "42 16"; + MinExtent = "8 16"; + canSave = "1"; + Visible = "1"; + Command = "EWorldEditorCameraSpeed.updateMenuBar( $ThisControl );"; + hovertime = "1000"; + text = "100"; + maxLength = "4"; + historySize = "0"; + password = "0"; + tabComplete = "0"; + sinkAllKeyEvents = "0"; + }; + + new GuiBitmapButtonCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "112 2"; + Extent = "18 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "Canvas.pushDialog(CameraSpeedDropdownCtrlContainer);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Changes the Camera Speed"; + hovertime = "750"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + bitmapAsset = "ToolsModule:dropslider_n_image"; + }; + }; + + /*new GuiPopUpMenuCtrl(EWorldEditorCameraSpeed) { + canSaveDynamicFields = "0"; + internalName = "CameraSpeedDropdown"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiPopUpMenuProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "136 7"; + Extent = "130 18"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -262,78 +455,13 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "Camera Speed"; maxLength = "1024"; - }; - new GuiTextEditCtrl(EWorldEditorCameraSpeed) { - canSaveDynamicFields = "0"; - internalName = "textEdit"; - isContainer = "0"; - profile="ToolsGuiNumericDropSliderTextProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - position = "78 2"; - Extent = "42 16"; - MinExtent = "8 16"; - canSave = "1"; - Visible = "1"; - Command = "EWorldEditorCameraSpeed.updateMenuBar( $ThisControl );"; - hovertime = "1000"; - text = "100"; - maxLength = "4"; - historySize = "0"; - password = "0"; - tabComplete = "0"; - sinkAllKeyEvents = "0"; - }; - new GuiBitmapButtonCtrl() { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "112 2"; - Extent = "18 18"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "Canvas.pushDialog(CameraSpeedDropdownCtrlContainer);"; - tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "Changes the Camera Speed"; - hovertime = "750"; - groupNum = "-1"; - buttonType = "PushButton"; - useMouseEvents = "0"; - bitmapAsset = "ToolsModule:dropslider_n_image"; - }; - }; - /*new GuiPopUpMenuCtrl(EWorldEditorCameraSpeed) { - canSaveDynamicFields = "0"; - internalName = "CameraSpeedDropdown"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiPopUpMenuProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; - Position = "136 7"; - Extent = "130 18"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - hovertime = "1000"; - Margin = "0 0 0 0"; - Padding = "0 0 0 0"; - AnchorTop = "1"; - AnchorBottom = "0"; - AnchorLeft = "1"; - AnchorRight = "0"; - maxLength = "1024"; - maxPopupHeight = "200"; - sbUsesNAColor = "0"; - reverseTextList = "0"; - bitmapBounds = "16 16"; - };*/ + maxPopupHeight = "200"; + sbUsesNAColor = "0"; + reverseTextList = "0"; + bitmapBounds = "16 16"; + };*/ + new GuiBitmapButtonCtrl(visibilityToggleBtn) { canSaveDynamicFields = "0"; Enabled = "1"; @@ -352,7 +480,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { hovertime = "1000"; bitmapAsset = "ToolsModule:visibility_toggle_n_image"; groupNum = "-1"; - buttonType = "ToggleButton"; + buttonType = "PushButton"; useMouseEvents = "0"; new GuiBitmapCtrl(){ @@ -372,6 +500,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; + VertSizing = "bottom"; }; new GuiPopUpMenuCtrl(EWorldEditorAlignPopup) { @@ -418,14 +547,25 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { hovertime = "1000"; Docking = "Bottom"; - new GuiTextCtrl(EWorldEditorStatusBarInfo) { + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "14 7"; + Extent = "20 20"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:mission_file_image"; + }; + + new GuiMLTextCtrl(EWorldEditorStatusBarInfo) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "0"; - Profile = "ToolsGuiTextProfile"; + Profile = "ToolsGuiMLTextProfile"; HorizSizing = "width"; VertSizing = "bottom"; - Position = "10 8"; + Position = "40 10"; Extent = "450 18"; MinExtent = "8 8"; canSave = "1"; @@ -437,6 +577,8 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { AnchorRight = "0"; text = "Current Tool"; maxLength = "255"; + allowColorChars = "1"; + }; new GuiBitmapCtrl() { diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui index 97c607324..d20fc4053 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = "Editor Settings"; + text = ":: Editor Settings"; closeCommand = "ESettingsWindow.hideDialog();"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui index 19c32c0ac..79b6d63d8 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ManageBookmarksWindow.ed.gui @@ -29,7 +29,7 @@ $guiContent = new GuiControl(ManageBookmarksContainer, EditorGuiGroup) { position = "50 90"; extent = "180 306"; MinExtent = "120 130"; - text = "Camera Bookmark Manager"; + text = ":: Camera Bookmark Manager"; closeCommand = "EManageBookmarks.hideDialog();"; EdgeSnap = "0"; canCollapse = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui index d1b603ece..41b7b0adf 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ManageSFXParametersWindow.ed.gui @@ -27,7 +27,7 @@ $guiContent = new GuiControl(ManageSFXParametersContainer,EditorGuiGroup) { minSize = "50 50"; closeCommand = "EManageSFXParameters.setVisible( false );"; EdgeSnap = "0"; - text = "Audio Parameters"; + text = ":: Audio Parameters"; Margin = "5 5 5 5"; Padding = "5 5 5 5"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui index 97382bb99..d1c8d041b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectEditorSettingsTab.ed.gui @@ -929,7 +929,7 @@ $guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) { horizSizing = "right"; vertSizing = "bottom"; position = "0 0"; - extent = "210 14"; + extent = "300 14"; new GuiCheckBoxCtrl() { useInactiveState = "0"; @@ -963,7 +963,7 @@ $guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) { horizSizing = "right"; vertSizing = "bottom"; position = "5 70"; - extent = "210 18"; + extent = "300 18"; new GuiTextCtrl() { text = "Screen Center Scalar:"; @@ -1027,7 +1027,7 @@ $guiContent = new GuiControl(ObjectEditorSettingsTab,EditorGuiGroup) { horizSizing = "right"; vertSizing = "bottom"; position = "5 70"; - extent = "210 18"; + extent = "300 18"; new GuiTextCtrl() { text = "Screen Center Max:"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui index 258edf72f..bd227f193 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui @@ -30,7 +30,7 @@ $guiContent = new GuiControl(ObjectSnapOptionsContainer, EditorGuiGroup) { position = "400 31"; extent =" 175 267"; MinExtent = "175 130"; - text = "Snap Options"; + text = ":: Snap Options"; closeCommand = "ESnapOptions.hideDialog();"; EdgeSnap = "0"; canCollapse = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui index d1c98df34..688cee4f8 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainEditToolbar.ed.gui @@ -18,7 +18,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { profile = "ToolsGuiTextProfile"; horizSizing = "right"; vertSizing = "bottom"; - position = "6 7"; + position = "6 4"; extent = "70 16"; minExtent = "8 8"; visible = "1"; @@ -44,7 +44,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { new GuiControl(EWTerrainEditToolbarBrushType){ isContainer = "1"; profile = "ToolsGuiDefaultProfile"; - Position = "83 2"; + Position = "83 0"; Extent = "94 27"; new GuiBitmapButtonCtrl() { @@ -117,15 +117,15 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { }; */ }; - - new GuiBitmapCtrl() { - Enabled = "1"; - Profile = "ToolsGuiDefaultProfile"; - position = "152 3"; - Extent = "2 26"; - MinExtent = "1 1"; - bitmapAsset = "ToolsModule:separator_h_image"; - }; + + new GuiBitmapCtrl() { + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "152 0"; + Extent = "2 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_h_image"; + }; new GuiControl(TerrainBrushSizeTextEditContainer) { canSaveDynamicFields = "0"; @@ -133,7 +133,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "145 5"; + position = "145 2"; Extent = "120 50"; MinExtent = "8 2"; canSave = "1"; @@ -206,13 +206,14 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { bitmapAsset = "ToolsModule:dropslider_n_image"; }; }; + new GuiBitmapCtrl() { - Enabled = "1"; - Profile = "ToolsGuiDefaultProfile"; - position = "272 3"; - Extent = "2 26"; - MinExtent = "1 1"; - bitmapAsset = "ToolsModule:separator_h_image"; + Enabled = "1"; + Profile = "ToolsGuiDefaultProfile"; + position = "272 0"; + Extent = "2 26"; + MinExtent = "1 1"; + bitmapAsset = "ToolsModule:separator_h_image"; }; new GuiControl(TerrainBrushPressureTextEditContainer) { @@ -221,7 +222,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "287 5"; + position = "287 2"; Extent = "120 50"; MinExtent = "8 2"; canSave = "1"; @@ -293,10 +294,11 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { bitmapAsset = "ToolsModule:dropslider_n_image"; }; }; + new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "412 3"; + position = "412 0"; Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; @@ -308,7 +310,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "429 5"; + position = "429 2"; Extent = "120 50"; MinExtent = "8 2"; canSave = "1"; @@ -388,7 +390,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; - Position = "547 3"; + Position = "547 0"; Extent = "29 27"; MinExtent = "8 2"; canSave = "1"; @@ -406,7 +408,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "589 3"; + position = "589 0"; Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; @@ -418,7 +420,7 @@ $guiContent = new GuiControl(EWTerrainEditToolbar,EditorGuiGroup) { Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "605 5"; + position = "605 2"; Extent = "120 50"; MinExtent = "8 2"; canSave = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui index 73b0d6e73..2425cf813 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterToolbar.ed.gui @@ -7,7 +7,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; - Position = "306 0"; + Position = "306 -3"; Extent = "800 40"; MinExtent = "8 2"; canSave = "1"; @@ -18,7 +18,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { profile = "ToolsGuiTextProfile"; horizSizing = "right"; vertSizing = "bottom"; - position = "6 7"; + position = "6 4"; extent = "70 16"; minExtent = "8 8"; visible = "1"; @@ -44,7 +44,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { new GuiControl(EWTerrainPainterToolbarBrushType){ isContainer = "1"; profile = "ToolsGuiDefaultProfile"; - Position = "83 2"; + Position = "83 0"; Extent = "94 27"; new GuiBitmapButtonCtrl() { @@ -121,7 +121,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "152 3"; + position = "152 0"; Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; @@ -133,7 +133,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "145 5"; + position = "145 2"; Extent = "120 50"; MinExtent = "8 2"; canSave = "1"; @@ -210,7 +210,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "230 3"; + position = "255 0"; Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; @@ -222,7 +222,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "right"; VertSizing = "bottom"; - Position = "245 5"; + Position = "245 2"; Extent = "256 50"; MinExtent = "8 2"; canSave = "1"; @@ -250,7 +250,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "Slope Mask Min"; + text = "Slope Mask: Min"; maxLength = "1024"; }; new GuiTextEditCtrl() { @@ -370,7 +370,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "445 3"; + position = "498 0"; Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; @@ -382,7 +382,7 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { Profile = "ToolsGuiTransparentProfile"; HorizSizing = "right"; VertSizing = "bottom"; - position = "490 5"; + position = "510 2"; Extent = "120 50"; MinExtent = "8 2"; canSave = "1"; @@ -458,14 +458,14 @@ $guiContent = new GuiControl(EWTerrainPainterToolbar,EditorGuiGroup) { new GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; - position = "618 3"; + position = "618 0"; Extent = "2 26"; MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; }; new GuiControl(TerrainTextureSettingsButtonContainer,EditorGuiGroup) { - position = "628 5"; + position = "628 4"; extent = "90 18"; minExtent = "8 2"; horizSizing = "right"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui index bc703c901..60e66732c 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui @@ -15,6 +15,252 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { tooltipprofile = "ToolsGuiToolTipProfile"; hovertime = "1000"; + new GuiWindowCollapseCtrl(EPainterPreview) { + canSaveDynamicFields = "0"; + internalName = "TerrainPainterPreview"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiWindowProfile"; + HorizSizing = "windowRelative"; + VertSizing = "windowRelative"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 340"; + MinExtent = "300 320"; + canSave = "1"; + isDecoy = "0"; + Visible = "0"; + hovertime = "1000"; + Docking = "None"; + Margin = "4 4 4 4"; + Padding = "0 0 0 0"; + AnchorTop = "0"; + AnchorBottom = "0"; + AnchorLeft = "0"; + AnchorRight = "0"; + resizeWidth = "1"; + resizeHeight = "0"; + canMove = "1"; + canClose = "0"; + canMinimize = "0"; + canMaximize = "0"; + minSize = "300 160"; + closeCommand = "EPainter.parentGroup.setVisible(false);"; + EdgeSnap = "1"; + text = ":: Terrain Painter - Preview"; + + new GuiContainer(EPainterPreviewCont){ + Docking = "Client"; + Margin = "0 0 0 0"; + HorizSizing = "center"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "256 256"; + + new GuiBitmapCtrl(ETerrainMaterialSelected) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "center"; + VertSizing = "bottom"; + Position = "0 8"; + Extent = "256 256"; + MinExtent = "128 128"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + wrap = "0"; + bitmapAsset= "ToolsModule:unknownImage_image"; + }; + new GuiBitmapCtrl(ETerrainMaterialSelectedBorder) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiDefaultProfile"; + HorizSizing = "center"; + VertSizing = "bottom"; + Position = "0 8"; + Extent = "256 256"; + MinExtent = "128 128"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:terrain_painter_border_large_image"; + wrap = "0"; + }; + }; + new GuiContainer(){ + Margin = "0 0 0 0"; + HorizSizing = "center"; + VertSizing = "bottom"; + Position = "0 288"; + Extent = "256 44"; + + new GuiTextCtrl(TerrainTextureText) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiTextProfile"; + HorizSizing = "center"; + VertSizing = "bottom"; + Position = "0 0"; + Extent = "180 18"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "1"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "1"; + AnchorRight = "0"; + text = "None"; + maxLength = "1024"; + }; + new GuiButtonCtrl(ETerrainMaterialSelectedEdit) { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "150 20"; + Extent = "40 18"; + MinExtent = "8 2"; + canSave = "1"; + isDecoy = "0"; + Visible = "0"; + Command = "TerrainMaterialDlg.show(ETerrainMaterialSelected.selectedMatIndex, ETerrainMaterialSelected.selectedMat, EPainter_TerrainMaterialUpdateCallback);"; + tooltipprofile = "ToolsGuiToolTipProfile"; + hovertime = "1000"; + text = "Edit"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiButtonCtrl() { + canSaveDynamicFields = "0"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "196 20"; + Extent = "60 18"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + Command = "autoLayers();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + tooltip = "Generate a layer mask for this material."; + hovertime = "1000"; + text = "AutoPaint"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + }; + new GuiBitmapButtonCtrl(TerrainPainterContainer_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "TerrainPainterContainer.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(TerrainPainterContainer_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "TerrainPainterContainer.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(TerrainPainterContainer_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "TerrainPainterContainer.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(TerrainPainterContainer_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "TerrainPainterContainer.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + }; + new GuiWindowCollapseCtrl(EPainter) { canSaveDynamicFields = "0"; internalName = "TerrainPainter"; @@ -23,9 +269,10 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { Profile = "ToolsGuiWindowProfile"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 SPC getWord(EditorGuiToolbar.extent, 1)+249; - Extent = "210 446"; - MinExtent = "210 100"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(EPainterPreview.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(EPainterPreview.extent, 1) - getWord(EditorGuiToolbar.extent, 1) - 66; + MinExtent = "300 100"; canSave = "1"; isDecoy = "0"; Visible = "0"; @@ -46,7 +293,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { minSize = "152 300"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = "Terrain Painter Material Selector"; + text = ":: Terrain Painter - Selector"; new GuiScrollCtrl( EPainterScroll ) { canSaveDynamicFields = "0"; @@ -101,149 +348,5 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { }; }; }; - new GuiWindowCollapseCtrl(EPainterPreview) { - canSaveDynamicFields = "0"; - internalName = "TerrainPainterPreview"; - Enabled = "1"; - isContainer = "1"; - Profile = "ToolsGuiWindowProfile"; - HorizSizing = "windowRelative"; - VertSizing = "windowRelative"; - Position = getWord($pref::Video::mode, 0) - 209 SPC getWord(EditorGuiToolbar.extent, 1)-1; - Extent = "210 251"; - MinExtent = "210 251"; - canSave = "1"; - isDecoy = "0"; - Visible = "0"; - hovertime = "1000"; - Docking = "None"; - Margin = "4 4 4 4"; - Padding = "0 0 0 0"; - AnchorTop = "0"; - AnchorBottom = "0"; - AnchorLeft = "0"; - AnchorRight = "0"; - resizeWidth = "1"; - resizeHeight = "1"; - canMove = "1"; - canClose = "0"; - canMinimize = "0"; - canMaximize = "0"; - minSize = "152 300"; - closeCommand = "EPainter.parentGroup.setVisible(false);"; - EdgeSnap = "1"; - text = "Terrain Painter Material Preview"; - - new GuiContainer(){ - Docking = "Client"; - Margin = "3 22 3 3"; - HorizSizing = "width"; - VertSizing = "height"; - Position = "4 24"; - Extent = "202 202"; - - new GuiBitmapCtrl(ETerrainMaterialSelected) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "width"; - VertSizing = "height"; - Position = "0 0"; - Extent = "202 202"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - wrap = "0"; - bitmapAsset= "ToolsModule:unknownImage_image"; - }; - new GuiBitmapCtrl(ETerrainMaterialSelectedBorder) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "width"; - VertSizing = "height"; - Position = "0 0"; - Extent = "202 202"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - bitmapAsset = "ToolsModule:terrain_painter_border_large_image"; - wrap = "0"; - }; - }; - new GuiButtonCtrl(ETerrainMaterialSelectedEdit) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiButtonProfile"; - HorizSizing = "left"; - VertSizing = "top"; - Position = "170 229"; - Extent = "36 18"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "0"; - Command = "TerrainMaterialDlg.show(ETerrainMaterialSelected.selectedMatIndex, ETerrainMaterialSelected.selectedMat, EPainter_TerrainMaterialUpdateCallback);"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - text = "Edit"; - groupNum = "-1"; - buttonType = "PushButton"; - useMouseEvents = "0"; - }; - new GuiTextCtrl(TerrainTextureText) { - canSaveDynamicFields = "0"; - Enabled = "1"; - isContainer = "0"; - Profile = "ToolsGuiTextProfile"; - HorizSizing = "width"; - VertSizing = "top"; - Position = "5 230"; - Extent = "162 16"; - MinExtent = "8 2"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - Margin = "0 0 0 0"; - Padding = "0 0 0 0"; - AnchorTop = "1"; - AnchorBottom = "0"; - AnchorLeft = "1"; - AnchorRight = "0"; - text = "None"; - maxLength = "1024"; - }; - new GuiButtonCtrl() { - canSaveDynamicFields = "0"; - isContainer = "0"; - Profile = "GuiButtonProfile"; - HorizSizing = "left"; - VertSizing = "bottom"; - Position = "100 229"; - Extent = "50 18"; - MinExtent = "8 2"; - canSave = "1"; - Visible = "1"; - Command = "autoLayers();"; - tooltipprofile = "ToolsGuiToolTipProfile"; - tooltip = "Generate a layer mask for this material."; - hovertime = "1000"; - text = "AutoPaint"; - groupNum = "-1"; - buttonType = "PushButton"; - useMouseEvents = "0"; - }; - }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui index bdfff71fb..c5a201234 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui @@ -4,8 +4,8 @@ $guiContent = new GuiControl() { Enabled = "1"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; + HorizSizing = "width"; + VertSizing = "height"; Position = "0 0"; Extent = "800 600"; MinExtent = "8 2"; @@ -14,15 +14,17 @@ $guiContent = new GuiControl() { hovertime = "1000"; new GuiWindowCollapseCtrl(EWInspectorWindow) { + canCollapse = "0"; + canMove = "0"; canSaveDynamicFields = "0"; internalName = "InspectorWindow"; Enabled = "1"; isContainer = "1"; Profile = "ToolsGuiWindowProfile"; - Position = getWord($pref::Video::mode, 0) - 330 SPC - getWord(EditorGuiToolbar.extent, 1) + getWord(EWTreeWindow.extent, 1) + 40; - Extent = "300 250"; - MinExtent = "200 150"; + Position = getWord($pref::Video::mode, 0) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + getWord(EWTreeWindow.extent, 1) + 6; + Extent = "360" SPC getWord($pref::Video::mode, 1) - getWord(EWTreeWindow.extent, 1) - getWord(EditorGuiToolbar.extent, 1) + 66; + MinExtent = "300 150"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; canSave = "1"; @@ -36,16 +38,15 @@ $guiContent = new GuiControl() { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; canMinimize = "0"; canMaximize = "0"; closeCommand = "EWInspectorWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = "Inspector"; + text = ":: World Editor - Inspector"; - new GuiContainer() { + new GuiContainer(EWInspectorContainer) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "0"; @@ -53,7 +54,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; Position = "5 24"; - Extent = "202 304"; + Extent = "360 304"; MinExtent = "64 64"; canSave = "1"; Visible = "1"; @@ -126,8 +127,8 @@ $guiContent = new GuiControl() { Profile = "GuiInspectorFieldInfoMLTextProfile"; HorizSizing = "width"; VertSizing = "top"; - Position = 5 SPC EWInspectorWindow.extent.y - 40; - Extent = "197 35"; + Position = "8" SPC EWInspectorWindow.extent.y - 40; + Extent = "330 35"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui index d56c775c2..bf62fa270 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui @@ -8,7 +8,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) { HorizSizing = "right"; VertSizing = "bottom"; Position = "306 0"; - Extent = "600" SPC getWord(EditorGuiToolbar.extent, 1); + Extent = "600" SPC getWord(EditorGuiToolbar.extent, 1) -2; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -24,7 +24,7 @@ $guiContent = new GuiControl(EWorldEditorToolbar, EditorGuiGroup) { Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; - Position = "0 3"; + Position = "0 0"; Extent = "190 31"; MinExtent = "16 16"; canSave = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui index 8ed43db5d..51692048c 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui @@ -4,8 +4,8 @@ $guiContent = new GuiControl() { Enabled = "1"; isContainer = "1"; Profile = "ToolsGuiDefaultProfile"; - HorizSizing = "right"; - VertSizing = "bottom"; + HorizSizing = "width"; + VertSizing = "height"; Position = "0 0"; Extent = "800 600"; MinExtent = "8 2"; @@ -14,15 +14,17 @@ $guiContent = new GuiControl() { hovertime = "1000"; new GuiWindowCollapseCtrl(EWTreeWindow) { + canCollapse = "0"; + canMove = "0"; canSaveDynamicFields = "0"; internalName = "TreeWindow"; Enabled = "1"; isContainer = "1"; Profile = "ToolsGuiWindowProfile"; - Position = firstWord($pref::Video::mode) - 330 - SPC getWord(EditorGuiToolbar.extent, 1) + 40; - Extent = "300 270"; - MinExtent = "200 250"; + Position = firstWord($pref::Video::mode) - 360 + SPC getWord(EditorGuiToolbar.extent, 1) + 6; + Extent = "360 300"; + MinExtent = "300 180"; HorizSizing = "windowRelative"; VertSizing = "windowRelative"; canSave = "1"; @@ -36,14 +38,13 @@ $guiContent = new GuiControl() { AnchorRight = "0"; resizeWidth = "1"; resizeHeight = "1"; - canMove = "1"; canClose = "0"; - canMinimize = "1"; + canMinimize = "0"; canMaximize = "0"; minSize = "50 50"; closeCommand = "EWTreeWindow.setVisible(false);"; EdgeSnap = "1"; - text = "Scene Tree"; + text = ":: World Edior - Scene Tree"; new GuiTabBookCtrl(EditorTreeTabBook) { canSaveDynamicFields = "0"; @@ -53,12 +54,12 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "6 27"; - Extent = "197 289"; + Extent = "300 289"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; hovertime = "1000"; - Margin = "0 0 0 0"; + Margin = "0 0 3 0"; Docking = "client"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -77,7 +78,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; position = "0 19"; - Extent = "197 271"; + Extent = "300 271"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -93,7 +94,7 @@ $guiContent = new GuiControl() { new GuiTextEditCtrl( EditorTreeFilter ) { position = "5 6"; - extent = "187 25"; + extent = "280 25"; profile = "ToolsGuiTextEditProfile"; horizSizing = "width"; vertSizing = "bottom"; @@ -110,7 +111,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiDefaultProfile"; HorizSizing = "left"; VertSizing = "bottom"; - position = "171 6"; + position = "263 6"; Extent = "17 17"; MinExtent = "8 2"; canSave = "1"; @@ -130,7 +131,7 @@ $guiContent = new GuiControl() { HorizSizing = "width"; VertSizing = "height"; Position = "5 29"; - Extent = "187 238"; + Extent = "300 271"; MinExtent = "8 8"; canSave = "1"; Visible = "1"; @@ -185,8 +186,8 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiEditorTabPage"; HorizSizing = "width"; VertSizing = "height"; - position = "0 19"; - Extent = "197 271"; + position = "0 20"; + Extent = "300 270"; MinExtent = "8 2"; canSave = "1"; Visible = "1"; @@ -199,8 +200,270 @@ $guiContent = new GuiControl() { AnchorRight = "0"; text = "Assets"; maxLength = "1024"; + + new GuiBitmapCtrl(){ + position="0 -20"; + extent ="240 2"; + MinExtent = "120 2"; + HorizSizing = "width"; + bitmapAsset ="ToolsModule:separator_v_image"; + }; + + + new GuiScrollCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "1"; + Profile = "ToolsGuiScrollProfile"; + HorizSizing = "width"; + VertSizing = "height"; + Position = "0 0"; + Extent = "300 270"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + willFirstRespond = "1"; + hScrollBar = "dynamic"; + vScrollBar = "alwaysOn"; + lockHorizScroll = "false"; + lockVertScroll = "false"; + constantThumbHeight = "0"; + childMargin = "20 10"; + + new GuiBitmapCtrl(){ + position="0 0"; + extent ="240 0"; + MinExtent = "120 0"; + HorizSizing = "right"; + bitmapAsset ="ToolsModule:separator_v_image"; + isContainer = "0"; + }; + + new GuiIconButtonCtrl() { + canSaveDynamicFields = "0"; + internalName = "AssetsTabBrowserBtn"; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 10"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "AssetBrowser.toggleDialog();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Asset Browser"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:assetBrowser_n_image"; + groupNum = "0"; + text="Asset Browser"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapCtrl(){ + position="0 70"; + extent ="240 2"; + MinExtent = "120 2"; + HorizSizing = "right"; + bitmapAsset ="ToolsModule:separator_v_image"; + isContainer = "0"; + }; + + new GuiTextCtrl() { + canSaveDynamicFields = "0"; + Enabled = "1"; + isContainer = "0"; + Profile = "EditorTextProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + position = "1 73"; + Extent = "200 20"; + MinExtent = "8 2"; + canSave = "1"; + Visible = "1"; + hovertime = "1000"; + Margin = "0 0 0 0"; + Padding = "0 0 0 0"; + AnchorTop = "1"; + AnchorBottom = "0"; + AnchorLeft = "0"; + AnchorRight = "0"; + text = "Basic Objects"; + maxLength = "1024"; + }; + + new GuiIconButtonCtrl(EWBasicPointLightBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 95"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "EditorGui.addPointLight();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Quickly place a Point Light." NL "Open the Asset Browser for more (Ctrl + O)"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:pointLight_btn_image"; + groupNum = "0"; + text="Point Light"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiIconButtonCtrl(EWBasicSpotLightBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 150"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "EditorGui.addSpotLight();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Quickly place a Spot Light" NL "Open the Asset Browser for more (Ctrl + O)"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:spotLight_btn_image"; + groupNum = "0"; + text="Spot Light"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiIconButtonCtrl(EWBasicSoundBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 205"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "EditorGui.addSound();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Quickly place a Sound Emitter" NL "Open the Asset Browser for more (Ctrl + O)"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:soundEmitter_btn_image"; + groupNum = "0"; + text="Sound Emitter"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiIconButtonCtrl(EWBasicParticleBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 260"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "EditorGui.addParticle();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Quickly place a Particle Emitter" NL "Open the Asset Browser for more (Ctrl + O)"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:particleEmitter_btn_image"; + groupNum = "0"; + text="Particle Emitter"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiIconButtonCtrl(EWBasicWaterBlockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 315"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "EditorGui.addWater();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Quickly place a Water Block" NL "Open the Asset Browser for more (Ctrl + O)"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:waterBlock_btn_image"; + groupNum = "0"; + text="Water Block"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiIconButtonCtrl(EWBasicTriggerBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiIconButtonLargeProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "0 370"; + Extent = "240 50"; + MinExtent = "120 50"; + canSave = "1"; + Visible = "1"; + Command = "EditorGui.addTrigger();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Quickly place a Trigger Volume" NL "Open the Asset Browser for more (Ctrl + O)"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:triggerZone_btn_image"; + groupNum = "0"; + text="Trigger"; + buttonMargin = "20 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + }; }; }; + new GuiBitmapButtonCtrl() { canSaveDynamicFields = "0"; internalName = "LockSelection"; @@ -209,7 +472,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - Position = "225 23"; + Position = "290 22"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -233,7 +496,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - Position = "250 23"; + Position = "311 22"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -257,7 +520,7 @@ $guiContent = new GuiControl() { Profile = "ToolsGuiButtonProfile"; HorizSizing = "left"; VertSizing = "bottom"; - Position = "275 23"; + Position = "332 23"; Extent = "16 16"; MinExtent = "8 2"; canSave = "1"; @@ -272,6 +535,100 @@ $guiContent = new GuiControl() { text = ""; useMouseEvents = "0"; }; + + new GuiBitmapButtonCtrl(EWorldEditor_UnDockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "EWorldEditor.releaseSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Detach Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_undock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + + new GuiBitmapButtonCtrl(EWorldEditor_DockBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "330 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "0"; + Command = "EWorldEditor.dockSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Dock Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_dock_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(EWorldEditor_HideBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "left"; + VertSizing = "bottom"; + Position = "312 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "EWorldEditor.hideSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Hide Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_hide_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + new GuiBitmapButtonCtrl(EWorldEditor_ShowBtn) { + canSaveDynamicFields = "0"; + internalName = ""; + Enabled = "1"; + isContainer = "0"; + Profile = "ToolsGuiButtonProfile"; + HorizSizing = "right"; + VertSizing = "bottom"; + Position = "4 1"; + Extent = "18 18"; + MinExtent = "8 8"; + canSave = "1"; + Visible = "1"; + Command = "EWorldEditor.showSidePanel();"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Show Sidepanel"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:panel_show_n_image"; + text = ""; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui index 3576e8734..5b964e925 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui @@ -46,7 +46,7 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { minSize = "4 4"; closeCommand = "Canvas.popDialog( TerrainImportGui );"; EdgeSnap = "0"; - text = "Import Terrain Height Map"; + text = ":: Import Terrain Height Map"; new GuiTextEditCtrl() { canSaveDynamicFields = "0"; @@ -85,7 +85,7 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { Profile = "ToolsGuiTextProfile"; HorizSizing = "right"; VertSizing = "top"; - Position = "11 66"; + Position = "11 64"; Extent = "120 20"; MinExtent = "8 2"; canSave = "1"; @@ -131,8 +131,8 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { Profile = "ToolsGuiTextEditProfile"; HorizSizing = "left"; VertSizing = "top"; - Position = "226 44"; - Extent = "82 18"; + Position = "210 44"; + Extent = "100 18"; MinExtent = "8 2"; canSave = "1"; isDecoy = "0"; @@ -160,7 +160,7 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { Profile = "ToolsGuiTextProfile"; HorizSizing = "left"; VertSizing = "top"; - Position = "226 26"; + Position = "210 26"; Extent = "88 18"; MinExtent = "8 2"; canSave = "1"; @@ -174,7 +174,7 @@ $guiContent = new GuiControl(TerrainImportGui, EditorGuiGroup) { AnchorBottom = "0"; AnchorLeft = "1"; AnchorRight = "0"; - text = "Meters Per Pixel"; + text = "Meters Per Pixel:"; maxLength = "1024"; }; new GuiTextCtrl() { diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui index da931bf45..20cb5de9e 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui @@ -1,924 +1,924 @@ -//--- OBJECT WRITE BEGIN --- -$guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) { - extent = "1024 768"; - profile = "ToolsGuiDefaultNonModalProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "1"; - canSaveDynamicFields = "1"; - - new GuiWindowCtrl() { - text = "Terrain Materials Editor"; - canMinimize = "0"; - canMaximize = "0"; - closeCommand = "TerrainMaterialDlg.dialogCancel();"; - edgeSnap = "0"; - docking = "None"; - margin = "4 4 4 4"; - anchorTop = "0"; - anchorLeft = "0"; - position = "222 59"; - extent = "457 639"; - minExtent = "358 452"; - horizSizing = "center"; - vertSizing = "center"; - profile = "ToolsGuiWindowProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiSplitContainer() { - splitPoint = "182 100"; - position = "3 27"; - extent = "450 579"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - - new GuiPanel() { - docking = "Client"; - extent = "180 579"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - internalName = "Panel1"; - - new GuiContainer() { - position = "6 -2"; - extent = "179 18"; - horizSizing = "width"; - profile = "inspectorStyleRolloutDarkProfile"; - tooltipProfile = "GuiToolTipProfile"; - - new GuiTextCtrl() { - text = "Terrain Materials"; - position = "5 0"; - extent = "91 18"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:new_n_image"; - position = "150 3"; - extent = "15 15"; - horizSizing = "left"; - vertSizing = "top"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.newMat();"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:delete_n_image"; - position = "163 3"; - extent = "15 15"; - horizSizing = "left"; - vertSizing = "top"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.deleteMat();"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - }; - new GuiControl() { - position = "6 26"; - extent = "177 545"; - horizSizing = "width"; - vertSizing = "height"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "1"; - - new GuiScrollCtrl() { - hScrollBar = "dynamic"; - vScrollBar = "dynamic"; - extent = "174 549"; - horizSizing = "width"; - vertSizing = "height"; - profile = "ToolsGuiScrollProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiTreeViewCtrl() { - itemHeight = "21"; - mouseDragging = "0"; - multipleSelections = "0"; - deleteObjectAllowed = "0"; - dragToItemAllowed = "0"; - showRoot = "0"; - showObjectIds = "0"; - showClassNames = "0"; - showObjectNames = "0"; - position = "1 1"; - extent = "224 42"; - profile = "ToolsGuiTreeViewProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "matLibTree"; - class = "TerrainMaterialTreeCtrl"; +//--- OBJECT WRITE BEGIN --- +$guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) { + extent = "1024 768"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "1"; + canSaveDynamicFields = "1"; + + new GuiWindowCtrl() { + text = ":: Terrain Materials Editor"; + resizeWidth = "0"; + canMinimize = "0"; + canMaximize = "0"; + closeCommand = "TerrainMaterialDlg.dialogCancel(); "; + edgeSnap = "0"; + docking = "None"; + margin = "4 4 4 4"; + anchorTop = "0"; + anchorLeft = "0"; + position = "224 59"; + extent = "466 700"; + minExtent = "358 452"; + horizSizing = "center"; + vertSizing = "center"; + profile = "ToolsGuiWindowProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiSplitContainer() { + splitPoint = "182 80"; + fixedSize = "80"; + position = "3 27"; + extent = "459 650"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + + new GuiPanel() { + docking = "Client"; + extent = "180 650"; + profile = "ToolsGuiSolidDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "Panel1"; + + new GuiContainer() { + position = "6 -2"; + extent = "189 18"; + horizSizing = "width"; + profile = "inspectorStyleRolloutProfile"; + tooltipProfile = "GuiToolTipProfile"; + + new GuiTextCtrl() { + text = "Terrain Materials"; + position = "5 0"; + extent = "112 23"; + profile = "ToolsGuiInspectorTitleTextProfile"; + tooltipProfile = "GuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:new_n_image"; + position = "137 4"; + extent = "16 16"; + horizSizing = "left"; + vertSizing = "top"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.newMat(); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:delete_n_image"; + position = "155 4"; + extent = "16 16"; + horizSizing = "left"; + vertSizing = "top"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.deleteMat(); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + }; + new GuiControl() { + position = "6 26"; + extent = "187 600"; + horizSizing = "width"; + vertSizing = "height"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "1"; + + new GuiScrollCtrl() { + hScrollBar = "dynamic"; + vScrollBar = "dynamic"; + extent = "171 600"; + horizSizing = "width"; + vertSizing = "height"; + profile = "ToolsGuiScrollProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiTreeViewCtrl() { + tabSize = "8"; + itemHeight = "21"; + mouseDragging = "0"; + multipleSelections = "0"; + deleteObjectAllowed = "0"; + dragToItemAllowed = "0"; + showRoot = "0"; + showObjectIds = "0"; + showClassNames = "0"; + showObjectNames = "0"; + position = "1 4"; + extent = "136 21"; + profile = "ToolsGuiTreeViewProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "matLibTree"; + class = "TerrainMaterialTreeCtrl"; + }; + }; + }; + }; + new GuiPanel() { + docking = "Client"; + position = "184 0"; + extent = "275 585"; + profile = "ToolsGuiSolidDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "panel2"; + + new GuiContainer() { + position = "1 0"; + extent = "274 585"; + horizSizing = "width"; + vertSizing = "height"; + profile = "inspectorStyleRolloutProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "matSettingsParent"; + + new GuiTextCtrl() { + text = "Material Properties"; + position = "8 1"; + extent = "117 16"; + profile = "ToolsGuiInspectorTitleTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextCtrl() { + text = "Name"; + position = "8 20"; + extent = "44 17"; + profile = "ToolsGuiTextBoldProfile"; + tooltipProfile = "ToolsGuiDefaultProfile"; + isContainer = "0"; + }; + new GuiTextCtrl() { + position = "47 19"; + extent = "223 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "matNameCtrl"; + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:separator_v_image"; + position = "1 42"; + extent = "271 2"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiContainer(DiffuseMapContainer) { + position = "6 47"; + extent = "261 75"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiCheckBoxCtrl() { + text = " Use Side Projection"; + position = "81 54"; + extent = "119 16"; + profile = "ToolsGuiCheckBoxProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "sideProjectionCtrl"; + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:unknownImage_image"; + position = "1 1"; + extent = "47 47"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "texDiffuseMap"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + position = "1 1"; + extent = "48 48"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"DiffuseMap\"); "; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Change the Active Diffuse Map for this layer"; + }; + new GuiTextCtrl() { + text = "Diffuse (Overlay)"; + position = "57 -2"; + extent = "39 18"; + profile = "EditorTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextCtrl() { + text = "None"; + position = "57 16"; + extent = "144 17"; + horizSizing = "width"; + profile = "ToolsGuiTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "diffuseMapAssetId"; + }; + new GuiButtonCtrl() { + text = "Edit"; + position = "200 0"; + extent = "40 16"; + horizSizing = "left"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"DiffuseMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:delete_n_image"; + position = "248 0"; + extent = "16 16"; + horizSizing = "left"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.clearTextureMap(\"DiffuseMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextCtrl() { + text = "Size"; + anchorTop = "0"; + anchorLeft = "0"; + position = "152 35"; + extent = "39 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "200"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 34"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "baseSizeCtrl"; + }; + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:separator_v_image"; + position = "6 121"; + extent = "266 2"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiContainer(DetailMapContainer) { + position = "6 127"; + extent = "261 75"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:unknownImage_image"; + position = "1 1"; + extent = "47 47"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "texDetailMap"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + position = "1 1"; + extent = "48 48"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"DetailMap\"); "; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Change the active Detail Map for this layer."; + }; + new GuiTextCtrl() { + text = "Detail"; + position = "57 -2"; + extent = "30 18"; + profile = "EditorTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextCtrl() { + text = "None"; + position = "57 16"; + extent = "205 17"; + horizSizing = "width"; + profile = "ToolsGuiTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "detailMapAssetId"; + }; + new GuiButtonCtrl() { + text = "Edit"; + position = "200 0"; + extent = "40 16"; + horizSizing = "left"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"DetailMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:delete_n_image"; + position = "248 0"; + extent = "16 16"; + horizSizing = "left"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.clearTextureMap(\"DetailMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextCtrl() { + text = "Size"; + anchorTop = "0"; + anchorLeft = "0"; + position = "152 33"; + extent = "39 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "2"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 32"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "detSizeCtrl"; + }; + new GuiTextCtrl() { + text = "Strength"; + anchorTop = "0"; + anchorLeft = "0"; + position = "10 56"; + extent = "65 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "1"; + anchorTop = "0"; + anchorLeft = "0"; + position = "82 56"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "detStrengthCtrl"; + }; + new GuiTextCtrl() { + text = "Distance"; + anchorTop = "0"; + anchorLeft = "0"; + position = "144 56"; + extent = "45 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "50"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 56"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "detDistanceCtrl"; + }; + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:separator_v_image"; + position = "6 208"; + extent = "266 2"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiContainer(NormalMapContainer) { + position = "6 213"; + extent = "261 120"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:unknownImage_image"; + position = "1 1"; + extent = "47 47"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "texNormalMap"; + }; + new GuiTextCtrl() { + text = "Normal"; + position = "57 -2"; + extent = "39 18"; + profile = "EditorTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + position = "1 1"; + extent = "48 48"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"NormalMap\"); "; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Change the active Normal Map for this layer."; + }; + new GuiTextCtrl() { + text = "None"; + position = "57 15"; + extent = "145 17"; + horizSizing = "width"; + profile = "ToolsGuiTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "normalMapAssetId"; + }; + new GuiButtonCtrl() { + text = "Edit"; + position = "200 0"; + extent = "40 16"; + horizSizing = "left"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"NormalMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:delete_n_image"; + position = "248 0"; + extent = "16 16"; + horizSizing = "left"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.clearTextureMap(\"NormalMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextCtrl() { + text = "Parallax Scale"; + position = "112 32"; + extent = "77 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "0"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 32"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "parallaxScaleCtrl"; + }; + new GuiSliderCtrl(TerrainMaterialDlgBlendHeightBaseSlider) { + range = "-0.5 0.5"; + ticks = "0"; + value = "0"; + position = "92 59"; + extent = "98 14"; + profile = "ToolsGuiSliderProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "blendHeightBaseSliderCtrl"; + }; + new GuiTextCtrl() { + text = "Blend Height"; + position = "16 58"; + extent = "68 15"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextEditCtrl(TerrainMaterialDlgBlendHeightBaseTextEdit) { + text = "0"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 56"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "blendHeightBaseTextEditCtrl"; + }; + new GuiSliderCtrl(TerrainMaterialDlgBlendHeightContrastSlider) { + range = "0 5"; + ticks = "0"; + value = "1"; + position = "93 82"; + extent = "97 14"; + profile = "ToolsGuiSliderProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "blendHeightContrastSliderCtrl"; + }; + new GuiTextCtrl() { + text = "Blend Contrast"; + position = "8 81"; + extent = "76 15"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextEditCtrl(TerrainMaterialDlgBlendHeightContrastTextEdit) { + text = "1"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 80"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "blendHeightContrastTextEditCtrl"; }; - }; - }; - }; - new GuiPanel() { - docking = "Client"; - position = "184 0"; - extent = "266 579"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - internalName = "panel2"; - - new GuiContainer() { - position = "-7 0"; - extent = "274 577"; - horizSizing = "width"; - vertSizing = "height"; - profile = "inspectorStyleRolloutProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "matSettingsParent"; - - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:separator_v_image"; - position = "1 0"; - extent = "271 2"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextCtrl() { - text = "Name"; - position = "8 22"; - extent = "44 17"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiDefaultProfile"; - isContainer = "0"; - }; - new GuiTextCtrl() { - position = "39 21"; - extent = "227 18"; - profile = "ToolsGuiTextEditProfile"; - //altCommand = "TerrainMaterialDlg.setMaterialName( $ThisControl.getText() );"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "matNameCtrl"; - }; - new GuiTextCtrl() { - text = "Material Properties"; - position = "8 0"; - extent = "117 16"; - profile = "ToolsGuiInspectorTitleTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiContainer(DiffuseMapContainer) { - position = "6 43"; - extent = "261 75"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiCheckBoxCtrl() { - text = " Use Side Projection"; - position = "55 54"; - extent = "119 16"; - profile = "ToolsGuiCheckBoxProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "sideProjectionCtrl"; - }; - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:unknownImage_image"; - position = "1 1"; - extent = "47 47"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "texDiffuseMap"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; - position = "1 1"; - extent = "48 48"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"DiffuseMap\");"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Change the Active Diffuse Map for this layer"; - }; - new GuiTextCtrl() { - text = "Diffuse (Overlay)"; - position = "56 -3"; - extent = "39 18"; - profile = "EditorTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextCtrl() { - text = "None"; - position = "56 16"; - extent = "205 17"; - horizSizing = "width"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "diffuseMapAssetId"; - }; - new GuiButtonCtrl() { - text = "Edit"; - position = "204 0"; - extent = "40 16"; - horizSizing = "left"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"DiffuseMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:delete_n_image"; - position = "247 0"; - extent = "16 16"; - horizSizing = "left"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.clearTextureMap(\"DiffuseMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextCtrl() { - text = "Size"; - anchorTop = "0"; - anchorLeft = "0"; - position = "132 35"; - extent = "39 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "200"; - anchorTop = "0"; - anchorLeft = "0"; - position = "94 34"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "baseSizeCtrl"; - }; - }; - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:separator_v_image"; - position = "6 116"; - extent = "266 2"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiContainer(DetailMapContainer) { - position = "6 122"; - extent = "261 75"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:unknownImage_image"; - position = "1 1"; - extent = "47 47"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "texDetailMap"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; - position = "1 1"; - extent = "48 48"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"DetailMap\");"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Change the active Detail Map for this layer."; - }; - new GuiTextCtrl() { - text = "Detail"; - position = "56 -3"; - extent = "30 18"; - profile = "EditorTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextCtrl() { - text = "None"; - position = "56 16"; - extent = "205 17"; - horizSizing = "width"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "detailMapAssetId"; - }; - new GuiButtonCtrl() { - text = "Edit"; - position = "204 0"; - extent = "40 16"; - horizSizing = "left"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"DetailMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:delete_n_image"; - position = "247 0"; - extent = "16 16"; - horizSizing = "left"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.clearTextureMap(\"DetailMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextCtrl() { - text = "Size"; - anchorTop = "0"; - anchorLeft = "0"; - position = "132 33"; - extent = "39 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "2"; - anchorTop = "0"; - anchorLeft = "0"; - position = "94 32"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "detSizeCtrl"; - }; - new GuiTextCtrl() { - text = "Strength"; - anchorTop = "0"; - anchorLeft = "0"; - position = "39 54"; - extent = "46 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "1"; - anchorTop = "0"; - anchorLeft = "0"; - position = "1 53"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "detStrengthCtrl"; - }; - new GuiTextCtrl() { - text = "Distance"; - anchorTop = "0"; - anchorLeft = "0"; - position = "132 54"; - extent = "45 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "50"; - anchorTop = "0"; - anchorLeft = "0"; - position = "94 53"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "detDistanceCtrl"; - }; - }; - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:separator_v_image"; - position = "6 198"; - extent = "266 2"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiContainer(NormalMapContainer) { - position = "6 205"; - extent = "261 120"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:unknownImage_image"; - position = "1 1"; - extent = "47 47"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "texNormalMap"; - }; - new GuiTextCtrl() { - text = "Normal"; - position = "56 -3"; - extent = "39 18"; - profile = "EditorTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; - position = "1 1"; - extent = "48 48"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"NormalMap\");"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Change the active Normal Map for this layer."; - }; - new GuiTextCtrl() { - text = "None"; - position = "56 15"; - extent = "205 17"; - horizSizing = "width"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "normalMapAssetId"; - }; - new GuiButtonCtrl() { - text = "Edit"; - position = "204 0"; - extent = "40 16"; - horizSizing = "left"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"NormalMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:delete_n_image"; - position = "247 0"; - extent = "16 16"; - horizSizing = "left"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.clearTextureMap(\"NormalMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextCtrl() { - text = "Parallax Scale"; - position = "92 34"; - extent = "77 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "0"; - anchorTop = "0"; - anchorLeft = "0"; - position = "55 33"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "parallaxScaleCtrl"; - }; - new GuiSliderCtrl(TerrainMaterialDlgBlendHeightBaseSlider) { - range = "-0.5 0.5"; - ticks = "0"; - value = "0"; - position = "39 61"; - extent = "70 14"; - profile = "ToolsGuiSliderProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "blendHeightBaseSliderCtrl"; - }; - new GuiTextCtrl() { - text = "Blend Height"; - position = "115 61"; - extent = "68 15"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextEditCtrl(TerrainMaterialDlgBlendHeightBaseTextEdit) { - text = "0"; - anchorTop = "0"; - anchorLeft = "0"; - position = "1 59"; - extent = "35 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "blendHeightBaseTextEditCtrl"; - }; - new GuiSliderCtrl(TerrainMaterialDlgBlendHeightContrastSlider) { - range = "0 5"; - ticks = "0"; - value = "1"; - position = "39 81"; - extent = "70 14"; - profile = "ToolsGuiSliderProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "blendHeightContrastSliderCtrl"; - }; - new GuiTextCtrl() { - text = "Blend Contrast"; - position = "115 81"; + new GuiTextEditCtrl(TerrainMaterialDlgBlendHeightHardnessTextEdit) { + text = "0"; + anchorTop = "0"; + anchorLeft = "0"; + position = "1 99"; + extent = "35 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "blendHeightHardnessTextEditCtrl"; + }; + new GuiTextCtrl() { + text = "Blend Hardness"; + position = "115 101"; extent = "76 15"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextEditCtrl(TerrainMaterialDlgBlendHeightContrastTextEdit) { - text = "1"; - anchorTop = "0"; - anchorLeft = "0"; - position = "1 79"; - extent = "35 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "blendHeightContrastTextEditCtrl"; - }; - new GuiTextEditCtrl(TerrainMaterialDlgBlendHeightHardnessTextEdit) { - text = "0"; - anchorTop = "0"; - anchorLeft = "0"; - position = "1 99"; - extent = "35 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "blendHeightHardnessTextEditCtrl"; - }; - new GuiTextCtrl() { - text = "Blend Hardness"; - position = "115 101"; - extent = "76 15"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiSliderCtrl(TerrainMaterialDlgBlendHeightHardnessSlider) { - range = "0 0.999"; - ticks = "0"; - value = "0"; - position = "39 101"; - extent = "70 14"; - profile = "ToolsGuiSliderProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "blendHeightHardnessSliderCtrl"; - }; - }; - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:separator_v_image"; - position = "6 323"; - extent = "266 2"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiContainer(ORMConfigMapContainer) { - position = "6 330"; - extent = "261 64"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:unknownImage_image"; - position = "1 1"; - extent = "47 47"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "texORMConfigMap"; - }; - new GuiTextCtrl() { - text = "ORM Config"; - position = "56 -3"; - extent = "64 18"; - profile = "EditorTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; - position = "1 1"; - extent = "48 48"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"ORMConfigMap\");"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Change the active ORM Config Map for this layer."; - }; - new GuiTextCtrl() { - text = "None"; - position = "56 15"; - extent = "205 17"; - horizSizing = "width"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "ORMConfigMapAssetId"; - }; - new GuiButtonCtrl() { - text = "Edit"; - position = "205 0"; - extent = "40 16"; - horizSizing = "left"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"ORMConfigMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:delete_n_image"; - position = "248 0"; - extent = "16 16"; - horizSizing = "left"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.clearTextureMap(\"ORMConfigMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiCheckBoxCtrl() { - text = " Is sRGB"; - position = "55 32"; - extent = "119 16"; - profile = "ToolsGuiCheckBoxProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "IsSRGB"; - }; - new GuiCheckBoxCtrl() { - text = " Invert Roughness"; - position = "55 48"; - extent = "119 16"; - profile = "ToolsGuiCheckBoxProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "InvertRoughness"; - }; - }; - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:separator_v_image"; - position = "6 397"; - extent = "266 2"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiContainer(MacroMapContainer) { - position = "6 404"; - extent = "261 72"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:unknownImage_image"; - position = "1 1"; - extent = "47 47"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - internalName = "texMacroMap"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; - position = "1 1"; - extent = "48 48"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"MacroMap\");"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Change the active Macro Map for this layer."; - }; - new GuiTextCtrl() { - text = "Macro"; - position = "56 -3"; - extent = "34 18"; - profile = "EditorTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextCtrl() { - text = "None"; - position = "56 17"; - extent = "192 17"; - horizSizing = "width"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "macroMapAssetId"; - }; - new GuiButtonCtrl() { - text = "Edit"; - position = "204 0"; - extent = "40 16"; - horizSizing = "left"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.updateTextureMap(\"MacroMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapButtonCtrl() { - BitmapAsset = "ToolsModule:delete_n_image"; - position = "247 0"; - extent = "16 16"; - horizSizing = "left"; - profile = "ToolsGuiDefaultProfile"; - command = "TerrainMaterialDlg.clearTextureMap(\"MacroMap\");"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiTextCtrl() { - text = "Size"; - anchorTop = "0"; - anchorLeft = "0"; - position = "132 33"; - extent = "39 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "200"; - anchorTop = "0"; - anchorLeft = "0"; - position = "94 32"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "macroSizeCtrl"; - }; - new GuiTextCtrl() { - text = "Strength"; - anchorTop = "0"; - anchorLeft = "0"; - position = "39 54"; - extent = "46 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "0.7"; - anchorTop = "0"; - anchorLeft = "0"; - position = "1 53"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "macroStrengthCtrl"; - }; - new GuiTextCtrl() { - text = "Distance"; - anchorTop = "0"; - anchorLeft = "0"; - position = "132 54"; - extent = "45 16"; - profile = "ToolsGuiTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - new GuiTextEditCtrl() { - text = "500"; - anchorTop = "0"; - anchorLeft = "0"; - position = "94 53"; - extent = "34 18"; - profile = "ToolsGuiTextEditProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - internalName = "macroDistanceCtrl"; - }; - }; - new GuiContainer(TerrainEffectsContainer) { - position = "6 476"; - extent = "265 97"; - horizSizing = "width"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:separator_v_image"; - position = "2 2"; - extent = "276 2"; - horizSizing = "width"; - profile = "GuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiTextCtrl() { - text = "Effect Colors[0:1]"; - position = "1 22"; - extent = "86 15"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiSwatchButtonCtrl() { - position = "89 22"; - extent = "16 16"; + profile = "ToolsGuiTextProfile"; tooltipProfile = "ToolsGuiToolTipProfile"; - command = "getColorF($ThisControl.color, \"TerrainMaterialDlg.updateEffectColor0\");"; - internalName = "effectColor0Swatch"; }; - new GuiSwatchButtonCtrl() { - position = "109 22"; - extent = "16 16"; + new GuiSliderCtrl(TerrainMaterialDlgBlendHeightHardnessSlider) { + range = "0 0.999"; + ticks = "0"; + value = "0"; + position = "39 101"; + extent = "70 14"; + profile = "ToolsGuiSliderProfile"; tooltipProfile = "ToolsGuiToolTipProfile"; - command = "getColorF($ThisControl.color, \"TerrainMaterialDlg.updateEffectColor1\");"; - internalName = "effectColor1Swatch"; + internalName = "blendHeightHardnessSliderCtrl"; }; - new GuiCheckBoxCtrl() { - text = "Show Footprints"; - position = "1 40"; - extent = "93 16"; - profile = "ToolsGuiCheckBoxProfile"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Enables Player footprints on surfaces that use this Material."; - internalName = "showFootprintsCheckbox"; - }; - new GuiCheckBoxCtrl() { - text = "Show Dust"; - position = "110 40"; - extent = "68 16"; - profile = "ToolsGuiCheckBoxProfile"; - tooltipProfile = "ToolsGuiDefaultProfile"; - tooltip = "Enables dust particles on surfaces that use this Material."; - internalName = "showDustCheckbox"; - }; - new GuiTextCtrl() { - text = "Footstep sound"; - position = "1 59"; - extent = "77 15"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiPopUpMenuCtrl() { - text = "None"; - position = "80 58"; - extent = "184 18"; - horizSizing = "width"; - profile = "ToolsGuiPopUpMenuProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - tooltip = "Determines the footstep sound to use when the Player walks on this Material."; - isContainer = "0"; - internalName = "footstepSoundPopup"; - }; - new GuiTextCtrl() { - text = "Impact sound"; - position = "1 79"; - extent = "64 15"; - profile = "ToolsGuiDefaultProfile"; - tooltipProfile = "GuiToolTipProfile"; - }; - new GuiPopUpMenuCtrl() { - text = "None"; - position = "80 78"; - extent = "184 18"; - horizSizing = "width"; - profile = "ToolsGuiPopUpMenuProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - tooltip = "Determines the impact sound to use when an object collides with this Material."; - isContainer = "0"; - internalName = "impactSoundPopup"; - }; - new GuiTextCtrl() { - text = "Effects"; - position = "2 4"; - extent = "38 18"; - profile = "EditorTextProfile"; - tooltipProfile = "ToolsGuiToolTipProfile"; - isContainer = "0"; - }; - }; - }; - }; - }; - new GuiButtonCtrl() { - text = "Apply&Select"; - position = "269 612"; - extent = "98 22"; - horizSizing = "left"; - vertSizing = "top"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.dialogApply();"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiButtonCtrl() { - text = "Cancel"; - position = "374 612"; - extent = "80 22"; - horizSizing = "left"; - vertSizing = "top"; - profile = "ToolsGuiButtonProfile"; - command = "TerrainMaterialDlg.dialogCancel();"; - tooltipProfile = "ToolsGuiToolTipProfile"; - }; - new GuiBitmapCtrl() { - BitmapAsset = "ToolsModule:inactive_overlay_image"; - position = "277 23"; - extent = "190 474"; - horizSizing = "left"; - vertSizing = "height"; - profile = "ToolsGuiDefaultProfile"; - visible = "0"; - tooltipProfile = "GuiToolTipProfile"; - isContainer = "1"; - internalName = "inactiveOverlay"; - hidden = "1"; - - new GuiTextCtrl() { - text = "Inactive"; - position = "0 205"; - extent = "190 64"; - horizSizing = "width"; - vertSizing = "center"; - profile = "ToolsGuiTextCenterProfile"; - tooltipProfile = "GuiToolTipProfile"; - internalName = "inactiveOverlayDlg"; - }; - }; - }; -}; -//--- OBJECT WRITE END --- + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:separator_v_image"; + position = "6 340"; + extent = "266 2"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiContainer(ORMConfigMapContainer) { + position = "6 345"; + extent = "261 64"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:unknownImage_image"; + position = "1 1"; + extent = "47 47"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "texORMConfigMap"; + }; + new GuiTextCtrl() { + text = "ORM Config"; + position = "57 -2"; + extent = "64 18"; + profile = "EditorTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + position = "1 1"; + extent = "48 48"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"ORMConfigMap\"); "; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Change the active ORM Config Map for this layer."; + }; + new GuiTextCtrl() { + text = "None"; + position = "57 15"; + extent = "145 17"; + horizSizing = "width"; + profile = "ToolsGuiTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "ORMConfigMapAssetId"; + }; + new GuiButtonCtrl() { + text = "Edit"; + position = "200 0"; + extent = "40 16"; + horizSizing = "left"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"ORMConfigMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:delete_n_image"; + position = "248 0"; + extent = "16 16"; + horizSizing = "left"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.clearTextureMap(\"ORMConfigMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiCheckBoxCtrl() { + text = " Is sRGB"; + position = "80 32"; + extent = "119 16"; + profile = "ToolsGuiCheckBoxProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "IsSRGB"; + }; + new GuiCheckBoxCtrl() { + text = " Invert Roughness"; + position = "80 48"; + extent = "119 16"; + profile = "ToolsGuiCheckBoxProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "InvertRoughness"; + }; + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:separator_v_image"; + position = "6 420"; + extent = "266 2"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiContainer(MacroMapContainer) { + position = "6 425"; + extent = "261 80"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:unknownImage_image"; + position = "1 1"; + extent = "47 47"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "texMacroMap"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:cubemapBtnBorder_n_image"; + position = "1 1"; + extent = "48 48"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"MacroMap\"); "; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Change the active Macro Map for this layer."; + }; + new GuiTextCtrl() { + text = "Macro"; + position = "57 -3"; + extent = "34 18"; + profile = "EditorTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextCtrl() { + text = "None"; + position = "57 17"; + extent = "142 17"; + horizSizing = "width"; + profile = "ToolsGuiTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "macroMapAssetId"; + }; + new GuiButtonCtrl() { + text = "Edit"; + position = "200 0"; + extent = "40 16"; + horizSizing = "left"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.updateTextureMap(\"MacroMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapButtonCtrl() { + BitmapAsset = "ToolsModule:delete_n_image"; + position = "248 0"; + extent = "16 16"; + horizSizing = "left"; + profile = "ToolsGuiDefaultProfile"; + command = "TerrainMaterialDlg.clearTextureMap(\"MacroMap\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiTextCtrl() { + text = "Size"; + anchorTop = "0"; + anchorLeft = "0"; + position = "152 33"; + extent = "39 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "200"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 32"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "macroSizeCtrl"; + }; + new GuiTextCtrl() { + text = "Strength"; + anchorTop = "0"; + anchorLeft = "0"; + position = "30 54"; + extent = "46 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "0.7"; + anchorTop = "0"; + anchorLeft = "0"; + position = "82 53"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "macroStrengthCtrl"; + }; + new GuiTextCtrl() { + text = "Distance"; + anchorTop = "0"; + anchorLeft = "0"; + position = "144 54"; + extent = "45 16"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextEditCtrl() { + text = "500"; + anchorTop = "0"; + anchorLeft = "0"; + position = "200 56"; + extent = "40 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + internalName = "macroDistanceCtrl"; + }; + }; + new GuiContainer(TerrainEffectsContainer) { + position = "6 510"; + extent = "265 97"; + horizSizing = "width"; + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:separator_v_image"; + position = "2 2"; + extent = "276 2"; + horizSizing = "width"; + profile = "GuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + }; + new GuiTextCtrl() { + text = "Effects"; + position = "2 4"; + extent = "38 18"; + profile = "EditorTextProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + isContainer = "0"; + }; + new GuiTextCtrl() { + text = "Effect Colors [0:1]"; + position = "-1 22"; + extent = "92 15"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; + }; + new GuiSwatchButtonCtrl() { + position = "96 21"; + extent = "16 16"; + command = "getColorF($ThisControl.color, \"TerrainMaterialDlg.updateEffectColor0\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "effectColor0Swatch"; + }; + new GuiSwatchButtonCtrl() { + position = "115 21"; + extent = "16 16"; + command = "getColorF($ThisControl.color, \"TerrainMaterialDlg.updateEffectColor1\"); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "effectColor1Swatch"; + }; + new GuiCheckBoxCtrl() { + text = " Show Footprints"; + position = "0 39"; + extent = "104 16"; + profile = "ToolsGuiCheckBoxProfile"; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Enables Player footprints on surfaces that use this Material."; + internalName = "showFootprintsCheckbox"; + }; + new GuiCheckBoxCtrl() { + text = " Show Dust"; + position = "120 39"; + extent = "78 16"; + profile = "ToolsGuiCheckBoxProfile"; + tooltipProfile = "ToolsGuiDefaultProfile"; + tooltip = "Enables dust particles on surfaces that use this Material."; + internalName = "showDustCheckbox"; + }; + new GuiTextCtrl() { + text = "Footstep Sound "; + position = "-3 59"; + extent = "87 15"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; + }; + new GuiPopUpMenuCtrl() { + position = "93 58"; + extent = "170 18"; + horizSizing = "width"; + profile = "ToolsGuiPopUpMenuProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Determines the footstep sound to use when the Player walks on this Material."; + isContainer = "0"; + internalName = "footstepSoundPopup"; + }; + new GuiTextCtrl() { + text = "Impact Sound "; + position = "-3 79"; + extent = "87 15"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; + }; + new GuiPopUpMenuCtrl() { + position = "93 78"; + extent = "170 18"; + horizSizing = "width"; + profile = "ToolsGuiPopUpMenuProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + tooltip = "Determines the impact sound to use when an object collides with this Material."; + isContainer = "0"; + internalName = "impactSoundPopup"; + }; + }; + }; + }; + }; + new GuiButtonCtrl() { + text = "Apply + Select"; + position = "269 650"; + extent = "105 22"; + horizSizing = "left"; + vertSizing = "top"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.dialogApply(); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiButtonCtrl() { + text = "Cancel"; + position = "384 650"; + extent = "74 22"; + horizSizing = "left"; + vertSizing = "top"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainMaterialDlg.dialogCancel(); "; + tooltipProfile = "ToolsGuiToolTipProfile"; + }; + new GuiBitmapCtrl() { + BitmapAsset = "ToolsModule:inactive_overlay_image"; + position = "286 23"; + extent = "190 474"; + horizSizing = "left"; + vertSizing = "height"; + profile = "ToolsGuiDefaultProfile"; + visible = "0"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + internalName = "inactiveOverlay"; + hidden = "1"; + + new GuiTextCtrl() { + text = "Inactive"; + position = "0 205"; + extent = "190 64"; + horizSizing = "width"; + vertSizing = "center"; + profile = "ToolsGuiTextCenterProfile"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "inactiveOverlayDlg"; + }; + }; + }; +}; +//--- OBJECT WRITE END --- \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui index f63f53614..cfe89d960 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainTextureSettingsDlg.ed.gui @@ -1,307 +1,274 @@ //--- OBJECT WRITE BEGIN --- -$guiContent = new GuiControl(TerrainTextureSettingsDlg, EditorGuiGroup) { - position = "0 0"; +$guiContent = new GuiControl(TerrainTextureSettingsDlg,EditorGuiGroup) { extent = "1024 768"; - minExtent = "8 2"; - horizSizing = "right"; - vertSizing = "bottom"; profile = "ToolsGuiDefaultProfile"; - visible = "1"; - active = "1"; tooltipProfile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; isContainer = "1"; - canSave = "1"; canSaveDynamicFields = "1"; new GuiWindowCtrl() { - canSaveDynamicFields = "0"; - internalName = "TerrainTextureSettings"; - Enabled = "1"; - isContainer = "1"; - Profile = "ToolsGuiWindowProfile"; + text = "Global Terrain Texture Settings"; + resizeHeight = "0"; + canMinimize = "0"; + canMaximize = "0"; + closeCommand = "TerrainTextureSettingsDlg.cancel();"; + edgeSnap = "0"; + anchorBottom = "1"; + anchorRight = "1"; position = "342 184"; extent = "340 400"; minExtent = "340 400"; horizSizing = "center"; vertSizing = "center"; - canSave = "1"; - isDecoy = "0"; - Visible = "1"; - tooltipprofile = "ToolsGuiToolTipProfile"; - hovertime = "1000"; - Margin = "0 0 0 0"; - Padding = "0 0 0 0"; - AnchorTop = "1"; - AnchorBottom = "1"; - AnchorLeft = "1"; - AnchorRight = "1"; - resizeWidth = "1"; - resizeHeight = "0"; - canMove = "1"; - canClose = "1"; - canMinimize = "0"; - canMaximize = "0"; - minSize = "4 4"; - closeCommand = "TerrainTextureSettingsDlg.cancel();"; - EdgeSnap = "0"; - text = "Global Terrain Texture Settings"; + profile = "ToolsGuiWindowProfile"; + tooltipProfile = "ToolsGuiToolTipProfile"; + internalName = "TerrainTextureSettings"; new GuiCheckBoxCtrl() { - internalName = "lerpBlendCheckBox"; text = "LerpBlend"; + position = "21 35"; + extent = "299 20"; profile = "ToolsGuiCheckBoxProfile"; + command = "TerrainTextureSettingsDlg.apply();"; tooltipProfile = "ToolsGuiToolTipProfile"; tooltip = "If enabled, terrain textures will use a simple linear interpolation blending method."; - - command = "TerrainTextureSettingsDlg.apply();"; - - position = "20 40"; - extent = "300 20"; + internalName = "lerpBlendCheckBox"; }; - new GuiControl() { - position = "20 70"; - profile = "ToolsGuiDefaultProfile"; + position = "20 68"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Global Blend Depth:"; - profile = "ToolsGuiTextProfile"; + position = "-1 -6"; + extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; tooltipProfile = "ToolsGuiToolTipProfile"; tooltip = "Controls the general level of bleding across all textures, has no effect if Lerp Blend is enabled."; - - position = "0 0"; - extent = "120 20"; }; - new GuiSliderCtrl() { - internalName = "blendDepthSlider"; + range = "0.01 1"; + value = "0.560687"; + position = "130 -2"; + extent = "170 20"; profile = "ToolsGuiSliderProfile"; - command = "TerrainTextureSettingsDlg.apply();"; altCommand = "TerrainTextureSettingsDlg.updateBlendDepth();"; - - position = "130 0"; - extent = "170 20"; - - range = "0.01 1.0"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "blendDepthSlider"; }; }; - new GuiControl() { - position = "20 100"; - profile = "ToolsGuiDefaultProfile"; + position = "20 104"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Detail Texture Size:"; - profile = "ToolsGuiTextProfile"; - - command = "TerrainTextureSettingsDlg.apply();"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; - }; - - new GuiTextEditCtrl() { - internalName = "detailTextureSizeTextEdit"; - profile = "ToolsGuiTextEditProfile"; - + profile = "ToolsGuiTextRightProfile"; command = "TerrainTextureSettingsDlg.apply();"; - + tooltipProfile = "GuiToolTipProfile"; + }; + new GuiTextEditCtrl() { position = "130 0"; - extent = "170 20"; + extent = "81 18"; + profile = "ToolsGuiTextEditProfile"; + command = "TerrainTextureSettingsDlg.apply();"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "detailTextureSizeTextEdit"; }; }; - new GuiControl() { position = "20 130"; - profile = "ToolsGuiDefaultProfile"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Detail Texture Format:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiPopUpMenuCtrl() { - internalName = "detailTextureFormatPopUpMenu"; - profile = "ToolsGuiPopUpMenuProfile"; - - command = "TerrainTextureSettingsDlg.apply();"; - + text = "R8G8B8A8"; position = "130 0"; extent = "170 20"; + profile = "ToolsGuiPopUpMenuProfile"; + command = "TerrainTextureSettingsDlg.apply();"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "detailTextureFormatPopUpMenu"; }; }; - new GuiControl() { - position = "20 160"; - profile = "ToolsGuiDefaultProfile"; + position = "20 168"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Macro Texture Size:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiTextEditCtrl() { - internalName = "macroTextureSizeTextEdit"; - profile = "ToolsGuiTextEditProfile"; - - command = "TerrainTextureSettingsDlg.apply();"; - position = "130 0"; - extent = "170 20"; + extent = "82 18"; + profile = "ToolsGuiTextEditProfile"; + command = "TerrainTextureSettingsDlg.apply();"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "macroTextureSizeTextEdit"; }; }; - new GuiControl() { - position = "20 190"; - profile = "ToolsGuiDefaultProfile"; + position = "20 194"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Macro Texture Format:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiPopUpMenuCtrl() { - internalName = "macroTextureFormatPopUpMenu"; - profile = "ToolsGuiPopUpMenuProfile"; - - command = "TerrainTextureSettingsDlg.apply();"; - + text = "R8G8B8A8"; position = "130 0"; extent = "170 20"; + profile = "ToolsGuiPopUpMenuProfile"; + command = "TerrainTextureSettingsDlg.apply();"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "macroTextureFormatPopUpMenu"; }; }; - new GuiControl() { - position = "20 220"; - profile = "ToolsGuiDefaultProfile"; + position = "20 232"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Normal Texture Size:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiTextEditCtrl() { - internalName = "normalTextureSizeTextEdit"; - profile = "ToolsGuiTextEditProfile"; - - command = "TerrainTextureSettingsDlg.apply();"; - position = "130 0"; - extent = "170 20"; + extent = "82 18"; + profile = "ToolsGuiTextEditProfile"; + command = "TerrainTextureSettingsDlg.apply();"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "normalTextureSizeTextEdit"; }; }; - new GuiControl() { - position = "20 250"; - profile = "ToolsGuiDefaultProfile"; + position = "20 258"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "Normal Texture Format:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiPopUpMenuCtrl() { - internalName = "normalTextureFormatPopUpMenu"; - profile = "ToolsGuiPopUpMenuProfile"; - - command = "TerrainTextureSettingsDlg.apply();"; - + text = "R8G8B8A8"; position = "130 0"; extent = "170 20"; + profile = "ToolsGuiPopUpMenuProfile"; + command = "TerrainTextureSettingsDlg.apply();"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "normalTextureFormatPopUpMenu"; }; }; - new GuiControl() { - position = "20 280"; - profile = "ToolsGuiDefaultProfile"; + position = "20 296"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "ORM Texture Size:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiTextEditCtrl() { - internalName = "ormTextureSizeTextEdit"; - profile = "ToolsGuiTextEditProfile"; - position = "130 0"; - extent = "170 20"; + extent = "81 18"; + profile = "ToolsGuiTextEditProfile"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "ormTextureSizeTextEdit"; }; }; - new GuiControl() { - position = "20 310"; - profile = "ToolsGuiDefaultProfile"; + position = "20 322"; extent = "300 20"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiTextCtrl() { text = "ORM Texture Format:"; - profile = "ToolsGuiTextProfile"; - - position = "0 0"; + position = "-1 0"; extent = "120 20"; + profile = "ToolsGuiTextRightProfile"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiPopUpMenuCtrl() { - internalName = "ormTextureFormatPopUpMenu"; - profile = "ToolsGuiPopUpMenuProfile"; - + text = "R8G8B8A8"; position = "130 0"; extent = "170 20"; + profile = "ToolsGuiPopUpMenuProfile"; + tooltipProfile = "GuiToolTipProfile"; + internalName = "ormTextureFormatPopUpMenu"; }; }; - new GuiControl() { - position = "20 350"; - profile = "ToolsGuiDefaultProfile"; + position = "20 361"; extent = "300 30"; - + profile = "ToolsGuiDefaultProfile"; + tooltipProfile = "GuiToolTipProfile"; + isContainer = "1"; + new GuiButtonCtrl() { text = "Apply & Save"; - profile = "ToolsGuiButtonProfile"; - position = "0 0"; - - command = "TerrainTextureSettingsDlg.applyAndSave();"; - extent = "145 30"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainTextureSettingsDlg.applyAndSave();"; + tooltipProfile = "GuiToolTipProfile"; }; - new GuiButtonCtrl() { text = "Cancel"; - profile = "ToolsGuiButtonProfile"; position = "155 0"; - - command = "TerrainTextureSettingsDlg.cancel();"; - extent = "145 30"; + profile = "ToolsGuiButtonProfile"; + command = "TerrainTextureSettingsDlg.cancel();"; + tooltipProfile = "GuiToolTipProfile"; }; }; }; diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3darrow.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3darrow.png index 1e06287e3..88dc59d9c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3darrow.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3darrow.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagleft.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagleft.png index 93e2af4d1..1df92b285 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagleft.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagleft.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagright.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagright.png index 59c09bcac..cfc52cf4f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagright.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3ddiagright.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dleftright.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dleftright.png index 63c20e16a..e1ee84ae0 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dleftright.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dleftright.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dupdown.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dupdown.png index c0897e896..5879256b8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dupdown.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_3dupdown.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_grab.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_grab.png index 7bab05a38..d926e86f0 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_grab.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_grab.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_hand.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_hand.png index 5e1073644..f3e37a07d 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_hand.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_hand.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/CUR_rotate.png b/Templates/BaseGame/game/tools/worldEditor/images/CUR_rotate.png index 24c91b854..14ed2f780 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/CUR_rotate.png and b/Templates/BaseGame/game/tools/worldEditor/images/CUR_rotate.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/LockedHandle.png b/Templates/BaseGame/game/tools/worldEditor/images/LockedHandle.png index 37f2ddec4..1074d796f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/LockedHandle.png and b/Templates/BaseGame/game/tools/worldEditor/images/LockedHandle.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/particleEmitter_btn.png b/Templates/BaseGame/game/tools/worldEditor/images/basics/particleEmitter_btn.png new file mode 100644 index 000000000..4e295f5e0 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/basics/particleEmitter_btn.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/particleEmitter_btn_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/basics/particleEmitter_btn_image.asset.taml new file mode 100644 index 000000000..e675bb239 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/basics/particleEmitter_btn_image.asset.taml @@ -0,0 +1,4 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/pointLight_btn.png b/Templates/BaseGame/game/tools/worldEditor/images/basics/pointLight_btn.png new file mode 100644 index 000000000..011d08328 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/basics/pointLight_btn.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/pointLight_btn_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/basics/pointLight_btn_image.asset.taml new file mode 100644 index 000000000..754e82b3e --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/basics/pointLight_btn_image.asset.taml @@ -0,0 +1,3 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/soundEmitter_btn.png b/Templates/BaseGame/game/tools/worldEditor/images/basics/soundEmitter_btn.png new file mode 100644 index 000000000..79ad5b6f1 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/basics/soundEmitter_btn.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/soundEmitter_btn_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/basics/soundEmitter_btn_image.asset.taml new file mode 100644 index 000000000..8a5cc4c72 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/basics/soundEmitter_btn_image.asset.taml @@ -0,0 +1,3 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/spotLight_btn.png b/Templates/BaseGame/game/tools/worldEditor/images/basics/spotLight_btn.png new file mode 100644 index 000000000..31a7d2e15 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/basics/spotLight_btn.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/spotLight_btn_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/basics/spotLight_btn_image.asset.taml new file mode 100644 index 000000000..972f867b6 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/basics/spotLight_btn_image.asset.taml @@ -0,0 +1,3 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/triggerZone_btn.png b/Templates/BaseGame/game/tools/worldEditor/images/basics/triggerZone_btn.png new file mode 100644 index 000000000..9cceb0fa0 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/basics/triggerZone_btn.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/triggerZone_btn_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/basics/triggerZone_btn_image.asset.taml new file mode 100644 index 000000000..fdae309d4 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/basics/triggerZone_btn_image.asset.taml @@ -0,0 +1,3 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/waterBlock_btn.png b/Templates/BaseGame/game/tools/worldEditor/images/basics/waterBlock_btn.png new file mode 100644 index 000000000..483ae54f8 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/basics/waterBlock_btn.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/basics/waterBlock_btn_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/basics/waterBlock_btn_image.asset.taml new file mode 100644 index 000000000..537c957b8 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/basics/waterBlock_btn_image.asset.taml @@ -0,0 +1,3 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_d.PNG index 8cb9baff5..152c96fd9 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_h.PNG index b380cf4a6..0a2069728 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_n.PNG index fee5a9cf3..3163ecc4c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/boxBrush_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_d.PNG index 056bae49e..662f41262 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_h.PNG index 8b8f181e2..9fa583e52 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_n.png b/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_n.png index d0d03edb5..fdfa90116 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/brushAdjustHeight_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_d.png b/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_d.png index 66a10bc37..27801b7ac 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_h.png b/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_h.png index 921e03bc7..85dce8089 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_n.png b/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_n.png index 7d14ea43d..fec56bc5c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/brushPaintNoise_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_d.PNG index 1c4d37bf5..ea84bd4a1 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_h.PNG index cfea7736f..127ada775 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_n.PNG index 82a47b748..db05dae4f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/circleBrush_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_d.PNG index cdbe87769..3894dfe7e 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_h.PNG index 9b24adf90..bfe9abbe6 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_n.PNG index 6aed6c702..479fd6580 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/clearEmpty_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_d.PNG index 963c1d320..7a4e381a9 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_h.PNG index c9ce739da..561a1fc25 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_n.PNG index d8d1931ad..0913f9e09 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/flattenHeight_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_d.PNG index 79d2384d7..6b7ee5d23 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_h.PNG index 07e3dd25a..9995add99 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_n.PNG index 048615dcf..359c238be 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/lowerHeight_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_d.PNG index 007650c79..cfe2caac9 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_h.PNG index a7764100a..ad4ee02cc 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_n.PNG index 99bafbcb4..b0dba0775 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/maskBrush_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_d.PNG index 870db9d38..0cf221a0a 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_h.PNG index 6c95d4f7f..f2f562353 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_n.PNG index e110a5247..d48102b85 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/raiseHeight_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_d.png index e97d7edc9..fd1290463 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_h.png index 1dc2a5663..3d2dcf0b3 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_n.png index 717e60356..3d0ac2b10 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-mesh-road_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_d.png index 4d3dfa759..ff2e36d81 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_h.png index fbdac0f6e..a7c6807d8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_n.png index 6e6dff3d7..76067c134 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-point_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_d.png index 112d5dba6..22ad25023 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_h.png index 7c0261f25..abf8a08e4 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_n.png index a283365dc..e8486b2ba 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-river_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_d.png index 96ecb99f0..2df93bb30 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_h.png index 0e7556879..169c99281 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_n.png index 6cecf08e0..e5585bf97 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/add-road-path_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_d.png index 81609c3c1..32cc92cb6 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_h.png index 23585ab3f..115944ff7 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_n.png index 5415b5809..0f78ac071 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-profile_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_d.png index 87e93b120..081f12371 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_h.png index 80baf68ba..adb9caacc 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_n.png index 81a0180b9..2c1a0627c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-spline_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_d.png index 03fee8c42..3ad75155d 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_h.png index 92bac44dc..c3ae083e3 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_n.png index 31601728f..18ac5c2a5 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-texture_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_d.png index c32ca6b94..fc8a4f15f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_h.png index bd8e7acba..38785c048 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_n.png index 099a142a8..9bb0d00c5 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/menubar/show-wireframe_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_d.png index dc89c1d98..15b1ee64d 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_h.png index f863eafc8..db64133ee 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_n.png index f3cadb7a1..8aa65217d 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/move-point_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_d.png index 18297741a..fb67eca36 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_h.png index 5e17a9c46..095c722b4 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_n.png index 9cdb0b3df..a9ca698b0 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/rotate-point_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_d.png index 4700cd3b3..ac63332f8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_h.png index 5ac38959f..412e2045b 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_n.png index 1206e08cb..c15c1ed1b 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/scale-point_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_d.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_d.png index 9f0c31b5c..584a33127 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_h.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_h.png index b3cfb6aac..e131d66b3 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_n.png b/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_n.png index 3180edba4..5098455c4 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/road-river/subtract-point_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_d.PNG index 9a3194b24..3d3420056 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_h.PNG index 87118eea7..96dfe9b0a 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_n.PNG index 7f1d4df67..ea43d909d 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/setEmpty_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/setHeight_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/setHeight_d.PNG index 1422857fa..3a1ce7bd2 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/setHeight_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/setHeight_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/setHeight_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/setHeight_h.PNG index 448612785..55016f49b 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/setHeight_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/setHeight_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/setHeight_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/setHeight_n.PNG index 83196ea6e..1387680f1 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/setHeight_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/setHeight_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_d.PNG index 05678ed31..2098b86a2 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_h.PNG index bd5f71ec3..6e40fb8d8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_n.PNG index 1bec2d18d..cb3abcb88 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/smoothHeight_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/softCurve_d.PNG b/Templates/BaseGame/game/tools/worldEditor/images/softCurve_d.PNG index 89679ff79..8634127e6 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/softCurve_d.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/softCurve_d.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/softCurve_h.PNG b/Templates/BaseGame/game/tools/worldEditor/images/softCurve_h.PNG index c04786d96..de6b91c22 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/softCurve_h.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/softCurve_h.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/softCurve_n.PNG b/Templates/BaseGame/game/tools/worldEditor/images/softCurve_n.PNG index a1cf84d6a..e849817f8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/softCurve_n.PNG and b/Templates/BaseGame/game/tools/worldEditor/images/softCurve_n.PNG differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/new_layer_icon.png b/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/new_layer_icon.png index 3589b8d20..1171a4e74 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/new_layer_icon.png and b/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/new_layer_icon.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/terrain_painter_new_n.png b/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/terrain_painter_new_n.png new file mode 100644 index 000000000..ad1638c03 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/terrain_painter_new_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/terrain_painter_new_n_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/terrain_painter_new_n_image.asset.taml new file mode 100644 index 000000000..cc7b01d6a --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/terrainpainter/terrain_painter_new_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_d.png index c63ab98cf..99cd751d5 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_h.png index def996838..2bec0c62f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_n.png index e45cc4244..c6af6875c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/3rd-person-camera_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_d.png index 6500b92c5..e33fc11fe 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_h.png index 0451a0e9c..5d9591faf 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_n.png index 516c0c00e..d8eb4666e 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/camera_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_d.png index 8911e14d7..4acae85e7 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_h.png index cd2cfec3d..1b3b9be3e 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_n.png index 44d08018a..c6e4086cd 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/datablock-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui.png index 9971dc150..f0f329c9b 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_d.png index 376b3f9d0..c3769ddd8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_h.png index 96e58de3f..0e82e3168 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_n.png new file mode 100644 index 000000000..f0f329c9b Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_n_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_n_image.asset.taml new file mode 100644 index 000000000..6723bf541 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/gui_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_d.png index e850a5873..63cb2d2af 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_h.png index 93df1f2ac..afc9e631b 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_n.png index 326589e1f..5550882cb 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/material-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/menu_logo.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/menu_logo.asset.taml new file mode 100644 index 000000000..e4b424dc4 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/menu_logo.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/menu_logo.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/menu_logo.png new file mode 100644 index 000000000..358e055b3 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/menu_logo.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_d.png index 125308927..5f89120b9 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_h.png index 45eabc320..c6f78c35a 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_n.png index 1cb88dc8e..9cd6c8cd4 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/mesh-road-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_d.png index 72457d069..56318eace 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_h.png index 7bff1444f..64624c9a5 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_n.png index 6a8533f5a..29bcab31a 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/missionarea-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_d.png index 144099429..423b637ce 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_h.png index 9ca94ff58..16d12c068 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_n.png index b2d156044..d78414765 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/paint-terrain_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_d.png index 9867911ed..770d31c13 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_h.png index e7fd0b0fc..f30a826d8 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_n.png index d8c6266af..a3122090f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/particleeditor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_d.png index 08b3b8641..46b00886e 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_h.png index 2059a23fb..836109e94 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_n.png index 24840940b..3e51d6070 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/playbutton_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_d.png index ad03e6c93..47f002015 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_h.png index fae070bdf..437a6a81e 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_n.png index 15e7e5504..b35d9f216 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/player_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_d.png index 1e9abf699..a8ac490e0 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_h.png index 2d57d4a10..67bf667ed 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_n.png index e7cb27a09..501778055 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/river-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_d.png index a0e961fc9..e0ca20f52 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_h.png index 25b47ae25..c1655650c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_n.png index 9435692d9..751678a4a 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/road-path-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_d.png index 72457d069..a0701fa03 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_h.png index 7bff1444f..141f3c84a 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_n.png index 6a8533f5a..c15769215 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/sculpt-terrain_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_d.png index 5e1bfff7f..0fbdab3c9 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_h.png index c512a6ae4..5fbdbef52 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_n.png index e583f2549..3d4abdc0f 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/shape-editor_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_d.png index 5ee2faf47..e42cafa35 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_h.png index 68c21d9e4..222ad94c7 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_n.png index 51f81427f..9f36a011c 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_n.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/transform-objects_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world.png index e08a1b89d..bb15252e7 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_d.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_d.png index da4cb5856..8d895635b 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_d.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_d.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_h.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_h.png index 9f68f1bc0..e8cbb1afa 100644 Binary files a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_h.png and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_h.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_n.png b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_n.png new file mode 100644 index 000000000..bb15252e7 Binary files /dev/null and b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_n.png differ diff --git a/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_n_image.asset.taml b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_n_image.asset.taml new file mode 100644 index 000000000..827427d00 --- /dev/null +++ b/Templates/BaseGame/game/tools/worldEditor/images/toolbar/world_n_image.asset.taml @@ -0,0 +1,8 @@ + diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index 8093822bc..afe0e3991 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -58,32 +58,17 @@ function EditorGui::init(%this) %this.add( EWTreeWindow ); EWTreeWindow-->EditorTree.selectPage( 0 ); EWTreeWindow.setVisible( false ); - - if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) - { - EWTreeWindow.position = %this.extent.x - EWTreeWindow.Extent.x SPC EditorGuiToolbar.extent.y; - EWTreeWindow.extent = EWTreeWindow.extent.x SPC %this.extent.y - EditorGuiToolbar.extent.y - EditorGuiStatusBar.extent.y - 25; - FieldInfoControl.position = 5 SPC EWInspectorWindow.extent.y - 40; - } } } - + if( !isObject( %this-->InspectorWindow ) ) { // Load Creator/Inspector GUI exec("~/worldEditor/gui/WorldEditorInspectorWindow.ed.gui"); - //EWInspectorWindow.resize(getWord(EWInspectorWindow.Position, 0), getWord(EWInspectorWindow.Position, 1), getWord(EWInspectorWindow.extent, 0), getWord(EWInspectorWindow.extent, 1)); if( isObject( EWInspectorWindow ) ) { %this.add( EWInspectorWindow ); EWInspectorWindow.setVisible( false ); - - if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) - { - EWInspectorWindow.position = EWTreeWindow.position.x SPC EWTreeWindow.extent.y; - EWInspectorWindow.extent = EWTreeWindow.extent.x SPC EWTreeWindow.extent.y; - FieldInfoControl.position = 5 SPC EWInspectorWindow.extent.y - 40; - } } } @@ -213,6 +198,7 @@ function EditorGui::init(%this) } EWorldEditor.init(); + ETerrainEditor.init(); //Creator.init(); @@ -260,6 +246,13 @@ function EditorGui::init(%this) // Start up the settings window ESettingsWindow.startup(); + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Resize windows by docking EWTreeWindow & EWInspectorWindow + EWorldEditor.dockSidePanel(); + EWInspectorWindow.onMouseDragged(); + } + // Call the startup callback on the editor plugins. for ( %i = 0; %i < EditorPluginSet.getCount(); %i++ ) { @@ -380,6 +373,28 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %image break; } } + + // when the tooltip isn't defined let's use the internal name + if(%tooltip !$="") + { + // Don't show function keys markers if no key is set + %tooltipText = strreplace( %tooltip, "()", "" ); + // Remove any trailing whitespace + %tooltipText = rtrim(%tooltipText); + } + else + { + // Remove some words from the internal name so we can use it for the tooltip + %tooltipText = strreplace( %internalName, "Palette", "" ); + %tooltipText = strreplace( %tooltipText, "Inspector", "" ); + + %tooltipText = strreplace( %tooltipText, "_", " " ); + + // Remove any trailing whitespace + %tooltipText = rtrim(%tooltipText); + } + + %tooltip = %tooltipText; if(!%alreadyExists) { @@ -398,7 +413,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %image Visible = "1"; Command = "EditorGui.setEditor(" @ %pluginName @ ");"; tooltipprofile = "ToolsGuiToolTipProfile"; - ToolTip = "";// %tooltip; + ToolTip = %tooltip; hovertime = "750"; bitmapAsset = %imageAsset; buttonType = "RadioButton"; @@ -406,7 +421,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %image useMouseEvents = "0"; }; ToolsToolbarArray.add(%button); - EWToolsToolbar.setExtent((25 + 8) * (%count + 1) + 12 SPC "33"); + EWToolsToolbar.setExtent((29 + 4) * (%count + 1) + 4 SPC "32"); } } @@ -499,6 +514,8 @@ function EditorGui::setEditor( %this, %newEditor, %dontActivate ) %gui.setOrthoFOV( %this.currentOrthoFOV ); EditorGui.syncCameraGui(); } + + EditorGui.updateSideBar(); } function EditorGui::syncEditor( %this, %newEditor, %newEditorFailed ) @@ -607,6 +624,64 @@ function EditorGui::onSleep( %this ) $Server::CurrentScene.open(); } +function EditorGui::updateSideBar(%this) +{ + if(GuiEditorIsActive()) + { + if(isObject(AssetBrowserWindow) && isObject(GuiEditorSidebar)) + { + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - GuiEditorSidebar.extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + return; + } + + // Update the current sidebar with a mouse event + // Each editor script will do the rest of the work + if(isObject(EditorGui.currentEditor)) + { + switch$(EditorGui.currentEditor) + { + case "ConvexEditorPlugin": + ConvexEditorOptionsWindow.onMouseDragged(); + case "DatablockEditorPlugin": + DatablockEditorTreeWindow.onMouseDragged(); + case "DecalEditorPlugin": + DecalEditorWindow.onMouseDragged(); + case "ForestEditorPlugin ": + ForestEditorPalleteWindow.onMouseDragged(); + case "MaterialEditorPlugin": + MaterialEditorPreviewWindow.onMouseDragged(); + case "MeshRoadEditorPlugin": + MeshRoadEditorTreeWindow.onMouseDragged(); + case "MissionAreaEditorPlugin": + MissionAreaEditorTerrainWindow.onMouseDragged(); + case "NavEditorPlugin": + NavEditorTreeWindow.onMouseDragged(); + case "ParticleEditorPlugin": + PE_Window.onMouseDragged(); + case "RiverEditorPlugin": + RiverEditorTreeWindow.onMouseDragged(); + case "RoadEditorPlugin": + RoadEditorTreeWindow.onMouseDragged(); + case "ShapeEditorPlugin": + // Todo + case "VPathEditorPlugin": + VPathEditorTreeWindow.onMouseDragged(); + case "WorldEditorInspectorPlugin": + EWTreeWindow.onMouseDragged(); + case "TerrainEditorPlugin": + EPainterPreview.onMouseDragged(); + } + } +} + function EditorGui::onNewLevelLoaded( %this, %levelName ) { %this.levelName = %levelName; @@ -853,6 +928,56 @@ function EditorGui::syncCameraGui( %this ) EditorGuiStatusBar.setCamera("1st Person Camera"); } } + + //------------------------------------------------------------------------------ + + function EditorGui::addPointLight(%this) +{ + %obj = ObjectCreator.createObject( "ObjectBuilderGui.buildObject( \"PointLight\" );" ); + + EWorldEditor.isDirty = true; + EditorTree.buildVisibleTree(true); +} + + function EditorGui::addSpotLight(%this) +{ + %obj = ObjectCreator.createObject( "ObjectBuilderGui.buildObject( \"SpotLight\" );" ); + + EWorldEditor.isDirty = true; + EditorTree.buildVisibleTree(true); +} + + function EditorGui::addSound(%this) +{ + %obj = ObjectCreator.createObject( "ObjectBuilderGui.buildObject( \"SFXEmitter\" );" ); + + EWorldEditor.isDirty = true; + EditorTree.buildVisibleTree(true); +} + + function EditorGui::addTrigger(%this) +{ + %obj = ObjectCreator.createObject( "ObjectBuilderGui.buildObject( \"Trigger\" );" ); + + EWorldEditor.isDirty = true; + EditorTree.buildVisibleTree(true); +} + + function EditorGui::addParticle(%this) +{ + %obj = ObjectCreator.createObject( "ObjectBuilderGui.buildObject( \"ParticleEmitterNode\" );" ); + + EWorldEditor.isDirty = true; + EditorTree.buildVisibleTree(true); +} + + function EditorGui::addWater(%this) +{ + %obj = ObjectCreator.createObject( "ObjectBuilderGui.buildObject( \"WaterBlock\" );" ); + + EWorldEditor.isDirty = true; + EditorTree.buildVisibleTree(true); +} /// @name EditorPlugin Methods /// @{ @@ -1455,27 +1580,261 @@ function EWorldEditorAlignPopup::onSelect(%this, %id, %text) //----------------------------------------------------------------------------- +function EWorldEditor::onWake(%this) +{ + %fixedWindow = EWTreeWindow; + %fluidWindow = EWInspectorWindow; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function EWorldEditor::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = EWTreeWindow; + %fluidWindow = EWInspectorWindow; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function EWTreeWindow::onMouseDragged(%this) +{ + %parent = EWorldEditor; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function EWInspectorWindow::onMouseDragged(%this) +{ + %parent = EWorldEditor; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + function EWorldEditor::onResize(%this, %newPosition, %newExtent) { - if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + // Window to focus on (mostly the fluid window) + %window = EWInspectorWindow; + + if(%window.panelHidden == true) { - %treePos = %this.extent.x - (%this.extent.x * 0.2) SPC EditorGuiToolbar.extent.y; - %treeExt = %this.extent.x * 0.2 SPC (%this.extent.y * 0.5) - EditorGuiToolbar.extent.y - EditorGuiStatusBar.extent.y - 25; - - EWTreeWindow.resize(%treePos.x, %treePos.y, %treeExt.x, %treeExt.y); + %window.showSidePanel(); } - - if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) - { - %inspPos = EWTreeWindow.position.x SPC EWTreeWindow.position.y + EWTreeWindow.extent.y; - %inspExt = EWTreeWindow.extent.x SPC %this.extent.y - EWTreeWindow.extent.y - (EditorGuiStatusBar.extent.y * 2); - - EWInspectorWindow.resize(%inspPos.x, %inspPos.y, %inspExt.x, %inspExt.y); + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); } FieldInfoControl.position = 5 SPC EWInspectorWindow.extent.y - 40; } +function EWorldEditor::dockSidePanel() +{ + %parent = EWorldEditor; + %fixedWindow = EWTreeWindow; + %fluidWindow = EWInspectorWindow; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + EWorldEditor_UnDockBtn.Visible = "1"; + EWorldEditor_DockBtn.Visible = "0"; + + EWorldEditor_showBtn.Visible = "0"; + EWorldEditor_hideBtn.Visible = "1"; +} + +function EWorldEditor::releaseSidePanel() +{ + %parent = EWorldEditor; + %fixedWindow = EWTreeWindow; + %fluidWindow = EWInspectorWindow; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + EWorldEditor_UnDockBtn.Visible = "0"; + EWorldEditor_DockBtn.Visible = "1"; + + EWorldEditor_showBtn.Visible = "0"; + EWorldEditor_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function EWorldEditor::hideSidePanel() +{ + %parent = EWorldEditor; + %fixedWindow = EWTreeWindow; + %fluidWindow = EWInspectorWindow; + + EWorldEditor_showBtn.Visible = "1"; + EWorldEditor_hideBtn.Visible = "0"; + + // hide the content of the panels + %fixedWindow.titleText = %fixedWindow.text; + %fluidWindow.titleText = %fluidWindow.text; + + %fixedWindow.text = ""; + EditorTreeTabBook.Visible = "0"; + + %fluidWindow.text = ""; + EWInspectorContainer.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function EWorldEditor::showSidePanel() +{ + %parent = EWorldEditor; + %fixedWindow = EWTreeWindow; + %fluidWindow = EWInspectorWindow; + + EWorldEditor_showBtn.Visible = "0"; + EWorldEditor_hideBtn.Visible = "1"; + + // show the content of the panels + %fixedWindow.text = %fixedWindow.titleText; + EditorTreeTabBook.Visible = "1"; + + %fluidWindow.text = %fluidWindow.titleText; + EWInspectorContainer.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + + //----------------------------------------------------------------------------- function EWorldEditorNoneModeBtn::onClick(%this) @@ -1934,8 +2293,12 @@ function EditorTreeTabBook::onTabSelected( %this ) } else { - AssetBrowser.showDialog("ShapeAsset Datablock"); - EditorTreeTabBook.selectPage(0); + //AssetBrowser.showDialog("ShapeAsset Datablock"); + //EditorTreeTabBook.selectPage(0); + + EWTreeWindow-->DeleteSelection.visible = false; + EWTreeWindow-->LockSelection.visible = false; + EWTreeWindow-->AddSimGroup.visible = false; } } @@ -2056,6 +2419,26 @@ function EditTSCtrl::updateGizmoMode( %this, %mode ) //------------------------------------------------------------------------------ +function EditorGui::toggleDeviceMode( %this ) +{ + // Check the current setting + %mode = getField($Video::ModeTags, $pref::Video::deviceMode); + + if(%mode !$= "Borderless") + { + %resolutionList = getScreenResolutionList($pref::Video::deviceId, $Video::Mode[%mode]); + %resolution = OptionsMenu.getOptionVariableValue("$pref::Video::Resolution"); + if(%resolution $= "") + %resolution = $pref::Video::mode; + + %resolution = _makePrettyResString(%resolution); + + OptionsMenuSettingsList.addOptionRow("Resolution", "$pref::Video::Resolution", %resolutionList, false, "", true, "Resolution of the game window", %resolution); + } +} + +//------------------------------------------------------------------------------ + function EWorldEditor::syncGui( %this ) { %this.syncToolPalette(); @@ -2473,7 +2856,7 @@ function EWToolsToolbar::reset( %this ) EWToolsToolbar.isDynamic = 0; EWToolsToolbarDecoy.setVisible(false); - EWToolsToolbarDecoy.setExtent((29 + 4) * %count + 4, 31); + EWToolsToolbarDecoy.setExtent((29 + 4) * %count + 4, 32); %this-->resizeArrow.setBitmap( "ToolsModule:collapse_toolbar_n_image" ); } @@ -2503,7 +2886,7 @@ function EWToolsToolbar::toggleSize( %this, %useDynamics ) EWToolsToolbar.isDynamic = 1; } - EWToolsToolbarDecoy.setExtent(35, 31); + EWToolsToolbarDecoy.setExtent(35, 32); } else { @@ -2553,6 +2936,20 @@ function EditorGuiStatusBar::getInfo( %this ) function EditorGuiStatusBar::setInfo( %this, %text ) { + %slashPos = 0; + while( strpos( $Server::MissionFile, "/", %slashPos ) != -1 ) + { + %slashPos = strpos( $Server::MissionFile, "/", %slashPos ) + 1; + } + %levelName = getSubStr( $Server::MissionFile , %slashPos , 99 ); + + %levelName = strreplace( %levelName, ".mis", "" ); + + if(%levelName !$="") + %text = "" @ %levelName SPC " - " SPC %text; + else + %text = "" @ "Untitled" SPC " - " SPC %text; + EWorldEditorStatusBarInfo.setText(%text); } diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript index d7d079fbb..bd1061536 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editorPrefs.ed.tscript @@ -182,7 +182,7 @@ EditorSettings.setDefaultValue( "headerColor", "40 40 40 255"); EditorSettings.setDefaultValue( "windowBackgroundColor", "35 35 35 255"); EditorSettings.setDefaultValue( "tabsColor", "40 40 40 255" ); -EditorSettings.setDefaultValue( "tabsHLColor", "180 180 180 255" ); +EditorSettings.setDefaultValue( "tabsHLColor", "100 100 100 255" ); EditorSettings.setDefaultValue( "tabsSELColor", "100 110 120 255" ); EditorSettings.setDefaultValue( "dividerDarkColor", "30 30 30 255"); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript index 4cc998f6a..7bddbecd9 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript @@ -33,7 +33,8 @@ function TerrainEditor::init( %this ) ESettingsWindow.addEditorSettingsPage("TerrainEditor", "Terrain Editor"); } -/// +//----------------------------------------------------------------------------- + function EPainter_TerrainMaterialUpdateCallback( %mat, %matIndex ) { // Skip over a bad selection. @@ -111,7 +112,40 @@ function EPainter::updateLayers( %this, %matIndex ) %index = %matList.getCount(); %command = "ETerrainEditor.setPaintMaterial( " @ %index @ ", " @ %mat @ " );"; %altCommand = "TerrainMaterialDlg.show( " @ %index @ ", " @ %mat @ ", EPainter_TerrainMaterialUpdateCallback );"; + + // Material Layer button | New style + %ctrl = new GuiIconButtonCtrl() + { + class = "EPainterIconBtn"; + internalName = "EPainterMaterialButton" @ %i; + Profile = "ToolsGuiIconButtonLargeProfile"; + extent = %listWidth SPC "54"; + MinExtent = "120 54"; + buttonMargin = "2 0"; + textMargin = "70"; + buttonType = "RadioButton"; + sizeIconToButton = true; + bitmapMargin = "2"; + makeIconSquare = true; + tooltipprofile = "ToolsGuiToolTipProfile"; + command = %command; + altCommand = %altCommand; + useMouseEvents = true; + new GuiBitmapButtonCtrl() + { + bitmapAsset = "ToolsModule:delete_n_image"; + buttonType = "PushButton"; + HorizSizing = "left"; + VertSizing = "bottom"; + position = ( %listwidth - 20 ) SPC "26"; + Extent = "17 17"; + command = "EPainter.showMaterialDeleteDlg( \"" @ %matInternalName @ "\" );"; + }; + }; + // --> + + /* %ctrl = new GuiIconButtonCtrl() { class = "EPainterIconBtn"; @@ -141,6 +175,7 @@ function EPainter::updateLayers( %this, %matIndex ) command = "EPainter.showMaterialDeleteDlg( \"" @ %matInternalName @ "\" );"; }; }; + */ %ctrl.setText( %matInternalName ); %ctrl.setBitmap( getAssetPreviewImage(%mat.getDiffuseMap()) ); @@ -158,6 +193,7 @@ function EPainter::updateLayers( %this, %matIndex ) %matCount = %matList.getCount(); // Add one more layer as the 'add new' layer. + /* %ctrl = new GuiIconButtonCtrl() { profile = "GuiCreatorIconButtonProfile"; @@ -176,7 +212,29 @@ function EPainter::updateLayers( %this, %matIndex ) command = "TerrainMaterialDlg.show( " @ %matCount @ ", 0, EPainter_TerrainMaterialAddCallback );"; }; %matList.add( %ctrl ); - + */ + + // Add one more layer as the 'add new' layer | New style + %ctrl = new GuiIconButtonCtrl(NewTerrainMatLayerBtn) + { + Profile = "ToolsGuiIconButtonLargeProfile"; + extent = %listWidth SPC "50"; + MinExtent = "120 50"; + command = "TerrainMaterialDlg.show( " @ %matCount @ ", 0, EPainter_TerrainMaterialAddCallback );"; + tooltipprofile = "ToolsGuiToolTipProfile"; + ToolTip = "Add a new Terrain Material Layer"; + hovertime = "1000"; + bitmapAsset = "ToolsModule:terrain_painter_new_n_image"; + text = "New Layer"; + buttonMargin = "12 0"; + textMargin = "70"; + groupNum = "0"; + buttonType = "PushButton"; + useMouseEvents = "0"; + }; + %matList.add( %ctrl ); + // --> + // Make sure our selection is valid and that we're // not selecting the 'New Layer' button. @@ -497,3 +555,262 @@ function EPainterIconBtn::onControlDropped( %this, %payload ) // select the button/material we just reordered. %stack.getObject( %dstIndex ).performClick(); } + +//----------------------------------------------------------------------------- + +function TerrainEditor::onWake(%this) +{ + // Let's wake the painter so we apply the right settings at start + TerrainPainterContainer.onWake(); +} + +function TerrainPainterContainer::onWake(%this) +{ + %fixedWindow = EPainterPreview; + %fluidWindow = EPainter; + + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1) + { + // Let's dock the side panel to the right side + %this.docked = false; + %this.resizing = true; + %this.dockSidePanel(); + } + else + { + // Let's release the side panel so it can be moved + %this.docked = true; + %this.resizing = false; + %this.releaseSidePanel(); + } +} + +function TerrainPainterContainer::maxSize(%this, %window) +{ + // Resize the windows to the max height + // and force these to the right side if set + if(EditorSettings.value( "WorldEditor/forceSidebarToSide" ) == 1 && %this.resizing == true) + { + // prevent onResize after a resize + %this.resizing = false; + + %fixedWindow = EPainterPreview; + %fluidWindow = EPainter; + %top = EditorGuiToolbar.extent.y + 6; + %bottom = %top + 65 - 6; + %maxHeight = Canvas.extent.y - %top - %bottom; + + // --- Fixed window (top) ------------------------------------------------ + // put it back if it moved + %fixedWindow.position.x = Canvas.extent.x - %fixedWindow.extent.x; + %fixedWindow.position.y = %top; + + // don't go beyond the canvas + if(%fixedWindow.extent.y > %maxHeight) + %fixedWindow.extent.y = %maxHeight - %fluidWindow.extent.y; + + %position = %fixedWindow.position.x SPC %fixedWindow.position.y; + %extent = %window.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- Fluid window (bottom) --------------------------------------------- + // position is relative to the top window + %position = %fixedWindow.position.x SPC %fixedWindow.extent.y + %top; + %extent = %window.extent.x SPC Canvas.extent.y - %fixedWindow.extent.y - %bottom; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + // --- AssetBrowser window ---------------------------------------------- + if(isObject(AssetBrowserWindow)) + { + // Only resize the AssetBrowser if it's docked + if(AssetBrowserWindow.docked == true) + { + // The width is relative to the sidepanel + %browserWidth = Canvas.extent.x - %extent.x; + %browserHeight = AssetBrowserWindow.extent.y; + %browserPosY = Canvas.extent.y - AssetBrowserWindow.extent.y - 33; + AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); + } + } + // --- Windowed Console -------------------------------------------------- + if(isObject(windowConsoleControl)) + { + // Only resize the AssetBrowser if it's docked + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - %extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } + } +} + +function EPainterPreview::onMouseDragged(%this) +{ + %parent = TerrainPainterContainer; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function EPainter::onMouseDragged(%this) +{ + %parent = TerrainPainterContainer; + + if(%parent.panelHidden == true) + { + %parent.showSidePanel(); + } + + if(%parent.resizing == false && %parent.docked == true) + { + %parent.resizing = true; + %parent.maxSize(%this); + } +} + +function TerrainPainterContainer::onResize(%this, %newPosition, %newExtent) +{ + // Window to focus on (mostly the fluid window) + %window = EPainter; + + if(%window.panelHidden == true) + { + %window.showSidePanel(); + } + + if(%this.resizing == false && %this.docked == true) + { + // Only resize once + %this.resizing = true; + %this.maxSize(%window); + } +} + +function TerrainPainterContainer::dockSidePanel() +{ + %parent = TerrainPainterContainer; + %fixedWindow = EPainterPreview; + %fluidWindow = EPainter; + + if(%parent.docked == true) + return; + + // Move and resize the window(s) + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.docked = true; + %fluidWindow.onMouseDragged(); + + // Lock the windows in place + %fixedWindow.canCollapse = "0"; + %fixedWindow.canMove = "0"; + + %fluidWindow.canCollapse = "0"; + %fluidWindow.canMove = "0"; + + TerrainPainterContainer_UnDockBtn.Visible = "1"; + TerrainPainterContainer_DockBtn.Visible = "0"; + + TerrainPainterContainer_showBtn.Visible = "0"; + TerrainPainterContainer_hideBtn.Visible = "1"; +} + +function TerrainPainterContainer::releaseSidePanel() +{ + %parent = TerrainPainterContainer; + %fixedWindow = EPainterPreview; + %fluidWindow = EPainter; + + if(%parent.docked == false) + return; + + // Unlock the windows so that be moved + %fixedWindow.canCollapse = "1"; + %fixedWindow.canMove = "1"; + + %fluidWindow.canCollapse = "1"; + %fluidWindow.canMove = "1"; + + TerrainPainterContainer_UnDockBtn.Visible = "0"; + TerrainPainterContainer_DockBtn.Visible = "1"; + + TerrainPainterContainer_showBtn.Visible = "0"; + TerrainPainterContainer_hideBtn.Visible = "0"; + + // Let's do a small resize so it's visually clear we're undocking + %position = %fixedWindow.position.x - 6 SPC %fixedWindow.position.y + 6; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = %fluidWindow.position.x - 6 SPC %fluidWindow.position.y + 6; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y - 12; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.docked = false; + %parent.resizing = false; +} + +function TerrainPainterContainer::hideSidePanel() +{ + %parent = TerrainPainterContainer; + %fixedWindow = EPainterPreview; + %fluidWindow = EPainter; + + TerrainPainterContainer_showBtn.Visible = "1"; + TerrainPainterContainer_hideBtn.Visible = "0"; + + // hide the content of the panels + EPainterPreview.text = ""; + EPainterPreviewCont.Visible = "0"; + TerrainTextureText.Visible = "0"; + EPainter.text = ""; + EPainterScroll.Visible = "0"; + + // Let's do a resize so that the panel is collapsed to the side + %position = Canvas.extent.x - 24 SPC %fixedWindow.position.y; + %extent = %fixedWindow.extent.x SPC %fixedWindow.extent.y; + %fixedWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %position = Canvas.extent.x - 24 SPC %fluidWindow.position.y; + %extent = %fluidWindow.extent.x SPC %fluidWindow.extent.y; + %fluidWindow.resize(%position.x, %position.y, %extent.x, %extent.y); + + %parent.panelHidden = true; +} + +function TerrainPainterContainer::showSidePanel() +{ + %parent = TerrainPainterContainer; + %fixedWindow = EPainterPreview; + %fluidWindow = EPainter; + + TerrainPainterContainer_showBtn.Visible = "0"; + TerrainPainterContainer_hideBtn.Visible = "1"; + + // show the content of the panels + EPainterPreview.text = "Terrain Painter - Material Preview"; + EPainterPreviewCont.Visible = "1"; + TerrainTextureText.Visible = "1"; + EPainter.text = "Terrain Painter - Material Selector"; + EPainterScroll.Visible = "1"; + + %parent.resizing = true; + %parent.maxSize(%fluidWindow); + + %parent.panelHidden = false; +} + +//----------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript index bd4d3b566..817a29e14 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript @@ -302,7 +302,6 @@ function WorldEditor::resetTransforms(%this) } } - function WorldEditorToolbarDlg::init(%this) { WorldEditorInspectorCheckBox.setValue( WorldEditorToolFrameSet.isMember( "EditorToolInspectorGui" ) ); @@ -377,7 +376,8 @@ function WorldEditor::doFileDropProcessing(%this) ImportAssetWindow.refresh(); } -// +//------------------------------------------------------------------------------ + function Inspector::onInspectorFieldModified( %this, %object, %fieldName, %arrayIndex, %oldValue, %newValue ) { @@ -423,7 +423,7 @@ function Inspector::onInspectorFieldModified( %this, %object, %fieldName, %array function Inspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } // The following three methods are for fields that edit field value live and thus cannot record