From b0a11d79d58e29524730e65db38e4b29bece2308 Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Tue, 10 Sep 2024 13:20:11 +0200 Subject: [PATCH 1/6] Remove space below/above toolbars Remove the (thin) space between the world editor toolbars. --- .../tools/worldEditor/gui/EditorGui.ed.gui | 2 +- .../tools/worldEditor/gui/ToolsToolbar.ed.gui | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index 4c8feacfa..d98101c57 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -261,7 +261,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; - Extent = "800 37"; + Extent = "800 40"; MinExtent = "8 8"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui index 4b8acbbcf..e7cdeac3c 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui @@ -9,13 +9,26 @@ $guiContent = new GuiContainer(EWToolsToolbar) { VertSizing = "bottom"; Position = "0 38"; Extent = "0 33"; - MinExtent = "8 2"; + MinExtent = "8 34"; canSave = "1"; Visible = "1"; hovertime = "1000"; isClosed = "0"; isDynamic = "0"; + new GuiDecoyCtrl(EWToolsToolbarSpacer) { + profile = "ToolsMenubarProfile"; + horizSizing = "right"; + vertSizing = "bottom"; + position = "0 3"; + extent = "4 33"; + minExtent = "8 8"; + visible = "1"; + helpTag = "0"; + useMouseEvents = "0"; + isDecoy = "1"; + }; + new GuiDynamicCtrlArrayControl(ToolsToolbarArray) { canSaveDynamicFields = "0"; Enabled = "1"; @@ -24,15 +37,15 @@ $guiContent = new GuiContainer(EWToolsToolbar) { HorizSizing = "width"; VertSizing = "bottom"; position = "4 3"; - Extent = "264 32"; - MinExtent = "1024 32"; + Extent = "264 33"; + MinExtent = "1024 33"; canSave = "1"; Visible = "1"; hovertime = "1000"; colCount = "1"; colSize = "29"; RowSize = "27"; - rowSpacing = "2"; + rowSpacing = "1"; colSpacing = "4"; }; new GuiBitmapButtonCtrl() { @@ -61,7 +74,7 @@ $guiContent = new GuiContainer(EWToolsToolbar) { horizSizing = "right"; vertSizing = "bottom"; position = "1 1"; - extent = "35 31"; + extent = "35 33"; minExtent = "8 8"; visible = "0"; helpTag = "0"; From 8b049e3b018a38550357effe4f388ad78a9f470b Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Tue, 10 Sep 2024 20:39:54 +0200 Subject: [PATCH 2/6] Correct positioning sidepanels Sidepanels of the world editors got shifted due to the introduction of the editor tab. Several corrected overall. Some minor tweaks to be expected in a later commit. --- .../BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript | 2 +- .../BaseGame/game/tools/convexEditor/convexEditorGui.tscript | 2 +- .../game/tools/datablockEditor/datablockEditor.tscript | 2 +- .../BaseGame/game/tools/decalEditor/decalEditorGui.tscript | 2 +- .../BaseGame/game/tools/forestEditor/forestEditorGui.tscript | 2 +- .../tools/materialEditor/scripts/materialEditor.ed.tscript | 2 +- .../game/tools/meshRoadEditor/meshRoadEditorGui.tscript | 2 +- .../tools/missionAreaEditor/missionAreaEditorGui.ed.tscript | 2 +- Templates/BaseGame/game/tools/navEditor/navEditor.tscript | 2 +- .../game/tools/particleEditor/particleEditor.ed.tscript | 2 +- .../BaseGame/game/tools/riverEditor/riverEditorGui.tscript | 2 +- .../BaseGame/game/tools/roadEditor/roadEditorGui.tscript | 2 +- .../game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui | 4 ++-- .../game/tools/worldEditor/scripts/EditorGui.ed.tscript | 4 ++-- .../worldEditor/scripts/editors/terrainEditor.ed.tscript | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript b/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript index 434b01e0c..9206acf58 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript @@ -31,7 +31,7 @@ function EVPathEditor::maxSize(%this, %window) %fixedWindow = VPathEditorTreeWindow; %fluidWindow = VPathEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript index 3e18ff75d..006e03ea6 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript @@ -276,7 +276,7 @@ function ConvexEditorGui::maxSize(%this, %window) %this.resizing = false; %fluidWindow = ConvexEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %position = Canvas.extent.x - %fluidWindow.extent.x SPC %top; diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript index 5f9d23d78..0bd07cfdc 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript +++ b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript @@ -824,7 +824,7 @@ function DatablockEditorGui::maxSize(%this, %window) %fixedWindow = DatablockEditorTreeWindow; %fluidWindow = DatablockEditorInspectorWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript index 33b0034c4..2c214d19e 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript @@ -54,7 +54,7 @@ function DecalEditorGui::maxSize(%this, %window) %fixedWindow = DecalEditorWindow; %fluidWindow = DecalPreviewWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript index e99a0ac73..03620d7bc 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript @@ -56,7 +56,7 @@ function ForestEditorGui::maxSize(%this, %window) %fixedWindow = ForestEditorPalleteWindow; %fluidWindow = ForestEditorPropertiesWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index ccd93fee2..a72d02511 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -284,7 +284,7 @@ function MaterialEditorGui::maxSize(%this, %window) %fixedWindow = MaterialEditorPreviewWindow; %fluidWindow = MaterialEditorPropertiesWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript index 8f472816b..fcc1888c4 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript @@ -43,7 +43,7 @@ function MeshRoadEditorGui::maxSize(%this, %window) %fixedWindow = MeshRoadEditorTreeWindow; %fluidWindow = MeshRoadEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript index 00fb08f31..0de382c0f 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript @@ -54,7 +54,7 @@ function MissionAreaEditorGui::maxSize(%this, %window) %fixedWindow = MissionAreaEditorTerrainWindow; %fluidWindow = MissionAreaEditorPropertiesWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript index c1d9ea04f..f011bbecf 100644 --- a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript +++ b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript @@ -69,7 +69,7 @@ function NavEditorGui::maxSize(%this, %window) %fixedWindow = NavEditorTreeWindow; %fluidWindow = NavEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript index 99a9024fd..c000b5a18 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript @@ -276,7 +276,7 @@ function ParticleEditor::maxSize(%this, %window) // prevent onResize after a resize %this.resizing = false; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript index c36141774..29afdaa4d 100644 --- a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript +++ b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript @@ -60,7 +60,7 @@ function RiverEditorGui::maxSize(%this, %window) %fixedWindow = RiverEditorTreeWindow; %fluidWindow = RiverEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript index f4cd9c147..fd41ab1b2 100644 --- a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript @@ -73,7 +73,7 @@ function RoadEditorGui::maxSize(%this, %window) %fixedWindow = RoadEditorTreeWindow; %fluidWindow = RoadEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui index 74c61fe37..c15d8f728 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui @@ -1,11 +1,11 @@ // Let's check if the ShapeEdAdvancedWindow can be stacked in the side panel if (getWord($pref::Video::mode, 1) > 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; + $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 360 SPC getWord(ShapeEdSelectWindow.extent, 1) + getWord(ShapeEdPropWindow.extent, 1) + getWord(EditorGuiToolbar.extent, 1) + 12 - 7; } else { - $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 720 SPC getWord(EditorGuiToolbar.extent, 1) + 6; + $ShapeEdAdvancedWindowPos = getWord($pref::Video::mode, 0) - 720 SPC getWord(EditorGuiToolbar.extent, 1) + 6 - 7; } //--- OBJECT WRITE BEGIN --- diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index da922d89f..9a8fe9716 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -1616,9 +1616,9 @@ function EWorldEditor::maxSize(%this, %window) %fixedWindow = EWTreeWindow; %fluidWindow = EWInspectorWindow; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 + 19; %bottom = %top + 65 - 6; - %maxHeight = Canvas.extent.y - %top - %bottom; + %maxHeight = Canvas.extent.y - %top - %bottom + 12; // --- Fixed window (top) ------------------------------------------------ // put it back if it moved 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 7bddbecd9..1a9d1307b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript @@ -596,7 +596,7 @@ function TerrainPainterContainer::maxSize(%this, %window) %fixedWindow = EPainterPreview; %fluidWindow = EPainter; - %top = EditorGuiToolbar.extent.y + 6; + %top = EditorGuiToolbar.extent.y + 6 - 7; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; From f38352501d09ccfc92558e7721aff02236520751 Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Tue, 10 Sep 2024 22:07:02 +0200 Subject: [PATCH 3/6] Correct undefined background Main Tab Correct the background of the world editor main tab with a (new) solid fill. Sometimes it appeared as black, magenta or the just the scene itself. Color is fixed for now as it is a unique situation regarding the use of tabs here. --- .../BaseGame/game/tools/gui/profiles.ed.tscript | 8 ++++++++ .../game/tools/worldEditor/gui/EditorGui.ed.gui | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript index 26886e128..f4eee3c99 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -943,6 +943,14 @@ singleton GuiControlProfile( GuiBackFillProfile ) category = "Editor"; }; +singleton GuiControlProfile( GuiDarkFillProfile ) +{ + opaque = true; + fillColor = "25 25 25"; + border = false; + category = "Editor"; +}; + singleton GuiControlProfile(GuiShaderEditorProfile : ToolsGuiDefaultProfile) { opaque = true; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index d98101c57..1e932ba7f 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -19,6 +19,19 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { AnchorLeft = "1"; AnchorRight = "0"; + new GuiDecoyCtrl(EditorGuiMainTabBookBG) { + profile = "GuiDarkFillProfile"; + horizSizing = "width"; + vertSizing = "bottom"; + position = "0 5"; + extent = "800 24"; + minExtent = "8 8"; + visible = "1"; + helpTag = "0"; + useMouseEvents = "0"; + isDecoy = "1"; + }; + new GuiTabBookCtrl(EditorGuiMainTabBook) { tabHeight = "20"; selectedPage = "0"; From dffb55793074441a66715f011adfaab8879a015b Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Thu, 12 Sep 2024 18:16:25 +0200 Subject: [PATCH 4/6] Adjusting window titles to fit properly Because of the large width & height of the Arial font at 18 did the window titles not fit properly. Font has been decreased and made bold for the sake of distinction. Additional has the terrainpainter window's position been corrected (terrainEditor.ed.tscript) --- .../tools/VPathEditor/GUI/VPathEditor.gui | 4 +-- .../tools/assetBrowser/guis/assetBrowser.gui | 2 +- .../tools/convexEditor/convexEditorGui.gui | 2 +- .../convexEditor/convexEditorSidebarGui.gui | 2 +- .../DatablockEditorInspectorWindow.ed.gui | 2 +- .../DatablockEditorTreeWindow.ed.gui | 2 +- .../game/tools/decalEditor/decalEditorGui.gui | 4 +-- .../tools/decalEditor/decalEditorGui.tscript | 4 +-- .../tools/forestEditor/forestEditorGui.gui | 4 +-- .../tools/gui/EditorSettingsWindow.ed.gui | 2 +- .../tools/gui/editorSettingsWindow.ed.tscript | 2 +- .../game/tools/gui/guiObjectInspector.ed.gui | 2 +- .../BaseGame/game/tools/gui/postFxEditor.gui | 2 +- .../game/tools/gui/profiles.ed.tscript | 8 +++--- .../levels/DefaultEditorLevel.asset.taml | 2 ++ .../game/tools/levels/DefaultEditorLevel.mis | 28 ++++++------------- .../gui/guiMaterialPreviewWindow.ed.gui | 2 +- .../gui/guiMaterialPropertiesWindow.ed.gui | 2 +- .../scripts/materialEditor.ed.tscript | 8 +++--- .../meshRoadEditor/meshRoadEditorGui.gui | 4 +-- .../missionAreaEditorGui.ed.gui | 4 +-- .../game/tools/navEditor/NavEditorGui.gui | 4 +-- .../particleEditor/ParticleEditor.ed.gui | 2 +- .../particleEditor/particleEditor.ed.tscript | 4 +-- .../game/tools/riverEditor/RiverEditorGui.gui | 4 +-- .../game/tools/roadEditor/RoadEditorGui.gui | 4 +-- .../gui/shapeEdAdvancedWindow.ed.gui | 2 +- .../shapeEditor/gui/shapeEdPropWindow.ed.gui | 2 +- .../gui/shapeEdSelectWindow.ed.gui | 2 +- .../windowConsole/guis/window_console.gui | 2 +- .../gui/EditorSettingsWindow.ed.gui | 2 +- .../gui/ManageBookmarksWindow.ed.gui | 2 +- .../gui/ManageSFXParametersWindow.ed.gui | 2 +- .../gui/ObjectSnapOptionsWindow.ed.gui | 2 +- .../gui/TerrainPainterWindow.ed.gui | 4 +-- .../gui/WorldEditorInspectorWindow.ed.gui | 2 +- .../gui/WorldEditorTreeWindow.ed.gui | 2 +- .../worldEditor/gui/guiTerrainImportGui.gui | 2 +- .../gui/guiTerrainMaterialDlg.ed.gui | 2 +- .../scripts/editors/terrainEditor.ed.tscript | 2 +- 40 files changed, 66 insertions(+), 74 deletions(-) diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui index e48614c5a..3f7467c39 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/VPathEditor.gui @@ -71,7 +71,7 @@ new VPathEditor(EVPathEditor) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Verve Path Editor"; + text = ":: Verve Path Editor"; new GuiContainer(){ profile = GuiDefaultProfile; @@ -218,7 +218,7 @@ new VPathEditor(EVPathEditor) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; EdgeSnap = "1"; - text = ":: Verve Path - Properties"; + text = ":: Verve Path - Properties"; new GuiContainer(){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui index f64982991..e75c2e1c4 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui @@ -138,7 +138,7 @@ $guiContent = new GuiControl(AssetBrowser) { }; }; new GuiWindowCtrl(AssetBrowserWindow) { - text = ":: Asset Browser"; + text = ":: Asset Browser"; resizeWidth = "0"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui index 8f74414af..02f734f21 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.gui @@ -70,7 +70,7 @@ $guiContent = new GuiConvexEditorCtrl(ConvexEditorGui) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Convex Shape Editor"; + text = ":: Convex Shape Editor"; new GuiContainer(){ profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorSidebarGui.gui index 6009482ae..687ecc1fe 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 = ":: Sketch Tool - Properties"; + text = ":: Sketch Tool - Properties"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorInspectorWindow.ed.gui index bc74b47cd..fb1be7862 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 Editor - Data"; + text = ":: Datablock Editor - Data"; Margin = "8 8 8 8"; Padding = "0 0 0 0"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui index 493efa38d..412a88861 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/datablockEditor/DatablockEditorTreeWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl(DatablockEditorGui) { minSize = "50 50"; closeCommand = "DatablockInspectorTreeWindow.setVisible(false);"; EdgeSnap = "1"; - text = ":: Datablock Editor - Library"; + text = ":: Datablock Editor - Library"; Margin = "8 8 8 8"; Padding = "0 0 0 0"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui index 5f7af7d80..c7f799fb8 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.gui @@ -69,7 +69,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Decal Editor"; + text = ":: Decal Editor"; new GuiTabBookCtrl(DecalEditorTabBook) { canSaveDynamicFields = "0"; @@ -517,7 +517,7 @@ $guiContent = new GuiDecalEditorCtrl(DecalEditorGui) { minSize = "152 235"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = ":: Decal Properties"; + text = ":: Decal Properties"; new GuiScrollCtrl(DecalEditorTemplateProperties){ canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript index 2c214d19e..d31f2afb9 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript @@ -486,7 +486,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx ) { if( %idx == 0) { - DecalPreviewWindow.text = ":: Decal Editor - Template Properties"; + DecalPreviewWindow.text = ":: Decal Editor - Template Properties"; DecalEditorLibraryProperties.setVisible(true); DecalEditorTemplateProperties.setVisible(false); RetargetDecalButton.setVisible( true ); @@ -496,7 +496,7 @@ function DecalEditorTabBook::onTabSelected( %this, %text, %idx ) } else { - DecalPreviewWindow.text = ":: Decal Editor - Instance Properties"; + DecalPreviewWindow.text = ":: Decal Editor - Instance Properties"; RetargetDecalButton.setVisible( false ); NewDecalButton.setVisible( false ); SaveDecalsButton.setVisible( false ); diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui index 51ee7b03d..a1ded6b86 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.gui @@ -46,7 +46,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Forest Editor - Pallete"; + text = ":: Forest Editor - Pallete"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; AnchorTop = "1"; @@ -525,7 +525,7 @@ $guiContent = new ForestEditorCtrl(ForestEditorGui,EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Forest Editor - Properties"; + text = ":: Forest Editor - Properties"; Margin = "0 0 0 0"; Padding = "0 0 0 0"; AnchorTop = "1"; diff --git a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui index 057350304..4d5928c37 100644 --- a/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui +++ b/Templates/BaseGame/game/tools/gui/EditorSettingsWindow.ed.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(EditorSettingsWindow,EditorGuiGroup) { canSaveDynamicFields = "1"; new GuiWindowCollapseCtrl(ESettingsWindow) { - text = ":: Editor Settings"; + text = ":: Editor Settings"; resizeWidth = "0"; resizeHeight = "0"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript index a39dbcf1f..cc0638cca 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 d8ca203c1..9340cac72 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/postFxEditor.gui b/Templates/BaseGame/game/tools/gui/postFxEditor.gui index c1ac975ae..43c2ead77 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 f4eee3c99..569c4ba60 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -37,7 +37,7 @@ $Gui::fontTypeMono = "Arial"; $GUI::fontSize[12] = 12; $GUI::fontSize[14] = 14; $GUI::fontSize[16] = 16; -$GUI::fontSize[18] = 18; +$GUI::fontSize[18] = 17; $GUI::fontSize[24] = 24; $GUI::fontSize[36] = 36; @@ -195,8 +195,8 @@ new GuiControlProfile (ToolsGuiWindowProfile) hasBitmapArray = true; justify = "left"; category = "Tools"; - fontType = $Gui::fontTypeMedium; - fontSize = $GUI::fontSize[18]; + fontType = $Gui::fontTypeBold; + fontSize = $GUI::fontSize[16]; }; if( !isObject( ToolsGuiPaneProfile ) ) @@ -211,7 +211,7 @@ new GuiControlProfile (ToolsGuiPaneProfile) borderColor = EditorSettings.value("Theme/windowBackgroundColor"); category = "Tools"; fontType = $Gui::fontTypeMedium; - fontSize = $GUI::fontSize[18]; + fontSize = $GUI::fontSize[16]; }; if( !isObject( ToolsGuiToolbarWindowProfile ) ) diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml index 9b3fe43b3..be3bc9b5b 100644 --- a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml +++ b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml @@ -2,6 +2,7 @@ AssetName="DefaultEditorLevel" LevelFile="@assetFile=DefaultEditorLevel.mis" LevelName="DefaultEditorLevel" + PostFXPresetFile="@assetFile=tools/levels/DefaultEditorLevel.postfxpreset.tscript" description="An empty room" previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image" previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image" @@ -11,4 +12,5 @@ previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image" previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image" staticObjectAssetDependency0="@asset=Prototyping:FloorGray" + staticObjectAssetDependency1="@asset=ExampleModule:NewTerrain1" VersionId="1"/> diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis index 466e48cc7..82fc85844 100644 --- a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis +++ b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis @@ -1,33 +1,20 @@ //--- OBJECT WRITE BEGIN --- new Scene(EditorTemplateLevel) { - canSave = "1"; - canSaveDynamicFields = "1"; - Enabled = "1"; + isEditing = "1"; + enabled = "1"; new LevelInfo(theLevelInfo) { - nearClip = "0.1"; - visibleDistance = "1000"; - visibleGhostDistance = "0"; - decalBias = "0.0015"; - fogColor = "0.6 0.6 0.7 1"; - fogDensity = "0"; + FogColor = "0.6 0.6 0.7 1"; fogDensityOffset = "700"; - fogAtmosphereHeight = "0"; canvasClearColor = "0 0 0 255"; - ambientLightBlendPhase = "1"; - ambientLightBlendCurve = "0 0 -1 -1"; soundAmbience = "AudioAmbienceDefault"; - soundDistanceModel = "Linear"; - canSave = "1"; - canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; }; new ScatterSky(DynamicSky) { sunScale = "0.991102 0.921582 0.83077 1"; zOffset = "-3000"; azimuth = "25"; brightness = "5"; - flareType = "LightFlareExample1"; MoonMatAsset = "Core_Rendering:moon_wglow"; useNightCubemap = "1"; nightCubemap = "nightCubemap"; @@ -44,16 +31,19 @@ new Scene(EditorTemplateLevel) { persistentId = "289ad401-3140-11ed-aae8-c0cb519281fc"; reflectionPath = "tools/levels/DefaultEditorLevel/probes/"; }; - new GroundPlane() { scaleU = "32"; scaleV = "32"; MaterialAsset = "Prototyping:FloorGray"; - Enabled = "1"; + enabled = "1"; position = "0 0 0"; rotation = "1 0 0 0"; scale = "1 1 1"; }; + new TerrainBlock(NewTerrain1) { + TerrainAsset = "ExampleModule:NewTerrain1"; + position = "-512 -412 -511"; + }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui index e4ddeaaf9..2442a6aa7 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPreviewWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { closeCommand = "MaterialEditorPreviewWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Material Editor - Preview"; + text = ":: Material Editor - Preview"; /*new GuiContainer(MaterialEditorPreviewPane) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui index 6f7640ea1..953da034f 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui +++ b/Templates/BaseGame/game/tools/materialEditor/gui/guiMaterialPropertiesWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) { closeCommand = "MaterialEditorPropertiesWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Material Editor - Properties"; + text = ":: Material Editor - Properties"; new GuiContainer(MaterialEditorGuiContent){ // Client group isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index a72d02511..aa5804b1f 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -784,8 +784,8 @@ function MaterialEditorGui::isMatEditorMaterial(%this, %material) function MaterialEditorGui::setMaterialNotDirty(%this) { - %propertyText = ":: Material Editor - Properties"; - %previewText = ":: Material Editor - Preview"; + %propertyText = ":: Material Editor - Properties"; + %previewText = ":: Material Editor - Preview"; MaterialEditorPropertiesWindow.text = %propertyText; MaterialEditorPreviewWindow.text = %previewText; @@ -795,8 +795,8 @@ function MaterialEditorGui::setMaterialNotDirty(%this) function MaterialEditorGui::setMaterialDirty(%this) { - %propertyText = ":: Material Editor - Properties *"; - %previewText = ":: Material Editor - 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 501c8f576..4c5b5bca4 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.gui @@ -71,7 +71,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorInspectorPlugin );"; EdgeSnap = "1"; - text = ":: Mesh Road Editor - Roads"; + text = ":: Mesh Road Editor - Roads"; new GuiContainer(MeshRoadEditorRoadsPanel){ profile = "ToolsGuiDefaultProfile"; @@ -267,7 +267,7 @@ $guiContent = new GuiMeshRoadEditorCtrl(MeshRoadEditorGui,EditorGuiGroup) { minSize = "50 50"; closeCommand = "EditorGui.setEditor( WorldEditorPlugin );"; EdgeSnap = "1"; - text = ":: Mesh Road Editor - Properties"; + text = ":: Mesh Road Editor - Properties"; new GuiContainer(MeshRoadNodesPanel){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui index b1ca56a32..276c1de42 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.gui @@ -67,7 +67,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Mission Area"; + text = ":: Mission Area"; new GuiContainer(MissionAreaEditorTerrainPanel){ profile = "ToolsGuiDefaultProfile"; @@ -234,7 +234,7 @@ $guiContent = new GuiMissionAreaEditorCtrl(MissionAreaEditorGui, EditorGuiGroup) canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Mission Area Editor - Properties"; + text = ":: Mission Area Editor - Properties"; new GuiContainer(MissionAreaEditorPropertiesPanel){ //Mission Area Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui index a512eb327..92505f4e7 100644 --- a/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui +++ b/Templates/BaseGame/game/tools/navEditor/NavEditorGui.gui @@ -66,7 +66,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Navigation Editor"; + text = ":: Navigation Editor"; new GuiButtonCtrl() { Profile = "ToolsGuiButtonProfile"; @@ -271,7 +271,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Navigation Editor - Properties"; + text = ":: Navigation Editor - Properties"; new GuiContainer(NavEditorOptionsPanel){ //Actions isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui index c0326cfaa..697265cd2 100644 --- a/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui +++ b/Templates/BaseGame/game/tools/particleEditor/ParticleEditor.ed.gui @@ -50,7 +50,7 @@ $guiContent = new GuiWindowCollapseCtrl(PE_Window) { minSize = "50 50"; closeCommand = ""; EdgeSnap = "0"; - text = ":: Particle Editor"; + text = ":: Particle Editor"; new GuiTabBookCtrl(PE_TabBook) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript index c000b5a18..de542e713 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; diff --git a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui index d042e253a..ece28dd38 100644 --- a/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui +++ b/Templates/BaseGame/game/tools/riverEditor/RiverEditorGui.gui @@ -71,7 +71,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: River Editor - Rivers"; + text = ":: River Editor - Rivers"; /* new GuiBitmapButtonCtrl() { @@ -316,7 +316,7 @@ $guiContent = new GuiRiverEditorCtrl(RiverEditorGui, EditorGuiGroup) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: River Editor - Properties"; + text = ":: River Editor - Properties"; new GuiContainer(RiverEditorOptionsPanel){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui index 437c96b03..bdb89f1b1 100644 --- a/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui +++ b/Templates/BaseGame/game/tools/roadEditor/RoadEditorGui.gui @@ -73,7 +73,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Decal Road Editor - Roads & Paths"; + text = ":: Decal Road Editor - Roads & Paths"; /* new GuiBitmapButtonCtrl() { @@ -317,7 +317,7 @@ $guiContent = new GuiRoadEditorCtrl(RoadEditorGui) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Decal Road Editor - Properties"; + text = ":: Decal Road Editor - Properties"; new GuiContainer(RoadEditorProperties){ //Node Properties isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui index c15d8f728..956861dc4 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui @@ -10,7 +10,7 @@ else //--- OBJECT WRITE BEGIN --- $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) { - text = ":: Shape Editor - Advanced Properties"; + text = ":: Shape Editor - Advanced Properties"; resizeWidth = "0"; resizeHeight = "0"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui index 26ef4f130..cdd11a566 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui @@ -27,7 +27,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Shape Editor - 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 660de806e..4597b8010 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui @@ -43,7 +43,7 @@ $guiContent = new GuiControl() { canMaximize = "0"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: Shape Editor - Select"; + text = ":: Shape Editor - Select"; new GuiTabBookCtrl(ShapeEditorTabbook) { internalName = "tabBook"; diff --git a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui index 04abab4b3..da0ce9d1c 100644 --- a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui +++ b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui @@ -15,7 +15,7 @@ $guiContent = new GuiControl(windowConsoleDlg) { canSaveDynamicFields = "0"; new GuiWindowCtrl(windowConsoleControl) { - text = ":: Console Log"; + text = ":: Console Log"; resizeWidth = "1"; resizeHeight = "1"; canMove = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorSettingsWindow.ed.gui index d20fc4053..2c70b59bc 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 79b6d63d8..2c4af66e8 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 41b7b0adf..394d7574d 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/ObjectSnapOptionsWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ObjectSnapOptionsWindow.ed.gui index bd227f193..f7fd83dca 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/TerrainPainterWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui index 60e66732c..efb84b76f 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/TerrainPainterWindow.ed.gui @@ -47,7 +47,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { minSize = "300 160"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = ":: Terrain Painter - Preview"; + text = ":: Terrain Painter - Preview"; new GuiContainer(EPainterPreviewCont){ Docking = "Client"; @@ -293,7 +293,7 @@ $guiContent = new GuiControl(TerrainPainterContainer,EditorGuiGroup) { minSize = "152 300"; closeCommand = "EPainter.parentGroup.setVisible(false);"; EdgeSnap = "1"; - text = ":: Terrain Painter - Selector"; + text = ":: Terrain Painter - Selector"; new GuiScrollCtrl( EPainterScroll ) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui index f1c7751b1..a3802607a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorInspectorWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { closeCommand = "EWInspectorWindow.setVisible(false);"; minSize = "50 50"; EdgeSnap = "1"; - text = ":: World Editor - Inspector"; + text = ":: World Editor - Inspector"; new GuiContainer(EWInspectorContainer) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui index 735b9b070..c9fe99bbe 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui @@ -44,7 +44,7 @@ $guiContent = new GuiControl() { minSize = "50 50"; closeCommand = "EWTreeWindow.setVisible(false);"; EdgeSnap = "1"; - text = ":: World Edior - Scene Tree"; + text = ":: World Edior - Scene Tree"; new GuiTabBookCtrl(EditorTreeTabBook) { canSaveDynamicFields = "0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainImportGui.gui index 5b964e925..60325f4a8 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"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui index 20cb5de9e..0fb57608a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui @@ -7,7 +7,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) { canSaveDynamicFields = "1"; new GuiWindowCtrl() { - text = ":: Terrain Materials Editor"; + text = ":: Terrain Materials Editor"; resizeWidth = "0"; canMinimize = "0"; canMaximize = "0"; 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 1a9d1307b..b772cdd8b 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript @@ -596,7 +596,7 @@ function TerrainPainterContainer::maxSize(%this, %window) %fixedWindow = EPainterPreview; %fluidWindow = EPainter; - %top = EditorGuiToolbar.extent.y + 6 - 7; + %top = EditorGuiToolbar.extent.y + 6 - 7 + 24; %bottom = %top + 65 - 6; %maxHeight = Canvas.extent.y - %top - %bottom; From 7031424214d6b33f873f88e54be66cc1aea5600f Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Thu, 12 Sep 2024 20:22:59 +0200 Subject: [PATCH 5/6] Undo changes to the default level Sorry that got snuck in there --- .../levels/DefaultEditorLevel.asset.taml | 2 -- .../game/tools/levels/DefaultEditorLevel.mis | 28 +++++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml index be3bc9b5b..9b3fe43b3 100644 --- a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml +++ b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.asset.taml @@ -2,7 +2,6 @@ AssetName="DefaultEditorLevel" LevelFile="@assetFile=DefaultEditorLevel.mis" LevelName="DefaultEditorLevel" - PostFXPresetFile="@assetFile=tools/levels/DefaultEditorLevel.postfxpreset.tscript" description="An empty room" previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image" previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image" @@ -12,5 +11,4 @@ previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image" previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image" staticObjectAssetDependency0="@asset=Prototyping:FloorGray" - staticObjectAssetDependency1="@asset=ExampleModule:NewTerrain1" VersionId="1"/> diff --git a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis index 82fc85844..466e48cc7 100644 --- a/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis +++ b/Templates/BaseGame/game/tools/levels/DefaultEditorLevel.mis @@ -1,20 +1,33 @@ //--- OBJECT WRITE BEGIN --- new Scene(EditorTemplateLevel) { - isEditing = "1"; - enabled = "1"; + canSave = "1"; + canSaveDynamicFields = "1"; + Enabled = "1"; new LevelInfo(theLevelInfo) { - FogColor = "0.6 0.6 0.7 1"; + nearClip = "0.1"; + visibleDistance = "1000"; + visibleGhostDistance = "0"; + decalBias = "0.0015"; + fogColor = "0.6 0.6 0.7 1"; + fogDensity = "0"; fogDensityOffset = "700"; + fogAtmosphereHeight = "0"; canvasClearColor = "0 0 0 255"; + ambientLightBlendPhase = "1"; + ambientLightBlendCurve = "0 0 -1 -1"; soundAmbience = "AudioAmbienceDefault"; - enabled = "1"; + soundDistanceModel = "Linear"; + canSave = "1"; + canSaveDynamicFields = "1"; + Enabled = "1"; }; new ScatterSky(DynamicSky) { sunScale = "0.991102 0.921582 0.83077 1"; zOffset = "-3000"; azimuth = "25"; brightness = "5"; + flareType = "LightFlareExample1"; MoonMatAsset = "Core_Rendering:moon_wglow"; useNightCubemap = "1"; nightCubemap = "nightCubemap"; @@ -31,19 +44,16 @@ new Scene(EditorTemplateLevel) { persistentId = "289ad401-3140-11ed-aae8-c0cb519281fc"; reflectionPath = "tools/levels/DefaultEditorLevel/probes/"; }; + new GroundPlane() { scaleU = "32"; scaleV = "32"; MaterialAsset = "Prototyping:FloorGray"; - enabled = "1"; + Enabled = "1"; position = "0 0 0"; rotation = "1 0 0 0"; scale = "1 1 1"; }; - new TerrainBlock(NewTerrain1) { - TerrainAsset = "ExampleModule:NewTerrain1"; - position = "-512 -412 -511"; - }; }; //--- OBJECT WRITE END --- From ce8a10ba0a880b14b88a29ce45114fc615fa26cb Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Thu, 12 Sep 2024 21:27:23 +0200 Subject: [PATCH 6/6] Correct Color Picker GUI text & text edit controls Some text was black on dark which is hard to read. Due to use of non-existing or incorrect profiles. Title is also updated to be visually in line with the rest of the world editor. --- .../game/tools/gui/colorPicker.ed.gui | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui b/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui index f390cf95e..56ced8850 100644 --- a/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui +++ b/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui @@ -19,7 +19,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { canSaveDynamicFields = "0"; new GuiWindowCtrl(GuiPickerDlg) { - text = "Color Picker"; + text = ":: Color Picker"; resizeWidth = "0"; resizeHeight = "0"; canMove = "1"; @@ -128,9 +128,9 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { }; new GuiTextCtrl() { text = "New"; - position = "306 22"; + position = "305 22"; extent = "26 14"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiTextProfile"; }; new GuiBitmapBorderCtrl(){ // new old color position = "292 37"; @@ -162,9 +162,9 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { }; new GuiTextCtrl() { text = "Old"; - position = "310 138"; + position = "307 137"; extent = "26 14"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiTextProfile"; }; new GuiBitmapBorderCtrl(){ // Color Text Fields position = "291 165"; @@ -185,7 +185,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { new GuiControl() { // rgb position = "4 0"; - extent = "52 75"; + extent = "52 80"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -209,7 +209,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "5 6"; + position = "1 6"; extent = "8 18"; minExtent = "8 2"; horizSizing = "right"; @@ -228,12 +228,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { }; new GuiTextEditCtrl(Channel_R_Val) { // Red Channal text = "0"; - maxLength = "4"; + maxLength = "6"; position = "14 6"; - extent = "34 18"; + extent = "34 28"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; class = "ColorPickerRGBClass"; tooltipProfile = "GuiToolTipProfile"; tooltip = "Red Channel color value."; @@ -247,7 +247,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "4 29"; + position = "0 29"; extent = "8 18"; minExtent = "8 2"; horizSizing = "right"; @@ -266,12 +266,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { }; new GuiTextEditCtrl(Channel_G_Val) { // Green Channal text = "0"; - maxLength = "4"; + maxLength = "6"; position = "14 29"; - extent = "34 18"; + extent = "34 28"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; class = "ColorPickerRGBClass"; tooltipProfile = "GuiToolTipProfile"; tooltip = "Green Channel color value."; @@ -285,7 +285,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "5 52"; + position = "1 52"; extent = "8 18"; minExtent = "8 2"; horizSizing = "right"; @@ -304,12 +304,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { }; new GuiTextEditCtrl(Channel_B_Val) { // Blue Channal text = "0"; - maxLength = "4"; + maxLength = "6"; position = "14 52"; - extent = "34 18"; + extent = "34 28"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; class = "ColorPickerRGBClass"; tooltipProfile = "GuiToolTipProfile"; tooltip = "Blue Channel color value."; @@ -341,7 +341,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "5 6"; + position = "1 6"; extent = "8 18"; minExtent = "8 2"; horizSizing = "right"; @@ -365,7 +365,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { extent = "34 18"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; class = "ColorPickerHSBClass"; tooltipProfile = "GuiToolTipProfile"; tooltip = "Hue Channel color value."; @@ -404,7 +404,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "4 29"; + position = "0 29"; extent = "8 18"; minExtent = "8 2"; horizSizing = "right"; @@ -428,7 +428,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { extent = "34 18"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; class = "ColorPickerHSBClass"; tooltipProfile = "GuiToolTipProfile"; tooltip = "Saturation Channel color value."; @@ -467,12 +467,12 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { anchorBottom = "0"; anchorLeft = "1"; anchorRight = "0"; - position = "5 52"; + position = "1 52"; extent = "8 18"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "ToolsGuiTextProfile"; + profile = "ToolsGuiTextProfile"; visible = "1"; active = "1"; Clickable = "1"; @@ -491,7 +491,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { extent = "34 18"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; class = "ColorPickerHSBClass"; tooltipProfile = "GuiToolTipProfile"; tooltip = "Brightness Channel color value. Aka value or lightness."; @@ -668,7 +668,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { extent = "34 18"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiTextEditProfileNumbersOnly"; + profile = "ToolsGuiTextEditProfile"; altCommand = "$ThisControl.getParent().updateFromChild($ThisControl); updateColorPickerAlpha( $ThisControl.getValue() );"; internalName = "TextEdit"; };