From 3a7f3beb64f282135d5455903ea94c5d006275e2 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 2 May 2024 21:01:16 -0500 Subject: [PATCH 01/22] play steering thread on server so mounted objects like turrets can be linked to it --- Engine/source/T3D/vehicles/wheeledVehicle.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.cpp b/Engine/source/T3D/vehicles/wheeledVehicle.cpp index 030582616..7771fb39d 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.cpp +++ b/Engine/source/T3D/vehicles/wheeledVehicle.cpp @@ -797,6 +797,13 @@ void WheeledVehicle::updateMove(const Move* move) // Set the tail brake light thread direction based on the brake state. if (mTailLightThread) mShapeInstance->setTimeScale(mTailLightThread, mBraking? 1.0f : -1.0f); + + // Update the steering animation: sequence time 0 is full right, + // and time 0.5 is straight ahead. + if (mSteeringThread) { + F32 t = (mSteering.x * mFabs(mSteering.x)) / mDataBlock->maxSteeringAngle; + mShapeInstance->setPos(mSteeringThread, 0.5 - t * 0.5); + } } From 39300b18a854786f3688f0370d234172bf8dce72 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 28 Aug 2024 10:33:12 -0500 Subject: [PATCH 02/22] fix misbehaving imposter display corrects display of imposters when pole capture is on --- .../core/rendering/shaders/gl/imposter.glsl | 27 ++++++++++--------- .../game/core/rendering/shaders/imposter.hlsl | 21 ++++++++------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl b/Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl index 20bc62688..8bd32e8ab 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl +++ b/Templates/BaseGame/game/core/rendering/shaders/gl/imposter.glsl @@ -22,7 +22,7 @@ #include "torque.glsl" - +#line 25 #define IMPOSTER_MAX_UVS 64 @@ -94,24 +94,22 @@ void imposter_v( // First check to see if we need to render the top billboard. int index; - /* - if ( includePoles && ( lookPitch < polarAngle || lookPitch > sPi - polarAngle ) ) + if ( includePoles && ( lookPitch < polarHalfStep || lookPitch > M_PI_F - polarHalfStep ) ) { - index = numEquatorSteps * 3; + index = numEquatorSteps * numPolarSteps; // When we render the top/bottom billboard we always use // a fixed vector that matches the rotation of the object. rightVec = vec3( 1, 0, 0 ) * sCornerRight[corner]; - upVec = vec3( 0, 1, 0 ) * sCornerUp[corner]; + upVec = vec3( 0, -1, 0 ) * sCornerUp[corner]; - if ( lookPitch > sPi - polarAngle ) + if ( lookPitch < polarHalfStep ) { upVec = -upVec; index++; } } else - */ { // Calculate the rotation around the z axis then add the // equator half step. This gets the images to switch a @@ -126,20 +124,23 @@ void imposter_v( // TODO: How can we do this without conditionals? // Normalize the result to 0 to 2PI. - if ( rotZ < 0.0 ) + if ( rotZ < 0 ) rotZ += M_2PI_F; - if ( rotZ > M_2PI_F ) + else if ( rotZ > M_2PI_F ) rotZ -= M_2PI_F; - if ( rotY < 0.0 ) + + if ( rotY < 0 ) rotY += M_2PI_F; - if ( rotY > M_PI_F ) // Not M_2PI_F? + else if ( rotY > M_2PI_F ) rotY -= M_2PI_F; - float polarIdx = round( abs( rotY ) / polarStepSize ); + int polarIdx = int(max(min(round( rotY / polarStepSize ), numPolarSteps-2),0)); // Get the index to the start of the right polar // images for this viewing angle. - int numPolarOffset = int( float( numEquatorSteps ) * polarIdx ); + int numPolarOffset = numEquatorSteps * polarIdx; + if (includePoles) + numPolarOffset = (numEquatorSteps+2) * polarIdx; // Calculate the final image index for lookup // of the texture coords. diff --git a/Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl b/Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl index bc700ba03..2373271aa 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/imposter.hlsl @@ -82,24 +82,22 @@ void imposter_v( // First check to see if we need to render the top billboard. int index; - /* - if ( includePoles && ( lookPitch < polarAngle || lookPitch > sPi - polarAngle ) ) + if ( includePoles && ( lookPitch < polarHalfStep || lookPitch > (M_PI_F - polarHalfStep) ) ) { - index = numEquatorSteps * 3; + index = numEquatorSteps * numPolarSteps; // When we render the top/bottom billboard we always use // a fixed vector that matches the rotation of the object. rightVec = float3( 1, 0, 0 ) * sCornerRight[corner]; - upVec = float3( 0, 1, 0 ) * sCornerUp[corner]; + upVec = float3( 0, -1, 0 ) * sCornerUp[corner]; - if ( lookPitch > sPi - polarAngle ) + if ( lookPitch < polarHalfStep ) { upVec = -upVec; index++; } } else - */ { // Calculate the rotation around the z axis then add the // equator half step. This gets the images to switch a @@ -116,19 +114,22 @@ void imposter_v( // Normalize the result to 0 to 2PI. if ( rotZ < 0 ) rotZ += M_2PI_F; - if ( rotZ > M_2PI_F ) + else if ( rotZ > M_2PI_F ) rotZ -= M_2PI_F; + if ( rotY < 0 ) rotY += M_2PI_F; - if ( rotY > M_PI_F ) // Not M_2PI_F? + else if ( rotY > M_2PI_F ) rotY -= M_2PI_F; - float polarIdx = round( abs( rotY ) / polarStepSize ); + int polarIdx = max(min(round( rotY / polarStepSize ), numPolarSteps-2),0); // Get the index to the start of the right polar // images for this viewing angle. int numPolarOffset = numEquatorSteps * polarIdx; - + if (includePoles) + numPolarOffset = (numEquatorSteps+2) * polarIdx; + // Calculate the final image index for lookup // of the texture coords. index = ( rotZ / equatorStepSize ) + numPolarOffset; From 24a1636edd1e11afe7040c87250b74c9cb1f3819 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 28 Aug 2024 17:14:42 -0500 Subject: [PATCH 03/22] correct malformed error reporting --- Engine/source/console/torquescript/cmdgram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/console/torquescript/cmdgram.cpp b/Engine/source/console/torquescript/cmdgram.cpp index 8b7d536c6..d6d877da2 100644 --- a/Engine/source/console/torquescript/cmdgram.cpp +++ b/Engine/source/console/torquescript/cmdgram.cpp @@ -3363,7 +3363,7 @@ yyreport_syntax_error (const yypcontext_t *ctx) output += String::ToString("%5s | %*s", "", loc->first_column, "^"); } - yyerror(output.c_str()); + yyerror("%s",output.c_str()); return ret; } From 30dcf0bf78a2b00b2bf63d4e959ba4d99b4fbd7f Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 28 Aug 2024 17:22:44 -0500 Subject: [PATCH 04/22] (backup) correct malformed error reporting --- Engine/source/console/torquescript/CMDgram.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/console/torquescript/CMDgram.y b/Engine/source/console/torquescript/CMDgram.y index 1e118ae1b..9e1b30543 100644 --- a/Engine/source/console/torquescript/CMDgram.y +++ b/Engine/source/console/torquescript/CMDgram.y @@ -656,7 +656,7 @@ yyreport_syntax_error (const yypcontext_t *ctx) output += String::ToString("%5s | %*s", "", loc->first_column, "^"); } - yyerror(output.c_str()); + yyerror("%s", output.c_str()); return ret; } From 9da7823074ac1a8dc474c295150c6af25848994c Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 29 Aug 2024 19:17:24 -0500 Subject: [PATCH 05/22] clean up surface property visualizer stateblock cleanups, and kill off stray glowbuffer leftovers --- .../scripts/visibility/miscViz.tscript | 37 +++---------------- .../shaders/Viz_SurfacePropertiesP.glsl | 3 -- .../shaders/Viz_SurfacePropertiesP.hlsl | 3 -- 3 files changed, 5 insertions(+), 38 deletions(-) diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript index 8f5c6bd52..ecc3e4283 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/miscViz.tscript @@ -1,31 +1,9 @@ singleton GFXStateBlockData( Viz_DefaultVisualizeState ) { - /*alphaDefined = true; - alphaTestEnable = true; - alphaTestRef = 1; - alphaTestFunc = GFXCmpGreaterEqual; - - // Do a one to one blend. - blendDefined = true; - blendEnable = true; + blendDefined = false; + blendEnable = false; blendSrc = GFXBlendOne; - blendDest = GFXBlendOne; - - zDefined = true; - zEnable = false; - zWriteEnable = false; - - samplersDefined = true; - samplerStates[0] = SamplerClampPoint; - samplerStates[1] = SamplerClampPoint; - samplerStates[2] = SamplerClampPoint; - samplerStates[3] = SamplerClampPoint; - samplerStates[4] = SamplerClampLinear; - samplerStates[5] = SamplerClampLinear;*/ - blendDefined = true; - blendEnable = true; - blendSrc = GFXBlendSrcAlpha; - blendDest = GFXBlendInvSrcAlpha; + blendDest = GFXBlendZero; zDefined = true; zEnable = false; @@ -36,7 +14,6 @@ singleton GFXStateBlockData( Viz_DefaultVisualizeState ) samplerStates[1] = SamplerClampPoint; samplerStates[2] = SamplerClampPoint; samplerStates[3] = SamplerClampLinear; // depthviz - samplerStates[4] = SamplerClampLinear; // depthviz }; singleton shaderData( Viz_TexelDensity ) @@ -92,7 +69,6 @@ singleton shaderData( Viz_SurfaceProperties ) samplerNames[2] = "$matInfoBuffer"; samplerNames[3] = "$ssaoMaskTex"; samplerNames[4] = "$backbufferTex"; - samplerNames[5] = "$glowBuffer"; pixVersion = 2.0; }; @@ -106,7 +82,6 @@ singleton PostEffect( Viz_SurfacePropertiesPFX ) texture[2] = "#matinfo"; texture[3] = "#ssaoMask"; texture[4] = "$backBuffer"; - texture[5] = "#glowbuffer"; target = "$backBuffer"; renderPriority = 9999; @@ -186,8 +161,6 @@ function toggleSurfacePropertiesViz( %mode ) $Viz_SurfacePropertiesModeVar = "12"; case "Backbuffer": $Viz_SurfacePropertiesModeVar = "13"; - case "Glow": - $Viz_SurfacePropertiesModeVar = "14"; default: $Viz_SurfacePropertiesModeVar = "-1"; } @@ -269,8 +242,8 @@ singleton PostEffect( Viz_ColorBlindnessPFX ) { isEnabled = false; allowReflectPass = false; - renderTime = "PFXAfterBin"; - renderBin = "GlowBin"; + renderTime = "PFXBeforeBin"; + renderBin = "EditorBin"; shader = Viz_ColorBlindness; stateBlock = PFX_DefaultStateBlock; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.glsl b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.glsl index 4d541f05e..016651428 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.glsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.glsl @@ -32,7 +32,6 @@ uniform sampler2D colorBuffer; uniform sampler2D matInfoBuffer; uniform sampler2D ssaoMaskTex; uniform sampler2D backbufferTex; -uniform sampler2D glowBuffer; uniform float mode; uniform vec3 eyePosWorld; @@ -78,6 +77,4 @@ void main() OUT_col = vec4(texture( ssaoMaskTex, IN_uv0 ).rgb, 1.0); else if(mode == 13) OUT_col = vec4(texture( backbufferTex, IN_uv0 ).rgb, 1.0); - else if(mode == 14) - OUT_col = vec4(texture( glowBuffer, IN_uv0 ).rgb, 1.0); } diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.hlsl b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.hlsl index 519de284e..7494db023 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.hlsl +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/visibility/shaders/Viz_SurfacePropertiesP.hlsl @@ -30,7 +30,6 @@ TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 1); TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 2); TORQUE_UNIFORM_SAMPLER2D(ssaoMaskTex, 3); TORQUE_UNIFORM_SAMPLER2D(backbufferTex, 4); -TORQUE_UNIFORM_SAMPLER2D(glowBuffer, 5); uniform float mode; uniform float4x4 cameraToWorld; @@ -76,8 +75,6 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 float4(TORQUE_TEX2D( ssaoMaskTex, IN.uv0 ).rgb, 1.0); else if(mode == 13) float4(TORQUE_TEX2D( backbufferTex, IN.uv0 ).rgb, 1.0); - else if(mode == 14) - float4(TORQUE_TEX2D( glowBuffer, IN.uv0 ).rgb, 1.0); return float4(0,0,0,1); } From 03efedab37959714b93e2ec544d72973ee261af8 Mon Sep 17 00:00:00 2001 From: Areloch Date: Sun, 1 Sep 2024 16:55:58 -0500 Subject: [PATCH 06/22] Adds a TORQUE_TOOLS_EXT cmake flag/preprocessor and moves the systemCommand method into that so that one can lock down full shell command execution calls without dropping tools support --- Engine/source/console/consoleFunctions.cpp | 4 +++- Tools/CMake/modules/tools.cmake | 3 +++ Tools/CMake/torque_configs.cmake | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Engine/source/console/consoleFunctions.cpp b/Engine/source/console/consoleFunctions.cpp index 0e002fb11..cff1d87b2 100644 --- a/Engine/source/console/consoleFunctions.cpp +++ b/Engine/source/console/consoleFunctions.cpp @@ -2803,7 +2803,7 @@ DefineEngineFunction(getTimestamp, const char*, (), , return returnBuffer; } -#ifdef TORQUE_TOOLS +#ifdef TORQUE_TOOLS_EXT_COMMANDS DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const char* callBackFunction), (""), "") { if (commandLineAction && commandLineAction[0] != '\0') @@ -2819,7 +2819,9 @@ DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const c return -1; } +#endif +#ifdef TORQUE_TOOLS const char* getDocsLink(const char* filename, U32 lineNumber) { Vector fileStringSplit; diff --git a/Tools/CMake/modules/tools.cmake b/Tools/CMake/modules/tools.cmake index 62cad2f3b..dcd3b3d53 100644 --- a/Tools/CMake/modules/tools.cmake +++ b/Tools/CMake/modules/tools.cmake @@ -16,3 +16,6 @@ if(TORQUE_TOOLS) source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/environment/editors/" PREFIX "Modules/TOOLS/environment" FILES ${TORQUE_TOOLS_SOURCES2}) source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/forest/editor/" PREFIX "Modules/TOOLS/forest" FILES ${TORQUE_TOOLS_SOURCES3}) endif(TORQUE_TOOLS) +if(TORQUE_TOOLS_EXT_COMMANDS) + set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TOOLS_EXT_COMMANDS) +endif(TORQUE_TOOLS_EXT_COMMANDS) \ No newline at end of file diff --git a/Tools/CMake/torque_configs.cmake b/Tools/CMake/torque_configs.cmake index 7cfbd2f6b..739a7b28b 100644 --- a/Tools/CMake/torque_configs.cmake +++ b/Tools/CMake/torque_configs.cmake @@ -71,6 +71,7 @@ advanced_option(TORQUE_DEBUG_NET "debug network" OFF) advanced_option(TORQUE_DEBUG_NET_MOVES "debug network moves" OFF) advanced_option(TORQUE_ENABLE_ASSERTS "enables or disable asserts" OFF) advanced_option(TORQUE_TOOLS "Enable or disable the tools" ON) +advanced_option(TORQUE_TOOLS_EXT_COMMANDS "Enable or disable some extended functionality like shell commands or free write access" OFF) advanced_option(TORQUE_ENABLE_PROFILER "Enable or disable the profiler" OFF) advanced_option(TORQUE_SHOW_LEGACY_FILE_FIELDS "If on, shows legacy direct file path fields in the inspector." OFF) From b0a11d79d58e29524730e65db38e4b29bece2308 Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Tue, 10 Sep 2024 13:20:11 +0200 Subject: [PATCH 07/22] 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 08/22] 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 09/22] 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 10/22] 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 11/22] 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 12/22] 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"; }; From 491f2e8bac653622dfc80aedbec31e2bd40ed94c Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Fri, 13 Sep 2024 20:14:43 +0200 Subject: [PATCH 13/22] Sanitize the window resizing scripts Instead of magic numbers using a variable with comment so it's clear what is does. --- .../game/tools/VPathEditor/Scripts/GuiScript.tscript | 5 +++-- .../BaseGame/game/tools/convexEditor/convexEditorGui.tscript | 5 +++-- .../game/tools/datablockEditor/datablockEditor.tscript | 5 +++-- .../BaseGame/game/tools/decalEditor/decalEditorGui.tscript | 5 +++-- .../BaseGame/game/tools/forestEditor/forestEditorGui.tscript | 5 +++-- .../tools/materialEditor/scripts/materialEditor.ed.tscript | 5 +++-- .../game/tools/meshRoadEditor/meshRoadEditorGui.tscript | 5 +++-- .../tools/missionAreaEditor/missionAreaEditorGui.ed.tscript | 5 +++-- Templates/BaseGame/game/tools/navEditor/navEditor.tscript | 5 +++-- .../game/tools/particleEditor/particleEditor.ed.tscript | 5 +++-- .../BaseGame/game/tools/riverEditor/riverEditorGui.tscript | 5 +++-- .../BaseGame/game/tools/roadEditor/roadEditorGui.tscript | 5 +++-- .../game/tools/worldEditor/scripts/EditorGui.ed.tscript | 5 +++-- .../worldEditor/scripts/editors/terrainEditor.ed.tscript | 5 +++-- 14 files changed, 42 insertions(+), 28 deletions(-) diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript b/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript index 9206acf58..1897c7774 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript @@ -31,8 +31,9 @@ function EVPathEditor::maxSize(%this, %window) %fixedWindow = VPathEditorTreeWindow; %fluidWindow = VPathEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript index 006e03ea6..9e845a311 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript @@ -276,8 +276,9 @@ function ConvexEditorGui::maxSize(%this, %window) %this.resizing = false; %fluidWindow = ConvexEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %position = Canvas.extent.x - %fluidWindow.extent.x SPC %top; %extent = %window.extent.x SPC Canvas.extent.y - %bottom; diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript index 0bd07cfdc..2633e0dc4 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript +++ b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript @@ -824,8 +824,9 @@ function DatablockEditorGui::maxSize(%this, %window) %fixedWindow = DatablockEditorTreeWindow; %fluidWindow = DatablockEditorInspectorWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript index d31f2afb9..8da862041 100644 --- a/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript +++ b/Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript @@ -54,8 +54,9 @@ function DecalEditorGui::maxSize(%this, %window) %fixedWindow = DecalEditorWindow; %fluidWindow = DecalPreviewWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript index 03620d7bc..4e1feb1a4 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript @@ -56,8 +56,9 @@ function ForestEditorGui::maxSize(%this, %window) %fixedWindow = ForestEditorPalleteWindow; %fluidWindow = ForestEditorPropertiesWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index aa5804b1f..1f2d4fdf6 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -284,8 +284,9 @@ function MaterialEditorGui::maxSize(%this, %window) %fixedWindow = MaterialEditorPreviewWindow; %fluidWindow = MaterialEditorPropertiesWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript index fcc1888c4..7deb72414 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript @@ -43,8 +43,9 @@ function MeshRoadEditorGui::maxSize(%this, %window) %fixedWindow = MeshRoadEditorTreeWindow; %fluidWindow = MeshRoadEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript index 0de382c0f..126e8dae3 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript @@ -54,8 +54,9 @@ function MissionAreaEditorGui::maxSize(%this, %window) %fixedWindow = MissionAreaEditorTerrainWindow; %fluidWindow = MissionAreaEditorPropertiesWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript index f011bbecf..8e2234646 100644 --- a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript +++ b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript @@ -69,8 +69,9 @@ function NavEditorGui::maxSize(%this, %window) %fixedWindow = NavEditorTreeWindow; %fluidWindow = NavEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript index de542e713..f3f6cbab3 100644 --- a/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript @@ -276,8 +276,9 @@ function ParticleEditor::maxSize(%this, %window) // prevent onResize after a resize %this.resizing = false; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript index 29afdaa4d..e0093acd1 100644 --- a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript +++ b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript @@ -60,8 +60,9 @@ function RiverEditorGui::maxSize(%this, %window) %fixedWindow = RiverEditorTreeWindow; %fluidWindow = RiverEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript index fd41ab1b2..790a0fa8b 100644 --- a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript @@ -73,8 +73,9 @@ function RoadEditorGui::maxSize(%this, %window) %fixedWindow = RoadEditorTreeWindow; %fluidWindow = RoadEditorOptionsWindow; - %top = EditorGuiToolbar.extent.y + 6 - 7; - %bottom = %top + 65 - 6; + %offset = -1; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index 9a8fe9716..0c20f21fe 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -1616,8 +1616,9 @@ function EWorldEditor::maxSize(%this, %window) %fixedWindow = EWTreeWindow; %fluidWindow = EWInspectorWindow; - %top = EditorGuiToolbar.extent.y + 6 + 19; - %bottom = %top + 65 - 6; + %offset = 25; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom + 12; // --- Fixed window (top) ------------------------------------------------ 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 b772cdd8b..0a4b4c991 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript @@ -596,8 +596,9 @@ function TerrainPainterContainer::maxSize(%this, %window) %fixedWindow = EPainterPreview; %fluidWindow = EPainter; - %top = EditorGuiToolbar.extent.y + 6 - 7 + 24; - %bottom = %top + 65 - 6; + %offset = 23; // tweak the vertical offset so that it aligns neatly + %top = EditorGuiToolbar.extent.y + %offset; + %bottom = %top + 59; %maxHeight = Canvas.extent.y - %top - %bottom; // --- Fixed window (top) ------------------------------------------------ From afeb9576019b4f3889e28042873485d9f04225e6 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 16 Sep 2024 12:40:18 -0500 Subject: [PATCH 14/22] fix malformed GBitmap::getColor --- Engine/source/gfx/bitmap/gBitmap.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Engine/source/gfx/bitmap/gBitmap.cpp b/Engine/source/gfx/bitmap/gBitmap.cpp index b0b205aa1..4c85537ad 100644 --- a/Engine/source/gfx/bitmap/gBitmap.cpp +++ b/Engine/source/gfx/bitmap/gBitmap.cpp @@ -779,6 +779,7 @@ bool GBitmap::getColor(const U32 x, const U32 y, ColorI& rColor) const break; case GFXFormatL16: rColor.set(U8(U16((pLoc[0] << 8) + pLoc[1])), 0, 0, 0); + break; case GFXFormatR8G8B8: case GFXFormatR8G8B8X8: rColor.set( pLoc[0], pLoc[1], pLoc[2], 255 ); From ead06b845e682e6f3ac85e57f10561947c79c76f Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 16 Sep 2024 13:24:41 -0500 Subject: [PATCH 15/22] colorpicker cleanups largely focuses on removing extraneous code and mangled math --- Engine/source/gui/controls/guiColorPicker.cpp | 79 ++++--------------- .../game/tools/gui/colorPicker.ed.gui | 14 ++-- 2 files changed, 22 insertions(+), 71 deletions(-) diff --git a/Engine/source/gui/controls/guiColorPicker.cpp b/Engine/source/gui/controls/guiColorPicker.cpp index bed80df84..09e47a97e 100644 --- a/Engine/source/gui/controls/guiColorPicker.cpp +++ b/Engine/source/gui/controls/guiColorPicker.cpp @@ -272,18 +272,18 @@ void GuiColorPickerCtrl::drawSelector(RectI &bounds, Point2I &selectorPos, Selec { case sVertical: // Now draw the vertical selector Up -> Pos - if (selectorPos.y != bounds.point.y+1) + if (selectorPos.y > bounds.point.y) GFX->getDrawUtil()->drawLine(selectorPos.x, bounds.point.y, selectorPos.x, selectorPos.y-sMax-1, color); // Down -> Pos - if (selectorPos.y != bounds.point.y+bounds.extent.y) + if (selectorPos.y < bounds.point.y + bounds.extent.y) GFX->getDrawUtil()->drawLine(selectorPos.x, selectorPos.y + sMax, selectorPos.x, bounds.point.y + bounds.extent.y, color); break; case sHorizontal: // Now draw the horizontal selector Left -> Pos - if (selectorPos.x != bounds.point.x) + if (selectorPos.x > bounds.point.x) GFX->getDrawUtil()->drawLine(bounds.point.x, selectorPos.y-1, selectorPos.x-sMax, selectorPos.y-1, color); // Right -> Pos - if (selectorPos.x != bounds.point.x) + if (selectorPos.x < bounds.point.x + bounds.extent.x) GFX->getDrawUtil()->drawLine(bounds.point.x+mSelectorPos.x+sMax, selectorPos.y-1, bounds.point.x + bounds.extent.x, selectorPos.y-1, color); break; } @@ -388,13 +388,11 @@ void GuiColorPickerCtrl::onRender(Point2I offset, const RectI& updateRect) { Point2I resolution = getRoot()->getExtent(); - U32 buf_x = offset.x + mSelectorPos.x + 1; - U32 buf_y = resolution.y - (extent.y - (offset.y + mSelectorPos.y + 1)); + U32 buf_x = offset.x + mSelectorPos.x; + U32 buf_y = resolution.y - (extent.y - (offset.y + mSelectorPos.y)); GFXTexHandle bb(resolution.x, resolution.y, GFXFormatR8G8B8A8_SRGB, &GFXRenderTargetSRGBProfile, avar("%s() - bb (line %d)", __FUNCTION__, __LINE__)); - Point2I tmpPt(buf_x, buf_y); - GFXTarget *targ = GFX->getActiveRenderTarget(); targ->resolveTo(bb); @@ -458,19 +456,7 @@ void GuiColorPickerCtrl::setSelectorPos(const LinearColorF & color) Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I& offset, const Point2I& resolution, GBitmap& bmp) { - RectI rect; Point2I ext = getExtent(); - if (mDisplayMode != pDropperBackground) - { - ext.x -= 3; - ext.y -= 2; - rect = RectI(Point2I(1, 1), ext); - } - else - { - rect = RectI(Point2I(0, 0), ext); - } - Point2I closestPos(-1, -1); /* Debugging @@ -498,12 +484,12 @@ Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I& F32 closestVal(10000.0f); bool closestSet = false; - for (S32 x = rect.point.x; x <= rect.extent.x; x++) + for (S32 x = 0; x < ext.x; x++) { - for (S32 y = rect.point.y; y <= rect.extent.y; y++) + for (S32 y = 0; y < ext.y; y++) { - buf_x = offset.x + x + 1; - buf_y = (resolution.y - (offset.y + y + 1)); + buf_x = offset.x + x; + buf_y = (resolution.y - (offset.y + y)); buf_y = resolution.y - buf_y; //Get the color at that position @@ -532,46 +518,11 @@ Point2I GuiColorPickerCtrl::findColor(const LinearColorF & color, const Point2I& void GuiColorPickerCtrl::setSelectorPos(const Point2I &pos) { - Point2I extent = getExtent(); - RectI rect; - if (mDisplayMode != pDropperBackground) - { - extent.x -= 3; - extent.y -= 2; - rect = RectI(Point2I(1,1), extent); - } - else - { - rect = RectI(Point2I(0,0), extent); - } - - if (rect.pointInRect(pos)) - { - mSelectorPos = pos; - mPositionChanged = true; - // We now need to update - setUpdate(); - } - - else - { - if ((pos.x > rect.point.x) && (pos.x < (rect.point.x + rect.extent.x))) - mSelectorPos.x = pos.x; - else if (pos.x <= rect.point.x) - mSelectorPos.x = rect.point.x; - else if (pos.x >= (rect.point.x + rect.extent.x)) - mSelectorPos.x = rect.point.x + rect.extent.x - 1; - - if ((pos.y > rect.point.y) && (pos.y < (rect.point.y + rect.extent.y))) - mSelectorPos.y = pos.y; - else if (pos.y <= rect.point.y) - mSelectorPos.y = rect.point.y; - else if (pos.y >= (rect.point.y + rect.extent.y)) - mSelectorPos.y = rect.point.y + rect.extent.y - 1; - - mPositionChanged = true; - setUpdate(); - } + Point2I ext = getExtent(); + mSelectorPos.x = mClamp(pos.x, 1, ext.x - 1); + mSelectorPos.y = mClamp(pos.y, 1, ext.y - 1); + mPositionChanged = true; + setUpdate(); } void GuiColorPickerCtrl::onMouseDown(const GuiEvent &event) diff --git a/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui b/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui index 56ced8850..d99ce01eb 100644 --- a/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui +++ b/Templates/BaseGame/game/tools/gui/colorPicker.ed.gui @@ -45,8 +45,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { canSaveDynamicFields = "0"; new GuiBitmapBorderCtrl(){ // color blend - position = "3 24"; - extent = "255 258"; + position = "3 25"; + extent = "260 260"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -67,8 +67,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { selectorGap = "1"; displayMode = "BlendColor"; actionOnMove = "1"; - position = "1 0"; - extent = "255 258"; + position = "1 1"; + extent = "255 255"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -86,8 +86,8 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { }; }; new GuiBitmapBorderCtrl(){ // Hue - position = "263 23"; - extent = "25 261"; + position = "265 25"; + extent = "25 260"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; @@ -109,7 +109,7 @@ $guiContent = new GuiColorPickerCtrl(ColorPickerDlg,EditorGuiGroup) { displayMode = "VertColor"; actionOnMove = "1"; position = "1 1"; - extent = "21 257"; + extent = "20 255"; minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; From 0612d8508d2562c547f71fa6721d3787d0523eff Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 16 Sep 2024 13:52:11 -0500 Subject: [PATCH 16/22] preserve gridsnap state between runs --- .../game/tools/worldEditor/scripts/EditorGui.ed.tscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index 0c20f21fe..f30b64f12 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -2488,7 +2488,8 @@ function EWorldEditor::syncGui( %this ) ESnapOptions-->SnapSize.setText( EWorldEditor.getSoftSnapSize() ); ESnapOptions-->GridSize.setText( EWorldEditor.getGridSize() ); - ESnapOptions-->GridSnapButton.setStateOn( %this.getGridSnap() ); + %this.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap"); + ESnapOptions-->GridSnapButton.setStateOn( %this.UseGridSnap ); %this.UseGroupCenter = EditorSettings.value("WorldEditor/Tools/UseGroupCenter"); @@ -2762,7 +2763,9 @@ function toggleSnappingOptions( %var ) } else if( %var $= "grid" ) { - EWorldEditor.setGridSnap( !EWorldEditor.getGridSnap() ); + EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap; + EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap ); + EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap ); } else if( %var $= "byGroup" ) { From 3fe21e88087a41a19e663b2a85ae680b31d9f8db Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 22 Sep 2024 05:55:38 -0500 Subject: [PATCH 17/22] typofix --- .../game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui index c9fe99bbe..3155b7dda 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 Editor - Scene Tree"; new GuiTabBookCtrl(EditorTreeTabBook) { canSaveDynamicFields = "0"; From 0291b000e01d64ea23ec67f328faa925b3120a06 Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Sun, 22 Sep 2024 19:36:48 +0200 Subject: [PATCH 18/22] Remove tabs from asset broser and win. console Remove the tabs from the asset browser and windowed console. There were some issues and asset browser will be changed soon. Downside is that the windowed console and asset browser will now open on top of each other. --- .../tools/assetBrowser/guis/assetBrowser.gui | 84 ------------------- .../assetBrowser/scripts/assetBrowser.tscript | 36 -------- .../windowConsole/guis/window_console.gui | 84 ------------------- .../scripts/window_console.tscript | 35 -------- 4 files changed, 239 deletions(-) diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui index e75c2e1c4..963091338 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui @@ -1180,90 +1180,6 @@ $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 = ""; diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index 861ae04af..083d0f2d9 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -92,42 +92,6 @@ function AssetBrowser::onDialogPop(%this) 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(); } diff --git a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui index da0ce9d1c..db00a861e 100644 --- a/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui +++ b/Templates/BaseGame/game/tools/windowConsole/guis/window_console.gui @@ -304,90 +304,6 @@ $guiContent = new GuiControl(windowConsoleDlg) { 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 = ""; diff --git a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript index 26686e8cd..626b7de11 100644 --- a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript +++ b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript @@ -105,41 +105,6 @@ 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()"); - } - } } //----------------------------------------------------------------------------- From 7664b63071e635eb2ef65c166e4dd90ba5d24658 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 22 Sep 2024 14:34:07 -0500 Subject: [PATCH 19/22] snap syncing for world and convex shape editors --- .../worldEditor/guiConvexShapeEditorCtrl.cpp | 19 +++++++++++++------ .../worldEditor/guiConvexShapeEditorCtrl.h | 2 ++ .../convexEditor/convexEditorGui.tscript | 12 +++++++++++- .../convexEditor/convexEditorToolbar.ed.gui | 2 +- .../game/tools/convexEditor/main.tscript | 4 ++++ .../worldEditor/scripts/EditorGui.ed.tscript | 4 ++++ 6 files changed, 35 insertions(+), 8 deletions(-) diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp index c37aff66b..9c1a83d87 100644 --- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp +++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp @@ -3043,16 +3043,23 @@ DefineEngineMethod(GuiConvexEditorCtrl, getSelectedFaceZRot, float, (), , } DefineEngineMethod(GuiConvexEditorCtrl, toggleGridSnapping, void, (),, - "@brief Mount objB to this object at the desired slot with optional transform.\n\n" - - "@param objB Object to mount onto us\n" - "@param slot Mount slot ID\n" - "@param txfm (optional) mount offset transform\n" - "@return true if successful, false if failed (objB is not valid)") + "@brief toggle grid snapping state.\n\n") { object->toggleGridSnapping(); } +DefineEngineMethod(GuiConvexEditorCtrl, setGridSnap, void, (bool snap), , + "@brief set grid snapping state.\n\n") +{ + object->setGridSnap(snap); +} + +DefineEngineMethod(GuiConvexEditorCtrl, getGridSnap, bool, (), , + "@brief set grid snapping state.\n\n") +{ + return object->getGridSnap(); +} + DefineEngineMethod(GuiConvexEditorCtrl, setGridSnapSize, void, (float gridSize), (1.0), "@brief Mount objB to this object at the desired slot with optional transform.\n\n" diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h index 3a6c99577..f7925c8ee 100644 --- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h +++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h @@ -130,6 +130,8 @@ public: void setSelectedFaceVertFlip(bool flipped); void setSelectedFaceZRot(float degrees); void toggleGridSnapping(); + bool getGridSnap() { return mGridSnap; }; + void setGridSnap(bool snap) { mGridSnap = snap; }; void setGridSnapSize(float gridSize); void updateShape(); diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript index 9e845a311..72b3b13a8 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript @@ -59,6 +59,11 @@ function ConvexEditorGui::onWake( %this ) %this.resizing = false; %this.releaseSidePanel(); } + + EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap"); + CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap ); + %this.setGridSnap( EWorldEditor.UseGridSnap ); + EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap ); } function ConvexEditorGui::onSleep( %this ) @@ -212,9 +217,14 @@ function ConvexEditorMaterialResetBtn::onClick(%this) function ConvexEditorGui::toggleGridSnap(%this) { - %this.toggleGridSnapping(); + EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap; + EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap ); + CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap ); + %this.setGridSnap( EWorldEditor.UseGridSnap ); + EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap ); } + function ConvexEditorGridSnapSizeFld::onReturn(%this) { ConvexEditorGui.setGridSnapSize(%this.getText()); diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui index e19f4c661..ed4517d50 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui @@ -110,7 +110,7 @@ $guiContent = new GuiControl(convexEditorToolbar, EditorGuiGroup) { MinExtent = "1 1"; bitmapAsset = "ToolsModule:separator_h_image"; }; - new GuiContainer() { + new GuiContainer(CESnapOptions) { canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; diff --git a/Templates/BaseGame/game/tools/convexEditor/main.tscript b/Templates/BaseGame/game/tools/convexEditor/main.tscript index 86e09c7f6..097c07d04 100644 --- a/Templates/BaseGame/game/tools/convexEditor/main.tscript +++ b/Templates/BaseGame/game/tools/convexEditor/main.tscript @@ -130,6 +130,10 @@ function ConvexEditorPlugin::onActivated( %this ) ConvexEditorScaleModeBtn.performClick(); } + EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap"); + CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap ); + %this.setGridSnap( EWorldEditor.UseGridSnap ); + Parent::onActivated( %this ); } diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index f30b64f12..b6654c34a 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -1019,6 +1019,10 @@ function WorldEditorPlugin::onActivated( %this ) ETransformSelection.setVisible(true); } + EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap"); + ESnapOptions-->GridSnapButton.setStateOn( EWorldEditor.UseGridSnap ); + SnapToBar-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap ); + Parent::onActivated(%this); } From 8461b9dbfda5b4de3f2bdc109aab8aa7042b4c27 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 23 Sep 2024 08:59:36 -0500 Subject: [PATCH 20/22] asset browser spam kill don't report populating preview images if the count is 0 also, remmber to cancel a pending scheduled method if you're rescheduling it --- .../tools/assetBrowser/scripts/assetBrowser.tscript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index 083d0f2d9..2575fb772 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -663,7 +663,9 @@ function AssetBrowser::doRefresh(%this) function AssetBrowser::populatePreviewImages(%this) { - echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count()); + if (AssetPreviewArray.count()>0) + echo("AssetBrowser::populatePreviewImages() - Previews to generate: " @ AssetPreviewArray.count()); + for(%i=0; %i < AssetPreviewArray.count(); %i++) { %previewButton = AssetPreviewArray.getKey(%i); @@ -1490,7 +1492,8 @@ function AssetBrowser::rebuildAssetArray(%this) if(!%this.previewArrayDirty) { %this.previewArrayDirty = true; - %this.schedule(16, "doRebuildAssetArray"); + cancel(%this.pendingRebuild); + %this.pendingRebuild = %this.schedule(16, "doRebuildAssetArray"); } } @@ -2863,6 +2866,5 @@ function AssetBrowserWindow::onResize(%this, %posX, %posY, %width, %height) AssetBrowser-->assetList.fillRowFirst = true; else AssetBrowser-->assetList.fillRowFirst = false; - - AssetBrowser.doRebuildAssetArray(); + AssetBrowser.rebuildAssetArray(); } \ No newline at end of file From 02b86eafee1f3f4fce975c861638c8702c0527d0 Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Tue, 24 Sep 2024 20:52:41 +0200 Subject: [PATCH 21/22] Windowed Console button close / open / resize - Close the windowed console when it's opened and the button is hit. - Resize/reposition the window after reopening. - Add a button to the GUI editor. --- .../game/tools/guiEditor/gui/guiEditor.ed.gui | 33 +++++++++++++++++-- .../scripts/window_console.tscript | 19 +++++++++-- .../worldEditor/scripts/EditorGui.ed.tscript | 18 ++++++++-- .../scripts/editors/terrainEditor.ed.tscript | 2 +- 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui index 960e20504..bb7f0c450 100644 --- a/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui +++ b/Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui @@ -233,8 +233,37 @@ $guiContent = new GuiControl(GuiEditorGui, EditorGuiGroup) { internalName = "AssetBrowserBtn"; canSave = "1"; canSaveDynamicFields = "0"; - }; - + }; + new GuiIconButtonCtrl() { + buttonMargin = "0 0"; + bitmapAsset = "ToolsModule:console_n_image"; + iconLocation = "Left"; + sizeIconToButton = "0"; + makeIconSquare = "0"; + textLocation = "Center"; + textMargin = "0"; + autoSize = "0"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "132 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 GuiBitmapCtrl() { Enabled = "1"; Profile = "ToolsGuiDefaultProfile"; diff --git a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript index 626b7de11..4d04d1228 100644 --- a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript +++ b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript @@ -102,11 +102,24 @@ function windowConsoleDlg::hideWindow(%this) function windowConsoleDlg::showWindow(%this) { - $WindowConsole::Open = true; - Canvas.pushDialog(%this); - %this-->Scroll.setVisible(true); + if($WindowConsole::Open) + { + // close the window when it's already opened + windowConsoleDlg.hideWindow(); + } + else + { + // open the console window + $WindowConsole::Open = true; + Canvas.pushDialog(%this); + %this-->Scroll.setVisible(true); + // update all the windows (position and size) + EditorGui.updateSideBar(); + } } + + //----------------------------------------------------------------------------- function windowConsoleControl::setTab(%this, %tab, %text, %command) diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript index f30b64f12..bf81a6f80 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript @@ -628,6 +628,7 @@ function EditorGui::updateSideBar(%this) { if(GuiEditorIsActive()) { + // Update the Asset Browser's size if(isObject(AssetBrowserWindow) && isObject(GuiEditorSidebar)) { if(AssetBrowserWindow.docked == true) @@ -639,6 +640,19 @@ function EditorGui::updateSideBar(%this) AssetBrowserWindow.resize(0, %browserPosY, %browserWidth, %browserHeight); } } + + // Update the Windowed Console's size + if(isObject(windowConsoleControl) && isObject(GuiEditorSidebar)) + { + if(windowConsoleControl.docked == true) + { + // The width is relative to the sidepanel + %consoleWidth = Canvas.extent.x - GuiEditorSidebar.extent.x; + %consoleHeight = windowConsoleControl.extent.y; + %consolePosY = Canvas.extent.y - windowConsoleControl.extent.y - 33; + windowConsoleControl.resize(0, %consolePosY, %consoleWidth, %consoleHeight); + } + } return; } @@ -2763,8 +2777,8 @@ function toggleSnappingOptions( %var ) } else if( %var $= "grid" ) { - EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap; - EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap ); + EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap; + EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap ); EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap ); } else if( %var $= "byGroup" ) 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 0a4b4c991..07b3c80bc 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript @@ -636,7 +636,7 @@ function TerrainPainterContainer::maxSize(%this, %window) // --- Windowed Console -------------------------------------------------- if(isObject(windowConsoleControl)) { - // Only resize the AssetBrowser if it's docked + // Only resize the console if it's docked if(windowConsoleControl.docked == true) { // The width is relative to the sidepanel From 8f2dbd5e2f9035b67d92ce0acbbe1a1722c5036d Mon Sep 17 00:00:00 2001 From: Nils Eikelenboom Date: Tue, 24 Sep 2024 21:43:01 +0200 Subject: [PATCH 22/22] Add extra increased font size to Windowed Console Added extra large font to the windowed console. Use the [-A] [A+] buttons to change the size. Preferably would introduce "lineSpacing" to the GuiConsole object for improved readability; as well to store this into the prefs. --- Templates/BaseGame/game/tools/gui/profiles.ed.tscript | 5 +++++ .../tools/windowConsole/scripts/window_console.tscript | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript index 569c4ba60..17390ad0f 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -1569,6 +1569,11 @@ new GuiControlProfile(ToolsGuiConsoleLargeProfile : ToolsGuiConsoleProfile) { fontSize = $GUI::fontSize[16]; }; +if(!isObject(ToolsGuiConsoleXLProfile)) +new GuiControlProfile(ToolsGuiConsoleXLProfile : ToolsGuiConsoleProfile) +{ + fontSize = $GUI::fontSize[18]; +}; if(!isObject(ToolsGuiConsoleTextProfile)) new GuiControlProfile(ToolsGuiConsoleTextProfile) { diff --git a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript index 4d04d1228..00271f312 100644 --- a/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript +++ b/Templates/BaseGame/game/tools/windowConsole/scripts/window_console.tscript @@ -252,6 +252,10 @@ function windowConsoleDlg::incFont() { switch ($Con::font) { + case 16: + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleXLProfile); + $Con::font = 18; + windowConsoleMessageLogView.refresh(); case 14: windowConsoleMessageLogView.setProfile(ToolsGuiConsoleLargeProfile); $Con::font = 16; @@ -275,6 +279,10 @@ function windowConsoleDlg::decFont() windowConsoleMessageLogView.setProfile(ToolsGuiConsoleMediumProfile); $Con::font = 14; windowConsoleMessageLogView.refresh(); + case 18: + windowConsoleMessageLogView.setProfile(ToolsGuiConsoleLargeProfile); + $Con::font = 16; + windowConsoleMessageLogView.refresh(); } }