From 07b28cb29acb704a2af86a81ff9dcddc83bb1ec7 Mon Sep 17 00:00:00 2001 From: Areloch Date: Mon, 17 Jun 2019 02:30:45 -0500 Subject: [PATCH] GFX card profile config file logging moved to debug only WIP mode of guiSliderCtrl to be a filled rectangle instead of a textured UI Fixed bug with guiTextEditCtrl losing focus updating history passing malformed strings Updated WIP options menu Editor/Project settings WIP Updated editor theme to be consistent, and feed off the editor settings Updated popup menus to reference renamed profiles Added more in-progress modules for examples/stress testing --- Engine/source/gfx/gfxCardProfile.cpp | 5 + Engine/source/gui/controls/guiSliderCtrl.cpp | 44 +- Engine/source/gui/controls/guiSliderCtrl.h | 3 + .../source/gui/controls/guiTextEditCtrl.cpp | 2 +- Engine/source/gui/editor/popupMenu.cpp | 2 +- Engine/source/postFx/postEffect.cpp | 2 +- Templates/BaseGame/game/core/Core.cs | 3 + .../lighting/scripts/advancedLighting_Init.cs | 6 - .../advanced/gl/reflectionProbeP.glsl | 162 ++++++++ .../advanced/gl/reflectionProbeV.glsl | 32 ++ Templates/BaseGame/game/core/settings.xml | 13 + .../ui/art/optionsMenuSliderBitmapArray.png | Bin 0 -> 2247 bytes .../game/data/ui/art/slider - Copy.png | Bin 0 -> 908 bytes .../guis/graphicsMenuSettingsSlider.taml | 4 +- .../game/data/ui/scripts/optionsMenu.cs | 72 +++- .../BaseGame/game/data/ui/scripts/profiles.cs | 7 + .../assetBrowser/_assetImportConfigs.xml | 34 ++ .../tools/assetBrowser/guis/assetBrowser.gui | 12 +- .../tools/assetBrowser/guis/assetImport.gui | 6 +- .../tools/assetBrowser/guis/editAsset.gui | 2 +- .../tools/assetBrowser/guis/editModule.gui | 2 +- .../game/tools/assetBrowser/guis/newAsset.gui | 2 +- .../BaseGame/game/tools/assetBrowser/main.cs | 1 + .../convexEditor/convexEditorToolbar.ed.gui | 2 +- .../editorClasses/gui/images/rollout.png | Bin 586 -> 6247 bytes .../gui/panels/navPanelProfiles.ed.cs | 51 --- .../game/tools/gui/editorSettingsWindow.ed.cs | 217 ++++++++-- .../BaseGame/game/tools/gui/images/button.png | Bin 1153 -> 2944 bytes .../BaseGame/game/tools/gui/images/tab.png | Bin 495 -> 4142 bytes .../BaseGame/game/tools/gui/images/window.png | Bin 861 -> 5308 bytes .../messageBoxOKCancelDetailsDlg.ed.gui | 2 +- .../BaseGame/game/tools/gui/profiles.ed.cs | 381 +++++++++++------- .../game/tools/guiEditor/gui/guiEditor.ed.gui | 6 +- .../guiEditor/scripts/guiEditorCanvas.ed.cs | 2 +- .../tools/navEditor/NavEditorSettingsTab.gui | 2 +- Templates/BaseGame/game/tools/settings.xml | 264 ++++++------ .../shapeEditor/gui/ShapeEditorToolbar.ed.gui | 2 +- .../tools/worldEditor/gui/EditorGui.ed.gui | 4 +- .../tools/worldEditor/gui/ToolsToolbar.ed.gui | 4 +- .../worldEditor/gui/WorldEditorToolbar.ed.gui | 12 +- .../gui/WorldEditorTreeWindow.ed.gui | 1 + .../gui/guiWorldEditorCreatorWindow.ed.gui | 1 + .../tools/worldEditor/scripts/lightViz.cs | 7 - .../tools/worldEditor/scripts/menus.ed.cs | 13 +- 44 files changed, 972 insertions(+), 415 deletions(-) create mode 100644 Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeP.glsl create mode 100644 Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeV.glsl create mode 100644 Templates/BaseGame/game/core/settings.xml create mode 100644 Templates/BaseGame/game/data/ui/art/optionsMenuSliderBitmapArray.png create mode 100644 Templates/BaseGame/game/data/ui/art/slider - Copy.png create mode 100644 Templates/BaseGame/game/tools/assetBrowser/_assetImportConfigs.xml diff --git a/Engine/source/gfx/gfxCardProfile.cpp b/Engine/source/gfx/gfxCardProfile.cpp index c223aca11..066dd3b3a 100644 --- a/Engine/source/gfx/gfxCardProfile.cpp +++ b/Engine/source/gfx/gfxCardProfile.cpp @@ -41,17 +41,22 @@ void GFXCardProfiler::loadProfileScript(const char* aScriptName) void *data = NULL; U32 dataSize = 0; + Torque::FS::ReadFile( scriptName.c_str(), data, dataSize, true ); if(data == NULL) { +#if TORQUE_DEBUG Con::warnf(" - No card profile %s exists", scriptName.c_str()); +#endif return; } const char *script = static_cast(data); +#if TORQUE_DEBUG Con::printf(" - Loaded card profile %s", scriptName.c_str()); +#endif Con::evaluate(script, false, NULL); delete[] script; diff --git a/Engine/source/gui/controls/guiSliderCtrl.cpp b/Engine/source/gui/controls/guiSliderCtrl.cpp index ad9316216..d84d6311b 100644 --- a/Engine/source/gui/controls/guiSliderCtrl.cpp +++ b/Engine/source/gui/controls/guiSliderCtrl.cpp @@ -89,6 +89,7 @@ IMPLEMENT_CALLBACK( GuiSliderCtrl, onMouseDragged, void, (), (), GuiSliderCtrl::GuiSliderCtrl() : mRange( 0., 1.f ), mTicks( 10 ), + mRenderTicks(true), mSnap( false ), mValue( 0.5f ), mThumbSize( 8, 20 ), @@ -98,7 +99,9 @@ GuiSliderCtrl::GuiSliderCtrl() mDisplayValue( false ), mMouseOver( false ), mDepressed( false ), - mMouseDragged( false ) + mMouseDragged( false ), + mUseFillBar(false), + mFillBarColor(ColorI(255,255,255)) { } @@ -117,6 +120,12 @@ void GuiSliderCtrl::initPersistFields() addProtectedField( "value", TypeF32, Offset( mValue, GuiSliderCtrl ), _setValue, defaultProtectedGetFn, "The value corresponding to the current slider position." ); + addField("useFillBar", TypeBool, Offset(mUseFillBar, GuiSliderCtrl), + "Whether to render the tick marks."); + addField("fillBarColor", TypeColorI, Offset(mFillBarColor, GuiSliderCtrl), + "Whether to render the tick marks."); + addField("renderTicks", TypeBool, Offset(mRenderTicks, GuiSliderCtrl), + "Whether to render the tick marks."); endGroup( "Slider" ); @@ -365,9 +374,18 @@ void GuiSliderCtrl::onRender(Point2I offset, const RectI &updateRect) GFXDrawUtil* drawUtil = GFX->getDrawUtil(); + if (mUseFillBar) + { + + drawUtil->drawRectFill(RectI(offset.x, offset.y, getWidth() * mValue, getHeight()), mFillBarColor); + + renderChildControls(offset, updateRect); + return; + } + if( mHasTexture ) { - if(mTicks > 0) + if(mTicks > 0 && mRenderTicks) { // TODO: tick marks should be positioned based on the bitmap dimensions. Point2I mid(ext.x, ext.y/2); @@ -443,11 +461,14 @@ void GuiSliderCtrl::onRender(Point2I offset, const RectI &updateRect) PrimBuild::vertex2i( pos.x + mid.x, pos.y + mid.y ); // tick marks - for( U32 t = 0; t <= ( mTicks + 1 ); t++ ) + if (mRenderTicks) { - S32 x = (S32)( F32( mid.x - 1 ) / F32( mTicks + 1 ) * F32( t ) ); - PrimBuild::vertex2i( pos.x + x, pos.y + mid.y - mShiftPoint ); - PrimBuild::vertex2i( pos.x + x, pos.y + mid.y + mShiftPoint ); + for (U32 t = 0; t <= (mTicks + 1); t++) + { + S32 x = (S32)(F32(mid.x - 1) / F32(mTicks + 1) * F32(t)); + PrimBuild::vertex2i(pos.x + x, pos.y + mid.y - mShiftPoint); + PrimBuild::vertex2i(pos.x + x, pos.y + mid.y + mShiftPoint); + } } PrimBuild::end(); } @@ -462,11 +483,14 @@ void GuiSliderCtrl::onRender(Point2I offset, const RectI &updateRect) PrimBuild::vertex2i( pos.x + mid.x, pos.y + mid.y ); // tick marks - for( U32 t = 0; t <= ( mTicks + 1 ); t++ ) + if (mRenderTicks) { - S32 y = (S32)( F32( mid.y - 1 ) / F32( mTicks + 1 ) * F32( t ) ); - PrimBuild::vertex2i( pos.x + mid.x - mShiftPoint, pos.y + y ); - PrimBuild::vertex2i( pos.x + mid.x + mShiftPoint, pos.y + y ); + for (U32 t = 0; t <= (mTicks + 1); t++) + { + S32 y = (S32)(F32(mid.y - 1) / F32(mTicks + 1) * F32(t)); + PrimBuild::vertex2i(pos.x + mid.x - mShiftPoint, pos.y + y); + PrimBuild::vertex2i(pos.x + mid.x + mShiftPoint, pos.y + y); + } } PrimBuild::end(); mDisplayValue = false; diff --git a/Engine/source/gui/controls/guiSliderCtrl.h b/Engine/source/gui/controls/guiSliderCtrl.h index 9a70c512e..a8f8b667c 100644 --- a/Engine/source/gui/controls/guiSliderCtrl.h +++ b/Engine/source/gui/controls/guiSliderCtrl.h @@ -39,6 +39,7 @@ class GuiSliderCtrl : public GuiControl Point2F mRange; U32 mTicks; + bool mRenderTicks; bool mSnap; F32 mValue; RectI mThumb; @@ -51,6 +52,8 @@ class GuiSliderCtrl : public GuiControl bool mMouseOver; bool mMouseDragged; bool mHasTexture; + bool mUseFillBar; + ColorI mFillBarColor; enum { diff --git a/Engine/source/gui/controls/guiTextEditCtrl.cpp b/Engine/source/gui/controls/guiTextEditCtrl.cpp index 65bb331a6..076eddc90 100644 --- a/Engine/source/gui/controls/guiTextEditCtrl.cpp +++ b/Engine/source/gui/controls/guiTextEditCtrl.cpp @@ -1246,7 +1246,7 @@ void GuiTextEditCtrl::onLoseFirstResponder() //execute the validate command if( mValidateCommand.isNotEmpty() ) - evaluate( mValidateCommand ); + evaluate( mValidateCommand.c_str() ); onValidate_callback(); diff --git a/Engine/source/gui/editor/popupMenu.cpp b/Engine/source/gui/editor/popupMenu.cpp index 9aef352ca..2c9765f09 100644 --- a/Engine/source/gui/editor/popupMenu.cpp +++ b/Engine/source/gui/editor/popupMenu.cpp @@ -286,7 +286,7 @@ void PopupMenu::showPopup(GuiCanvas *owner, S32 x /* = -1 */, S32 y /* = -1 */) Sim::findObject("PopUpMenuControl", backgroundCtrl); GuiControlProfile* profile; - Sim::findObject("GuiMenubarProfile", profile); + Sim::findObject("ToolsGuiMenuBarProfile", profile); if (!profile) return; diff --git a/Engine/source/postFx/postEffect.cpp b/Engine/source/postFx/postEffect.cpp index 2d1285102..3209192d4 100644 --- a/Engine/source/postFx/postEffect.cpp +++ b/Engine/source/postFx/postEffect.cpp @@ -1703,7 +1703,7 @@ void PostEffect::setShaderConst(const String &name, const F32 &val) void PostEffect::setShaderConst(const String& name, const int& val) { - PROFILE_SCOPE(PostEffect_SetShaderConst_Float); + PROFILE_SCOPE(PostEffect_SetShaderConst_Int); EffectConstTable::Iterator iter = mEffectConsts.find(name); if (iter == mEffectConsts.end()) diff --git a/Templates/BaseGame/game/core/Core.cs b/Templates/BaseGame/game/core/Core.cs index 99efdd706..af6f97b8a 100644 --- a/Templates/BaseGame/game/core/Core.cs +++ b/Templates/BaseGame/game/core/Core.cs @@ -27,6 +27,9 @@ function CoreModule::onCreate(%this) ModuleDatabase.LoadExplicit( "Core_GameObjects" ); ModuleDatabase.LoadExplicit( "Core_ClientServer" ); + new Settings(ProjectSettings) { file = "core/settings.xml"; }; + ProjectSettings.read(); + %prefPath = getPrefpath(); if ( isFile( %prefPath @ "/clientPrefs.cs" ) ) exec( %prefPath @ "/clientPrefs.cs" ); diff --git a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs index c7d357bb8..b34da6d84 100644 --- a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs +++ b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Init.cs @@ -47,18 +47,12 @@ function onActivateAdvancedLM() // Enable the offscreen target so that AL will work // with MSAA back buffers and for HDR rendering. AL_FormatToken.enable(); - - // Activate Deferred Shading - AL_DeferredShading.enable(); } function onDeactivateAdvancedLM() { // Disable the offscreen render target. AL_FormatToken.disable(); - - // Deactivate Deferred Shading - AL_DeferredShading.disable(); } function setAdvancedLighting() diff --git a/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeP.glsl new file mode 100644 index 000000000..fee0b8783 --- /dev/null +++ b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeP.glsl @@ -0,0 +1,162 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2012 GarageGames, LLC +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +//----------------------------------------------------------------------------- +#include "../../../gl/hlslCompat.glsl" +#include "shadergen:/autogenConditioners.h" +#include "farFrustumQuad.glsl" +#include "../../../gl/torque.glsl" +#include "../../../gl/lighting.glsl" +#line 27 + +in vec4 pos; +in vec4 wsEyeDir; +in vec4 ssPos; +in vec4 vsEyeDir; + +uniform sampler2D deferredBuffer; +uniform sampler2D colorBuffer; +uniform sampler2D matInfoBuffer; +uniform samplerCube cubeMap; +uniform samplerCube irradianceCubemap; +uniform sampler2D BRDFTexture; +uniform float cubeMips; + +uniform vec4 rtParams0; + +uniform vec3 probeWSPos; +uniform vec3 probeLSPos; +uniform vec4 vsFarPlane; + +uniform float radius; +uniform vec2 attenuation; + +uniform mat4 worldToObj; +uniform mat4 cameraToWorld; + +uniform vec3 eyePosWorld; +uniform vec3 bbMin; +uniform vec3 bbMax; + +uniform float useSphereMode; + +// Box Projected IBL Lighting +// Based on: http://www.gamedev.net/topic/568829-box-projected-cubemap-environment-mapping/ +// and https://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/ +vec3 boxProject(vec3 wsPosition, vec3 reflectDir, vec3 boxWSPos, vec3 boxMin, vec3 boxMax) +{ + vec3 nrdir = reflectDir; + vec3 offset = wsPosition; + vec3 plane1vec = (boxMax - offset) / nrdir; + vec3 plane2vec = (boxMin - offset) / nrdir; + + vec3 furthestPlane = max(plane1vec, plane2vec); + float dist = min(min(furthestPlane.x, furthestPlane.y), furthestPlane.z); + vec3 posonbox = offset + nrdir * dist; + + return posonbox - boxWSPos; +} + +vec3 iblBoxSpecular(vec3 normal, vec3 wsPos, float roughness, vec3 surfToEye, + sampler2D brdfTexture, + samplerCube radianceCube, + vec3 boxPos, + vec3 boxMin, + vec3 boxMax) +{ + float ndotv = clamp(dot(normal, surfToEye), 0.0, 1.0); + + // BRDF + vec2 brdf = textureLod(brdfTexture, vec2(roughness, ndotv),0).xy; + + // Radiance (Specular) + float maxmip = pow(cubeMips+1,2); + float lod = roughness*maxmip; + vec3 r = reflect(surfToEye, normal); + vec3 cubeR = normalize(r); + cubeR = boxProject(wsPos, cubeR, boxPos, boxMin, boxMax); + + vec3 radiance = textureLod(radianceCube, cubeR, lod).xyz * (brdf.x + brdf.y); + + return radiance; +} + +float defineBoxSpaceInfluence(vec3 surfPosWS, vec3 probePos, float radius, float atten) +{ + vec3 surfPosLS = tMul( worldToObj, vec4(surfPosWS,1.0)).xyz; + + vec3 boxMinLS = probePos-(vec3(1,1,1)*radius); + vec3 boxMaxLS = probePos+(vec3(1,1,1)*radius); + + float boxOuterRange = length(boxMaxLS - boxMinLS); + float boxInnerRange = boxOuterRange / atten; + + vec3 localDir = vec3(abs(surfPosLS.x), abs(surfPosLS.y), abs(surfPosLS.z)); + localDir = (localDir - boxInnerRange) / (boxOuterRange - boxInnerRange); + + return max(localDir.x, max(localDir.y, localDir.z)) * -1; +} +out vec4 OUT_col; + +void main() +{ + + // Compute scene UV + vec2 uvScene = getUVFromSSPos( ssPos.xyz/ssPos.w, rtParams0 ); + + //eye ray WS/LS + vec3 vsEyeRay = getDistanceVectorToPlane( -vsFarPlane.w, vsEyeDir.xyz, vsFarPlane ); + vec3 wsEyeRay = tMul(cameraToWorld, vec4(vsEyeRay, 0)).xyz; + + //unpack normal and linear depth + vec4 normDepth = deferredUncondition(deferredBuffer, uvScene); + + //create surface + Surface surface = createSurface( normDepth, colorBuffer, matInfoBuffer, + uvScene, eyePosWorld, wsEyeRay, cameraToWorld); + float blendVal = 1.0; + if(useSphereMode>0) + { + vec3 L = probeWSPos - surface.P; + blendVal = 1.0-length(L)/radius; + clip(blendVal); + } + else + { + float tempAttenVal = 3.5; + blendVal = defineBoxSpaceInfluence(surface.P, probeWSPos, radius, tempAttenVal); + clip(blendVal); + float compression = 0.05; + blendVal=(1.0-compression)+blendVal*compression; + } + //render into the bound space defined above + vec3 surfToEye = normalize(surface.P - eyePosWorld); + vec3 irradiance = textureLod(irradianceCubemap, surface.N,0).xyz; + vec3 specular = iblBoxSpecular(surface.N, surface.P, surface.roughness, surfToEye, BRDFTexture, cubeMap, probeWSPos, bbMin, bbMax); + vec3 F = FresnelSchlickRoughness(surface.NdotV, surface.f0, surface.roughness); + specular *= F; + //energy conservation + vec3 kD = vec3(1.0) - F; + kD *= 1.0 - surface.metalness; + //final diffuse color + vec3 diffuse = kD * irradiance * surface.baseColor.rgb; + + OUT_col = vec4(diffuse + specular * surface.ao, blendVal); +} diff --git a/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeV.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeV.glsl new file mode 100644 index 000000000..5d48e6613 --- /dev/null +++ b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/reflectionProbeV.glsl @@ -0,0 +1,32 @@ +#include "shadergen:/autogenConditioners.h" +#include "../../torque.hlsl" + +// This is the shader input +struct Vert +{ + float4 position : POSITION; + float2 uv0 : TEXCOORD0; + float3 wsEyeRay : TEXCOORD1; +}; + +// This is the shader output data. +struct Conn +{ + float4 position : POSITION; + float2 uv0 : TEXCOORD0; + float3 wsEyeRay : TEXCOORD1; +}; + +// Render Target Paramaters +float4 rtParams0; + +Conn main(Vert IN, + uniform float4x4 modelView : register(C0)) +{ + Conn OUT; + OUT.position = IN.position; + OUT.uv0 = viewportCoordToRenderTarget( IN.uv0, rtParams0 ); + OUT.wsEyeRay = IN.wsEyeRay; + return OUT; +} + diff --git a/Templates/BaseGame/game/core/settings.xml b/Templates/BaseGame/game/core/settings.xml new file mode 100644 index 000000000..7e6bf5e0b --- /dev/null +++ b/Templates/BaseGame/game/core/settings.xml @@ -0,0 +1,13 @@ + + + + + core/ + + + + + a + + + diff --git a/Templates/BaseGame/game/data/ui/art/optionsMenuSliderBitmapArray.png b/Templates/BaseGame/game/data/ui/art/optionsMenuSliderBitmapArray.png new file mode 100644 index 0000000000000000000000000000000000000000..bd41c15b7a53ec6e612b28c09b65978ca37000e1 GIT binary patch literal 2247 zcmV;&2srnNP)W&blM4peLP7w7 z|KIit?E(a4{|iyTvh1Jon@lD*HZ~}V`g0k;vnYz%+S-!KR+7Z(?MdV2c%`*9r4qkWpD z*Vfj2J|BW0dc9tyQl&i_%(uBGPoCVpd$*#ZqQAety}iA-xVR9vkW41MUN1?K>+9TL;1_o?48w5dtK!B#{{N8>r7<4!se!m|@Q3OHw@*C#+J`f0y zB z^|rRQ>h=2k7D^a~4F&@Y!yb<(6biZBZU6uZhe0Bdn3gp50s;Vjs!ypLaGY)2G0V#^|dcEW0?s+vpECz3IgEQz`1khj?HG1$z&}pEf+6dY;0^)DwX-2Vx(Xo!2Z_O z*7xt@?{LeMn^|&Hd`z~@!$jS_h!T{xpZoanVeXk@o@q3i3l}bQcXu0&Mu`(l zIu{g0xm+&0-JVD!gf=|+QbR!y#4xP6x%teQGdp+g4242-b949a-zP~jze5uQK^l#w zyu4g4mnRa5P$)!_B*QR5zEvufb#-+FK>z?SGcz+kKfkfDkw?unnM|&%ti0!sZ!R3Lt+ilT)@rq$ zK7G2atxd1jrwM@^IKc1sbKM0109viqY&H`FvHg(z_PO@|!Gi}W)j`T6&*Oq+SuXWg zR#pH2APB;2HfuB*(Rzj`4%jwNa;-&ocemAQS~=%Cyoh3%>moy$y29JWp6FS1CZ+NB9VwnrPAy5oSc%ryU1og*GWF33r>FU zcsxr>OR-oCMbV0iicGuBWfGP+Pl^Fxo0wHxTx>R*D=I27@tZLF(kJvn&>iUa!wx3(9Gd7v>_FOa=l0r_;$XmIzA7 z48Z2*=EB0lt5>f^Mn+OaU)($?SW1*EW(m(QiL@-t1x?f8aMvSwllZ zPfw3H5mDIg8HOQAl9L>yiCKWuNj^o(t*xzBu3V|DtxfM#JdJUb5RFEKG!ZZ#YrT8- z&f#!?Ah>7Go*OrA96NTb5dVZ}n)dm8tE;OJ1eKMQNf5K7P4Y*N9^J8H$I#Hw%a<=F zCnxLc>y1WZ8YxA*aRfmO27^kanw_0pTU+yZJjrCTrlyAPWeIOMBM73?>Gtp6-`(AP z{P^+QHv=B#2qLyc^uw+H$#E zb8~a`_4NjWA@>sWJ1x82?qD!zGMTEXs?q?EfrPnNT@VCGlQ=}}o@H5y#VzNDn>0-) zlS#Q;p5ec_WETv>tgo*}qfs2kQ4~!p)qw2Z$GL@c!LlsFFfy5pPpSd`K2QI%>tFPu V?)q1$s0{!B002ovPDHLkV1nhyLI(f< literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/data/ui/art/slider - Copy.png b/Templates/BaseGame/game/data/ui/art/slider - Copy.png new file mode 100644 index 0000000000000000000000000000000000000000..92fee1e9c13401f0b9fb319b14ebd267b7c1c8a0 GIT binary patch literal 908 zcmV;719SX|P)BsNz zeu<3YC~{d@T`O@7=Bqd8zh+r&1N$TtpK!GELCNikCSDYg%%{_tjFWkfZXnes>n;@ zqR|aj)!gZHXh8b=y;^A;kRu8#6pO{!Mvtd3L02hDKJM?<79kE%E?3>4B+0?(MwHD# znh=bupw`5N2ruq9KZs6u_7))i@#~}<;40XaEJtI*eV$Cj55Bf2ineZ<81cX|$A?-K ziRQ$vUFqvirBbh8IBB!lrWT$p@_Epw4{y{Jk<89s7(yreE_ZXgJAlQLOs#F|`{D~e zk1JU{!ht}*1pQDv9-m=Z)*TLqIgIfHJjnm+Zki*YSv0N&+<5q!9OI!(a(m|ZDWCi2 z+7hQAJOK~#FZBQBsFq0$xe508a5Ng7>+0%qd%a%d^ZA(i`uZ`3VWtE40bY>a7M7V# zB!+jkHs_9=>37>2j-V5r7a4n=; z!uTf4JA}`P;v1uD=Z~Jdb2XVYA zW9_{!_Y>&<@ydWoCaW7|c%=l304u9lXbBBDP18sKV$fMbp11YLDqKf%e#(kCvbjnH z0IY2MSwNH|Nr;Cm_2f`8%fP&(pfq1j&P&EykrGAGkevASCV(r$>yDU`^BZRlB!U6C zWJs>$^wwoAh)RXbi7W=16Mq@GgpA26$sz+uYE0GPzMbJE%h#`yBRq)9| zM)ez$XR{;UB9VaZPe36jlnmZKpDj2gSsD4W{t>WPgB5pU{)$x*B(ajOltDF2!h9-! iq)BbrE0*;C1Q-Ck2#=cQD4UW100001gDw+ literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/graphicsMenuSettingsSlider.taml b/Templates/BaseGame/game/data/ui/scripts/guis/graphicsMenuSettingsSlider.taml index 4bbc1c982..74a428114 100644 --- a/Templates/BaseGame/game/data/ui/scripts/guis/graphicsMenuSettingsSlider.taml +++ b/Templates/BaseGame/game/data/ui/scripts/guis/graphicsMenuSettingsSlider.taml @@ -89,7 +89,9 @@ isContainer="false" internalName="slider" canSave="true" - canSaveDynamicFields="false" /> + canSaveDynamicFields="false" + renderTicks="false" + useFillBar="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui index 48f049782..20500af05 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetBrowser.gui @@ -323,7 +323,7 @@ minExtent = "64 64"; horizSizing = "relative"; vertSizing = "height"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiDefaultProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; @@ -345,7 +345,7 @@ minExtent = "16 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiDefaultProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; @@ -414,7 +414,7 @@ minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiDefaultProfile"; visible = "1"; active = "1"; command = "AssetBrowser.showFilterPopup();"; @@ -530,7 +530,7 @@ minExtent = "16 16"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiDefaultProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; @@ -657,7 +657,7 @@ minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiDefaultProfile"; visible = "1"; active = "1"; command = "AssetBrowser.toggleTagFilterPopup();"; @@ -798,7 +798,7 @@ minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiDefaultProfile"; + profile = "ToolsGuiDefaultProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui index f337c946f..d7e82723c 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/assetImport.gui @@ -85,7 +85,7 @@ minExtent = "8 2"; horizSizing = "width"; vertSizing = "height"; - profile = "GuiScrollProfile"; + profile = "ToolsGuiScrollProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; @@ -243,7 +243,7 @@ minExtent = "8 2"; horizSizing = "width"; vertSizing = "height"; - profile = "GuiScrollProfile"; + profile = "ToolsGuiScrollProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; @@ -574,7 +574,7 @@ minExtent = "8 2"; horizSizing = "width"; vertSizing = "height"; - profile = "GuiScrollProfile"; + profile = "ToolsGuiScrollProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui index 45d411f20..483fe0d80 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/editAsset.gui @@ -66,7 +66,7 @@ minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiScrollProfile"; + profile = "Tools"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui index 90ff639dd..dbe060f62 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/editModule.gui @@ -66,7 +66,7 @@ minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiScrollProfile"; + profile = "ToolsGuiScrollProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui b/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui index 09fcb997d..379d6a521 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui +++ b/Templates/BaseGame/game/tools/assetBrowser/guis/newAsset.gui @@ -196,7 +196,7 @@ minExtent = "8 2"; horizSizing = "right"; vertSizing = "bottom"; - profile = "GuiScrollProfile"; + profile = "ToolsGuiScrollProfile"; visible = "1"; active = "1"; tooltipProfile = "GuiToolTipProfile"; diff --git a/Templates/BaseGame/game/tools/assetBrowser/main.cs b/Templates/BaseGame/game/tools/assetBrowser/main.cs index c5272e44a..394cd47f6 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/main.cs +++ b/Templates/BaseGame/game/tools/assetBrowser/main.cs @@ -22,6 +22,7 @@ if( !isObject( ToolsGuiDefaultNonModalProfile ) ) new GuiControlProfile (ToolsGuiDefaultNonModalProfile : ToolsGuiDefaultProfile) { + opaque = false; modal = false; }; diff --git a/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui index bd76a265e..2e737c942 100644 --- a/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/convexEditor/convexEditorToolbar.ed.gui @@ -114,7 +114,7 @@ canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "menubarProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; Position = "195 0"; diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout.png index 8ce3f635fdf971502ed0c61f6766d3eef48874f0..39f7caa7eeed7189cd4acac772b33c4c0c47a12a 100644 GIT binary patch literal 6247 zcmV-t7?|gYP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3-Dbu2lItpC%BF@gJH4%c(WgJ=GHAXBQnrPk}K zZj~xm5C{Mf$W-(H{qIu$!@m@aS3aa1ON^R-zW8D*e`J0Bolm3v{=NU%bnP>b+m*A| z4$CITr#oNcypFGI54RJNzqYr>?JD)_I{CWLwd3o8PVOu>8<&ySg`7Rx&GlWC%c2_Z zmUI2zu9Nqj_3L+^aK;E+&sk-sGfwZ{_T0%~g)6S|8ToBolmq#x&N0! zQQ@w5E$VA2`!5b`T*~d!B0q`$1AnLeQ~1fc>Q2-KOKnOwz7%8e_%hxMQ_V7Se|FO` z(c5VgpVoHk_O|SjEw=BVc=<8QCPjRP%fzG;If;t>w#DrG7P%ic%iMVwjEz(w3UV2p7@Ku6<(iAE=DlQH-)6Q7FZ)_L2AfC(zt zftA)fG9lS)<=&i=%s$ozdp1*E2t*)h5}_f12$uK3NAfKLp{jxlK75UV@^5el54TWQO1HQv80kqDYbIb>MPf(9ADYcY;(=G z&|*t1x6*0{KHc}wV^2Nz((ACp4N8C-aioz)8FiWol%}6y#+hcGW!44OmRo*>6<1n$ zl~uo^X0Eh-h}v`H{yA#qikjVllH<}XYHUvF>k>xFNsyQkG3yNxPZ9wDZ6#(p8}F?| zPGY8ub;`M5u`)<-hLMO7K|hTR%Y4V~7P*gcQ+W5^#?8KqoRZM}7m-sEy1U4|#_dhi zM&0Gs?Epy@;!`T5BmI_(YmU{zT4l19>D}rvzuDICe$bOI8gqhQ)AzK-P-{dio+N-@ z)h{j@@QRtU&FO-CZ)uLSW-5KGqGgMzZar^RvbpDFqg!*X*?cOFN|DkE)$Qv$?p1nE zt*(~k58CbFsW?1|VxantYk2zHNJF?^|Q(|8LAykM?T)&esoH zzf68ISlulCtDBFP)vw(=i}kJNX`404chh>aq#6r#eY&N3tR;cAQRUiwxzd(33!Cid zl(A}REv6^XzlLpk-G?H%$)$#$)vM4-@-a12MkG&Kw}BO!3g9b+Vax*Z`_EofKf5uu zYo%1V_mGl{tG~tQHAL!fF?tP=`W&M^mvwDqDuu}~78kixP85JpYk(lE*yO?lEv~NE zlZVF*HG3|vh4J;ys&a^C-2gFDrIgiVYjGrbmhj{qo@%o1)T5YPNTsGU9OY~E{x_T} zaiUMo$C@Ed8U8bOz`cxLJvlTz=Fts9axVr z3@g8fCMIF};WHN>JqXrVPqx(FI%JIj@bzlJZ>gWiES_`>(y&4f`-D2uLB(+QGwL`0a7*j4q*=O`^Ng?FH# z_|mbQ=t9IJX^AfraN3D#DhKL>v2BF1eCnR)rn-F^!1F3itG)h4R+oO~i~Z>$T0;)b zE5uzHyZp8$WFqHItKfo-Tas&-RH-G?ov2YYQg17`nU_l&H6}%kWm2DG4&Ei)QF|JZ zHku;_jlk0I7(sG5dC4r+WaqBS*?`LooXDO}@K_GZR&ExHRhpfaE&dq$0%)gYL1@{F znN4h|eFQo-{UfJYparCe$4ma(?QN*Ad|rmLIy|%5k<+=eT!At-Tgp>Y15#--M)D!x zP5`4_T_xonakd)^WY1vWBbCoSa_E(hGP)o1dR@wBC@3WA4_R2*QFl2W5+t8i5$CY*r6pnvjOUNXl8uS#e{a-iSpB zR;r8}XcG_&8sXLCm1(%gKumm*i@Dj#)UZoUvdms!Dvid8Q#XnT}PD?WZY(Utve5d?_ z8>-eU$#`oc)OZYdZi3a?2!|CdkGAbFTU^}?Elqp~z;g=p{*;M_8>9z?*w7t@@y&oG zZ*^!5zC2k~9)qHa(Jo{p3n$ZtWR1(iK>ZqC*@5RVbQefHq`|ca;0Qdzp3dkb_!Q27 zf90kg0?bVdTi9+q&~1cA(GqJNEj#dwQlL^(Vf`H>ZqSf$O|J<7xwvrM#sm=s&QWSM zx}F|#5J4Kb9TFm82$z|g4GmcTnz0{WPx2%^!CeX72UnUquw$KOEqI?~D;J_cO$x{K zUx44Bgq~4L@LP4T3*kr8hmq-OMH+R5)Jwk9W@z^)5hFRpb!Q7wsiqm4-o4ST8!0t4 zpsmJ8iU^vfH|g9-)SX8=2aRduJ0X4*7>B;($ ztdW{(1T1eppQ?|#%FkPn^h6kP3}imhnN$N}yA!-p&z979x$KUE!teVY`s>qtsypvt zlFX?cM2$ieR+TzfHYX%4nB){YWI?EfH&x!ZlhPE?dHhaOa5!e-b{)d_KfHa6N?e} zi;6puB^~$RkiP5oOhQtT zN#H8I4TJD0Z3~x;35nnib356}atjBfnwH$(Rd@Td?Zwevu+nYg@Z@Y84YE<)wo1Kb zJMEv)j+Na}8gV&xmUS5RPBxC9UV{u6?J(z0C4Yx`GDwzK#5@GsX@yxh>-T2qaND1< zqe3l~hzEgoZHQw!VqeEMMcfkMtlvTVb^O#VfOqlp_tA4-p}Py5jH@3*r@sEah3+** zA7c6tI<;fBPuan<2dM>O1=XhVWrxTbx%4&ZBkks7I<+0r;%d?~B;}|qAq1kdkcaq= zhL}FtM)`Nq+S08Zu#Mp8WlQ=e%->cKK!K|b3#nUyQs~D@|JLQ|IcM%uhGpDP<$Cxh zT&ZVZ{S{a08CZYCmHJ#5{vECqog)_Q4LY(L3S)8u>P8*E%U!;AOZ;Uz?*qJj!GLCm zIuFs-(5GFG-oqYJ?PcUFLy}}EIw;RjG6v)UXNEThD+uaU!_z}hQ2rtH-Q1UtTnRr| zqyR(q@`&QM4~xEbs259KV}3=P)Ax}l;%ywVd=>YszH577(GZVbAQ~u*G1?vs(S}PG z#f@?wQ(OsS1q@k}|t6 zq65Q8Wr-dn1cBU=zR4zY&2PF0C3>8Yd)l1a!>?eJ-`41KOre-O7{m8%4npvqLAON~ z^<>azbH0s{AU1P#C6;e58P$9z z)(ZO7c1xi9Ja2Ux0HGAhY z(-Gbs4!b4so6w_<-tj&gbnan5?iB??oatf}dRG#Ss1_7Xuv5g|2Ykmyy_yyAj6~}A zWvG*uPweo$V_hZF%OL;d5n77;Bf-&d#gS|1ym6}Tr6V?(lxMV}BUmbqDo4V$QX-^X z2hYZde8X?h#iJb5kq&j-3c{`jW#t#*{OQw(Xj4b&#CzHHX3ntrw8ll7($d~?k;g66 zN^lCI9l~!bf}`MHRl-}%cBTwx#vl`hJzr3w6C|#|FG5yPjt4`_S}6(DZ;wR;)7|7i z9`fIG-4>Ke&%Eaa(izUgKp4MF3;YL(ho}&3VU9)_xzX}gQo{3LLJtx6hXCX=K|&WI z@FSAPSiR(7xw5-dQ92d^pwfp5VjCE-Lev-PjCRtrLw?g(1;4N)CIXaty9)|RskIeo$A|JP95?xM8Hb%scmUY6h1Y6 z$fLg!`AU9ePYdOeZVyj-RXB@cM(4#K2}*5%3HCCo%zNMz$=DXVU2%`%Y>r*K-0@}+ z-Oeg1g}7EFgDvP&8+KaJ((=qJIz1_hy<1(7^K2U_ zRsA>9Y}Cooi6Q~ex|--Sc{9FO0HL;W0&--Sc{9FO0HL;W0& zuW;x*qmxO=Cc5&JXu$=|6(se@5lSHEXpb4uO+8y2$4*JspLVE!f6D6)eCyR@(Ud0? z3ute2M_rjWcEk8SG=oGMAWAQR%5wYlP|B?^U>*@(3AwO<;P z2CL}`JNK6BmOt8*$#;z9%#gEWZGw{S{x|5o@Wbng-#Q=<1h4J;?>%SeC7b7Pl#~wg za~i(c(~EW437n+?!@m@3s^UnX3@g|lOsyrh*UD#}&2rzumOWkV}If`eL)Vz1R& z#Sw8D)EEV|miN|iuoqAS5AEqG%(ih6&BjHLcfGob$ooC6o$|&jvJz@l-+Cq(zodo- z9W6E7fn#boH{Xy{&w1nI!K#x169Rb2{CIxX>-*Go()8|P=5qPvA)AxuAA!1SI9VJgf zpm*YIRFEZ8PpE9dCi23#8>1pt!-c6pKW#-rH>Afa6 z11R-0f!b;LJ%Rdp{`56|D(Vd}@E^tL+ZmL&qsnVTX9|^zoy{Y#07AwqLtp6Gyfc<2 zZv;>k5a_}US{ZHU-U)bJFvB>l5JRsUlfIQA)s$Kc_ zW_7m9xT(q@OyXtaHAWoMI|j(R#zkJm?CUBWyTUm{0GhKN*GGBVr=5p5(z~ubvVG5v zgG}56BsSk!4SJfD1(HGjo5!drQ{w?8BivK+J)K8zQhM$;b6?p}<3(_c?EkdDFF2`Z)VK$j-J$Fwoa9L$)bB=> zo&oi3- z_wG!R2KNrV^JfYUm+Cg?Frm>m6uoEC!do_U6Dyc}eExcSwZ@{YQ;C?&Z7QvSg>jy| z&rDTUVcIea%ns%FGOF_-z_q(9AMot4WNPfX-fp&o&Pnfp|llRbuhW~3z{?}DK3tJYr(;f#j1mg zv#t)Vf*|+-;^OM0=prTlFDbN$@!+^0@9sVB-T^|R!c?;>3aFZ8q~b9#n_CqFujs)b z1Vj*(n5ieyiy3&1uY36TdKckY-sk=t{Yu_sfKMczW4d7xZxGLHS~}-_;t(rI3h_Dd zgh3Z1e&o9B@*C%(!vfC?8JW~PafnzfcCg&RtYoOf)5Kv#)hJ)cx~y>C;;dF`taVTR z!eCxoNpqd%DB@T`0!fIFQ9~IOSkzY;8Yw1Hv>)^Ek2wA$xny#c!N{?IDpW|0AN&t~ zcWV}=Cf%f94CsEb?T;}aunRQnw*7r<+szZe{|sDdZGW`^%zlzyZ)@QrU|<`#xNd9m z9&ot>3_t0TAvuztrcfvV?`QN)Ibi4(=v#ApYwhFo0mx8S%QwKmAuwK~>~)WK_jdO7 z@0nJAKdwJ=zsfa$g8%>k24YJ`L;wH)0002_L%V+f000SaNLh0L01m_e01m_fl`9S# z00007bV*G`2jd1210poPp$ZxR008GnL_t(o!|j(r4uUWcML&c+8_)x2JOgn50B10I z0Mc%H0$iCGqhYF*8O)#kG%xA=>1#FvGmKWYtE*&ilk?cuRg#{`c@zLpmSq|`=i|?M z(Gx-d0OT-S+l3p4-Y#6zcB+7j*QyC9nmH{%aUe7R#c<=$qiH*Pa2jADI4v;Ip3?#o z?KwVQTZAhf6(vP|a@M<^j3!JIW?BjNBe*4RTg&V6Sg~AF2J#s5UE5N`zb}&}dZT#ppkg%gGWeS1cB3wOT4&9*C9meV=~6 zPovRL=@TJVE(}A25DbSyYPFh5r#p#j?smJeSS%QgMwH8CRZe%l+z_7UvD@wF^?E9N zB77-Vuh;2zyKFWa6+RIX2%8Vdi^;$fc1Kf>$+H$1wgf0WipwtTCF%9kILlqxEI^)mQJU` ze{42G(=_JuIiBY!6N3affc<{Y<#OSCKL1FwnJ5QvI-OK_e9G@CC0QbulO@xgunwg9 zt3hV0kC}fLt4vR8rscAK!AWb)y}rHi_vPj3jN>>QY&+Z2n#;+OZ;0<^@(uAUnU>Rm hRR3Vgj1`x82O}Z4ec diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs b/Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs index 4f7b12867..2b690ff79 100644 --- a/Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs +++ b/Templates/BaseGame/game/tools/editorClasses/gui/panels/navPanelProfiles.ed.cs @@ -28,7 +28,6 @@ singleton GuiControlProfile (NavPanelProfile) category = "Editor"; }; - singleton GuiControlProfile (NavPanel : NavPanelProfile) { bitmap = "./navPanel"; @@ -64,53 +63,3 @@ singleton GuiControlProfile (NavPanelYellow : NavPanelProfile) bitmap = "./navPanel_yellow"; category = "Editor"; }; -singleton GuiControlProfile (menubarProfile : NavPanelProfile) -{ - bitmap = "./menubar"; - category = "Editor"; - - fillColor = "48 48 48"; - fontColor = "215 215 215"; - fontColorHL = "150 150 150"; - borderColor = "34 34 34"; -}; -singleton GuiControlProfile (editorMenubarProfile : NavPanelProfile) -{ - bitmap = "./editor-menubar"; - category = "Editor"; -}; -singleton GuiControlProfile (editorMenu_wBorderProfile : NavPanelProfile) -{ - bitmap = "./menu-fullborder"; - category = "Editor"; -}; -singleton GuiControlProfile (inspectorStyleRolloutProfile : NavPanelProfile) -{ - bitmap = "./inspector-style-rollout"; - category = "Editor"; -}; -singleton GuiControlProfile (inspectorStyleRolloutListProfile : NavPanelProfile) -{ - bitmap = "./inspector-style-rollout-list"; - category = "Editor"; -}; -singleton GuiControlProfile (inspectorStyleRolloutDarkProfile : NavPanelProfile) -{ - bitmap = "./inspector-style-rollout-dark"; - category = "Editor"; -}; -singleton GuiControlProfile (inspectorStyleRolloutInnerProfile : NavPanelProfile) -{ - bitmap = "./inspector-style-rollout_inner"; - category = "Editor"; -}; -singleton GuiControlProfile (inspectorStyleRolloutNoHeaderProfile : NavPanelProfile) -{ - bitmap = "./inspector-style-rollout-noheader"; - category = "Editor"; -}; -singleton GuiControlProfile (IconDropdownProfile : NavPanelProfile) -{ - bitmap = "./icon-dropdownbar"; - category = "Editor"; -}; diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs index 373739be3..ba15100ee 100644 --- a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs +++ b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs @@ -22,19 +22,31 @@ function ESettingsWindow::startup( %this ) { + new ArrayObject(EditorSettingsPageList); + new ArrayObject(GameSettingsPageList); + + %this.addEditorSettingsPage("Axis", "Axis Gizmo"); + %this.addEditorSettingsPage("General", "General Settings"); + %this.addEditorSettingsPage("Camera", "Camera Settings"); + %this.addEditorSettingsPage("SceneEditor", "Scene Editor"); + %this.addEditorSettingsPage("ShapeEditor", "Shape Editor"); + %this.addEditorSettingsPage("NavEditor", "Navigation Editor"); + %this.addEditorSettingsPage("Theme", "Theme"); + + %this.addGameSettingsPage("GameGeneral", "General"); + %this.addGameSettingsPage("Gameplay", "Gameplay"); + %this.addGameSettingsPage("Paths", "Paths"); + %this.addGameSettingsPage("UI", "UI"); + %this.addGameSettingsPage("LevelDefaults", "Level Defaults"); + %this.addGameSettingsPage("GameOptions", "Game Options"); + %this.addGameSettingsPage("AssetManagement", "Asset Management"); + + %this.mode = "Editor"; } function ESettingsWindow::onWake( %this ) { - new ArrayObject(SettingsPageList); - %this.addSettingsPage("Axis", "Axis Gizmo"); - %this.addSettingsPage("General", "General Settings"); - %this.addSettingsPage("Camera", "Camera Settings"); - %this.addSettingsPage("SceneEditor", "Scene Editor"); - %this.addSettingsPage("ShapeEditor", "Shape Editor"); - %this.addSettingsPage("NavEditor", "Navigation Editor"); - ESettingsWindowList.setSelectedById( 1 ); } function ESettingsWindow::hideDialog( %this ) @@ -47,7 +59,6 @@ function ESettingsWindow::ToggleVisibility() if ( ESettingsWindow.visible ) { ESettingsWindow.setVisible(false); - EditorSettings.write(); } else { @@ -59,19 +70,50 @@ function ESettingsWindow::ToggleVisibility() ESettingsWindowList.setSelectedById( 1 ); } -/*function ESettingsWindow::addTabPage( %this, %page ) +function ESettingsWindow::toggleProjectSettings(%this) { - ESettingsWindowTabBook.add( %page ); - ESettingsWindowList.addRow( ESettingsWindowTabBook.getSelectedPage(), %page.text ); - ESettingsWindowList.sort(0); -}*/ - -function ESettingsWindow::addSettingsPage(%this, %settingsPageName, %settingsPageText) -{ - SettingsPageList.add(%settingsPageName, %settingsPageText); + %this.ToggleVisibility(); - ESettingsWindowList.addRow( SettingsPageList.count(), %settingsPageText ); + %count = GameSettingsPageList.count(); + for(%i=0; %i < %count; %i++) + { + %settingsPageText = GameSettingsPageList.getValue(%i); + ESettingsWindowList.addRow( %i, %settingsPageText ); + } ESettingsWindowList.sort(0); + + ESettingsWindowList.setSelectedById( 1 ); + + %this.mode = "Project"; + ESettingsWindow.text = "Game Project Settings"; +} + +function ESettingsWindow::toggleEditorSettings(%this) +{ + %this.ToggleVisibility(); + + %count = EditorSettingsPageList.count(); + for(%i=0; %i < %count; %i++) + { + %settingsPageText = EditorSettingsPageList.getValue(%i); + ESettingsWindowList.addRow( %i, %settingsPageText ); + } + ESettingsWindowList.sort(0); + + ESettingsWindowList.setSelectedById( 1 ); + + %this.mode = "Editor"; + ESettingsWindow.text = "Editor Settings"; +} + +function ESettingsWindow::addEditorSettingsPage(%this, %settingsPageName, %settingsPageText) +{ + EditorSettingsPageList.add(%settingsPageName, %settingsPageText); +} + +function ESettingsWindow::addGameSettingsPage(%this, %settingsPageName, %settingsPageText) +{ + GameSettingsPageList.add(%settingsPageName, %settingsPageText); } //----------------------------------------------------------------------------- @@ -79,10 +121,49 @@ function ESettingsWindow::addSettingsPage(%this, %settingsPageName, %settingsPag function ESettingsWindowList::onSelect( %this, %id, %text ) { SettingsInspector.clearFields(); - %pageName = SettingsPageList.getKey(SettingsPageList.getIndexFromValue(%text)); + + if(ESettingsWindow.mode $= "Editor") + %pageName = EditorSettingsPageList.getKey(EditorSettingsPageList.getIndexFromValue(%text)); + else + %pageName = GameSettingsPageList.getKey(GameSettingsPageList.getIndexFromValue(%text)); + eval("ESettingsWindow.get" @ %pageName @ "Settings();"); } +//Read/write field functions +function SettingsInspector::addSettingsField(%this, %settingsFieldName, %labelText, %fieldType, %tooltip, %fieldData) +{ + %moddedSettingsFieldName = strreplace(%settingsFieldName, "/", "-"); + + if(ESettingsWindow.mode $= "Editor") + %this.addCallbackField(%moddedSettingsFieldName, %labelText, %fieldType, "", EditorSettings.value(%settingsFieldName), %fieldData, "changeEditorSetting"); + else + %this.addCallbackField(%moddedSettingsFieldName, %labelText, %fieldType, "", ProjectSettings.value(%settingsFieldName), %fieldData, "changeEditorSetting"); +} + +function SettingsInspector::changeEditorSetting(%this, %varName, %value) +{ + %varName = strreplace(%varName, "-", "/"); + + echo("Set " @ %varName @ " to be " @ %value); + + if(ESettingsWindow.mode $= "Editor") + EditorSettings.setValue(%varName, %value); + else + ProjectSettings.setValue(%varName, %value); + + //%id = ESettingsWindowList.getSelectedRow(); + //ESettingsWindowList.setSelectedRow(%id); + + if(ESettingsWindow.mode $= "Editor") + %success = EditorSettings.write(); + else + %success = ProjectSettings.write(); +} + +// +// COMMON EDITOR SETTINGS +// function ESettingsWindow::getAxisSettings(%this) { SettingsInspector.startGroup("Gizmo"); @@ -182,21 +263,89 @@ function ESettingsWindow::getShapeEditorSettings(%this) SettingsInspector.endGroup(); } -//Read/write field functions -function SettingsInspector::addSettingsField(%this, %settingsFieldName, %labelText, %fieldType, %tooltip, %fieldData) +function ESettingsWindow::getThemeSettings(%this) { - %moddedSettingsFieldName = strreplace(%settingsFieldName, "/", "-"); - %this.addCallbackField(%moddedSettingsFieldName, %labelText, %fieldType, "", EditorSettings.value(%settingsFieldName), %fieldData, "changeEditorSetting"); -} + SettingsInspector.startGroup("Colors"); + SettingsInspector.addSettingsField("Theme/headerColor", "Headerbar Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/windowBackgroundColor", "Window Background Color", "ColorI", ""); + + SettingsInspector.addSettingsField("Theme/tabsColor", "Tabs Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/tabsHLColor", "Tabs Highlight Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/tabsSELColor", "Tabs Selected Color", "ColorI", ""); + + SettingsInspector.addSettingsField("Theme/dividerDarkColor", "Divider Dark Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/dividerMidColor", "Divider Mid Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/dividerLightColor", "Divider Light Color", "ColorI", ""); + + SettingsInspector.addSettingsField("Theme/headerTextColor", "Header Text Color", "ColorI", ""); + + SettingsInspector.addSettingsField("Theme/fieldTextColor", "Field Text Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/fieldTextHLColor", "Field Text Highlight Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/fieldTextSELColor", "Field Text Selected Color", "ColorI", ""); + + SettingsInspector.addSettingsField("Theme/fieldBGColor", "Field Background Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/fieldBGHLColor", "Field Background Highlight Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/fieldBGSELColor", "Field Background Selected Color", "ColorI", ""); + + SettingsInspector.addSettingsField("Theme/tooltipBGColor", "Tooltip Background Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/tooltipTextColor", "Tooltip Text Highlight Color", "ColorI", ""); + SettingsInspector.addSettingsField("Theme/tooltipDivColor", "Tooltip Divider Color", "ColorI", ""); + SettingsInspector.endGroup(); +} +// +// COMMON GAME SETTINGS +// +function ESettingsWindow::getGameGeneralSettings(%this) +{ + SettingsInspector.startGroup("General"); + SettingsInspector.addSettingsField("General/ProjectName", "Project Name", "string", ""); + SettingsInspector.endGroup(); +} -function SettingsInspector::changeEditorSetting(%this, %varName, %value) +function ESettingsWindow::getPathsSettings(%this) { - %varName = strreplace(%varName, "-", "/"); + SettingsInspector.startGroup("Paths"); + SettingsInspector.addSettingsField("Paths/splashImagePath", "Splash Image", "filename", ""); + SettingsInspector.addSettingsField("Paths/iconImagePath", "Icon Image", "filename", ""); + SettingsInspector.addSettingsField("Paths/missingTexturePath", "Missing Texture Image", "filename", ""); + SettingsInspector.addSettingsField("Paths/noMaterialPath", "No Material Image", "filename", ""); + SettingsInspector.addSettingsField("Paths/errorMaterialMath", "Error Material Image", "filename", ""); + SettingsInspector.endGroup(); +} + +function ESettingsWindow::getUISettings(%this) +{ + SettingsInspector.startGroup("UI"); + SettingsInspector.addSettingsField("UI/playGUIName", "Play GUI Name", "string", ""); + SettingsInspector.addSettingsField("UI/mainMenuName", "Main Menu GUI Name", "string", ""); + SettingsInspector.endGroup(); +} + +function ESettingsWindow::getAssetManagementSettings(%this) +{ + SettingsInspector.startGroup("Modules"); + SettingsInspector.addSettingsField("AssetManagement/Modules/coreModulePath", "Core Module Path", "string", ""); + SettingsInspector.addSettingsField("AssetManagement/Modules/gameDataModulePath", "Game Data Module Path", "string", ""); + SettingsInspector.addSettingsField("AssetManagement/Modules/moduleExtension", "Module Extension", "string", ""); + SettingsInspector.endGroup(); - echo("Set " @ %varName @ " to be " @ %value); - - EditorSettings.setValue(%varName, %value); - - %id = ESettingsWindowList.getSelectedRow(); - ESettingsWindowList.setSelectedRow(%id); -} \ No newline at end of file + SettingsInspector.startGroup("Assets"); + SettingsInspector.addSettingsField("AssetManagement/Assets/assetExtension", "Asset Extension", "string", ""); + SettingsInspector.addSettingsField("AssetManagement/Assets/datablockCaching", "Cache Datablocks", "bool", ""); + //SettingsInspector.addSettingsField("AssetManagement/Assets/moduleExtension", "Module Extension", "string", ""); + SettingsInspector.endGroup(); +} + +function ESettingsWindow::getGameplaySettings(%this) +{ + SettingsInspector.startGroup("Game Modes"); + SettingsInspector.addSettingsField("Gameplay/GameModes/defaultModeName", "Default Gamemode Name", "string", ""); + SettingsInspector.endGroup(); +} + +function ESettingsWindow::getGameOptionsSettings(%this) +{ + SettingsInspector.startGroup("Game Modes"); + SettingsInspector.addSettingsField("Gameplay/GameModes/defaultModeName", "Default Gamemode Name", "string", ""); + SettingsInspector.endGroup(); +} \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/gui/images/button.png b/Templates/BaseGame/game/tools/gui/images/button.png index 1c7361e25e5f19d68d0029199ada0b836793d137..79c3e391b039259875611f9e86eff774afd1f0f7 100644 GIT binary patch delta 2938 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 delta 1133 zcmV-z1d{uJ7l8?oBYyxHbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$ zBS}O-RCwC#SUXP}K@c9FPYw^8m%%oMfKd_!DTF2uT7E!iNEt<0)D@a$l(zpqg%($>2F^?<-zaw4^2%?<=58M^0X0) zgiXbfhkTren1pZc@9&59HZL3>9n!a9uN8(P5BaLafC_wFU0rZ?c6O;XBMYWQE6v8GkC&RCUY?k0YNsT4tK4n*?LNiEs(ZY-L*@bB{qhhI4Vw0{%?~)AKjE zgrlP)+B>*0-+0_nSAPS$pm63X21`)RTS8vpe4rTkKsiqVw?%n_ZOos)jn~@+^G@SN zG)e^<8}q{B{At8(jI6J(Lv2kBagw4sOVJ6#k%xRWHh)qDqcbxzkV>baqqCC|vDXU2 zk%xSoN1b>oyQXJnXMso|DwAJ}^{W7M%U zpy1kVHXB&2){D2zVkzOt3`8j_vG5A69MVuTlgg&HidbOI5-RG%$}hp3(>ORd2u`OH zs;jHvX>Tw5Tw2l*wfOk>c=0qw5{bl>-Wrd`OMml1I2?w}&CL=YXocZ8d1>iKX5Z&_X_yIzo4y?||gejfVNUfUS%a=B=|pytv-Ucmc5K5T7mrDWD? z8{)WIeSLj5P%q5S%|Sf&hl1N%n>wK%5P6O~VZA`LNrl5{mBfcs65yo@)X**&DG-Ey zp??L^buD1Y#VE;GZodWWxlx)F;j)IJ>2)eDP;kK#L?)P*Tnh$X;6%6q3(P%@>12|E z*lUI1qSJ`=f)69jGP%ZKs8|+U^B9giu3qrTYP}G|Fr`MCVy{y|aGcE53&C4ZFT8s5 z0Y=`xc9OA|i0#>nm!a>A3(vJg4$oqA8-E%5x{G-~6Bd*=<0K3Bx${ZZ% z6fhhM@ED1WN-h^6N)z}YdE2~gqz15GD!Jknz~iA|-^;eqRz<+8RIXTX;5>6~DCn36 z4<8kQhQ`KFa(`dv11%o@{fjzQ7MXnIe}UX7C{KZTcjdcXxV{2&PNU21DFXL9I%Yx} z(Wve;YVn=zEqWU9JIJ1#oaiEtQA9$?o}Pjl8|jA>KS-w_o6TNI!6|uJDn&CDtvV!( zuH-=^mE6xJ{_apB_F7?hI-SZQALk+VPk;dcQd{ugkdaD=00000NkvXXu0mjfl*|)v diff --git a/Templates/BaseGame/game/tools/gui/images/tab.png b/Templates/BaseGame/game/tools/gui/images/tab.png index 76080d74d1a508f68e6d04bc88b9eb806f4b50b2..b7b7c98717c835e4a540ec7c93c26af799ce5f53 100644 GIT binary patch delta 4125 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 KRjpC64gVLSU(8$p literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^&Oltj!3HE(mix;BDVAa<&kznEsNqQI0P;BtJR*x3 z82FBWFymBhK53w!WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc|`>j5(ez zjv*Cu-rh3Ix*H(iaB=yAxf)&z-_&asCLV9y+jgHr)bC|<%}j;a{k+e&FemL$5N%#| z-7tY3%xAKZ@(^>(;+s``z+w#{JVzjpoJ2{d+BGZ&$tYy-$yT@(~V0CtQ>o z`$O}~Hs`~W|I}7V*+2hz?f0CrE${ce=R1_%A(+%6q3DK#D*wGtp6~wbT37kI*BvdE zrADqhR#8zSvwzxCh!NXz2^(>Hn=HbJKZ-K@Bym~?cFGTD3z?R~*+Tf-ML_N&|J$pP V&L^+VKL(5(22WQ%mvv4FO#q@{v@!qy diff --git a/Templates/BaseGame/game/tools/gui/images/window.png b/Templates/BaseGame/game/tools/gui/images/window.png index 4d264bb24044980f1968e62d94032d57a08243c1..9aff5d276027ca3e67a5877fd8cd2c7930720a75 100644 GIT binary patch literal 5308 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 bK%MWfG^ro4<0R$g{&9h7FI1t*HWB{=9-9^C literal 861 zcmeAS@N?(olHy`uVBq!ia0vp^4nSPS!3HENyr$*>DVAa<&kznEsNqQI0P;BtJR*x3 z82FBWFymBhK53w!WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc|`>Ot(B; z978JRyq&u@?{a`d+x_=fZte;;l;G41>f1btJHai)!-FTZJT2i7+l`F;hOHciPLexW z*jhexDoM;@oN62W=(FLI_Dk}C(v!kZ{+zdT+v~-4RW&l#mpi*Mx*qbF?8vpkMB=yp z<5zt<^=|%T{##cc9y*`l#!Oi&(TRusmVeHR6!Q7ELrSqld{xwzsI}>D%YIuk@US)C zo_z9&gGwd%@n|{QmF9KXZJmxK#eH{xH?QF+`wRI;Y_-lXMGf z0{4cE3^|NuVhy?njxlXuy%E8%jbZi^<{P&YCOdvJ+u;b}OLHF(OGswC!IY!J5Z%xV z(&TB^u$R|NG9|wmzajIUZ)KXp)4pTs^R0CrlMPoZF*kgyh{+C^`#E}T*jvNZDnHLN zV49BANht^3r>=e-^!?AW - - Grid_512_Orange + + 72 70 68 255 + 234 232 230 255 + 100 98 96 255 + 96 94 92 255 + 59 58 57 255 + 50 49 48 255 + 72 70 68 255 + 50 49 48 255 + 240 240 240 255 + 59 58 57 255 + 236 234 232 255 + 50 49 48 255 + 37 36 35 255 + 178 175 172 255 + 43 43 43 255 + 17 16 15 255 + 255 255 255 255 + 32 31 30 255 + + + tools/gui + 1024 768 + + http://www.garagegames.com/products/torque-3d/documentation/user + ../../../Documentation/Torque 3D - Script Manual.chm + ../../../Documentation/Official Documentation.html + + + 1 + 2 + 8 + 1 + 1 + 1 + 0 + 1 + + + 1 + 1 + + + 0 + 0 + 0 + + + Categorized + + + 0 + + + + 0 + 1 + 0.8 + 100 + 0.8 + 15 + 0 + + 0 + 0 + 0 + 500 + 10 10 10 + 255 255 255 20 + + + + 0 + 50 + AssetWork_Debug.exe + 40 + screenCenter + 6 + 1 + WorldEditorInspectorPlugin + + 255 255 0 255 + 255 0 0 255 + 255 255 255 255 + 255 255 0 255 + 0 0 255 255 + 0 255 0 255 + 100 100 100 255 + + + 1 + 100 + 0 + 0 + 0 + 1 + 2 + + + 1 + 0 + 255 + 20 + 8 + + + 50 50 50 255 + 215 215 215 255 + 48 48 48 255 + 255 255 255 255 + 180 180 180 255 + + + tools/worldEditor/images/DefaultHandle + tools/worldEditor/images/SelectHandle + tools/worldEditor/images/LockedHandle + + + 1 + 1 + 1 + 1 + 1 + + + 51 51 51 100 + 0 + 255 255 255 100 + 1 + 102 102 102 100 + + + ../../../Documentation/Official Documentation.html + ../../../Documentation/Torque 3D - Script Manual.chm + http://www.garagegames.com/products/torque-3d/documentation/user + http://www.garagegames.com/products/torque-3d/forums + + + + AIPlayer data/FPSGameplay/levels @@ -14,125 +152,7 @@ - - screenCenter - 0 - WorldEditorInspectorPlugin - 1 - 40 - AssetWork_Debug.exe - 6 - 50 - - 255 255 255 255 - 100 100 100 255 - 255 255 0 255 - 255 255 0 255 - 0 0 255 255 - 255 0 0 255 - 0 255 0 255 - - - 48 48 48 255 - 255 255 255 255 - 215 215 215 255 - 180 180 180 255 - 50 50 50 255 - - - 100 - 0 - 0 - 0 - 1 - 2 - 1 - - - 51 51 51 100 - 102 102 102 100 - 1 - 255 255 255 100 - 0 - - - tools/worldEditor/images/DefaultHandle - tools/worldEditor/images/SelectHandle - tools/worldEditor/images/LockedHandle - - - http://www.garagegames.com/products/torque-3d/forums - ../../../Documentation/Official Documentation.html - ../../../Documentation/Torque 3D - Script Manual.chm - http://www.garagegames.com/products/torque-3d/documentation/user - - - 1 - 0 - 255 - 20 - 8 - - - 1 - 1 - 1 - 1 - 1 - - - - 0.8 - 100 - 0.8 - 15 - 0 - 0 - 1 - - 0 - 255 255 255 20 - 0 - 10 10 10 - 0 - 500 - - - - tools/gui - 1024 768 - - 0 - 0 - 0 - - - http://www.garagegames.com/products/torque-3d/documentation/user - ../../../Documentation/Torque 3D - Script Manual.chm - ../../../Documentation/Official Documentation.html - - - 1 - 1 - 8 - 1 - 1 - 2 - 1 - 0 - - - 0 - - - 1 - 1 - - - Categorized - - - - AIPlayer + + Grid_512_Orange diff --git a/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui index 0435e3837..ccaaf03fb 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui @@ -25,7 +25,7 @@ canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "menubarProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index f860bdd42..33433fa68 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -23,7 +23,7 @@ canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "menubarProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; Position = "0 0"; @@ -313,7 +313,7 @@ canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "menubarProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "top"; Position = "0 578"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui index f57c39be7..1f15e5310 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui @@ -4,7 +4,7 @@ Enabled = "0"; internalName = "ToolsToolbar"; isContainer = "1"; - Profile = "editorMenubarProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "0 31"; @@ -20,7 +20,7 @@ canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "ToolsGuiDefaultProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; position = "4 3"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui index 79f34211d..95e48baaf 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorToolbar.ed.gui @@ -4,7 +4,7 @@ internalName = "WorldEditorToolbar"; Enabled = "1"; isContainer = "1"; - Profile = "ToolsGuiDefaultProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "right"; VertSizing = "bottom"; Position = "306 0"; @@ -21,7 +21,7 @@ canSaveDynamicFields = "0"; Enabled = "1"; isContainer = "1"; - Profile = "ToolsGuiDefaultProfile"; + Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; Position = "0 3"; @@ -83,7 +83,7 @@ new GuiControl(SnapToBar){ isContainer = "1"; - profile = "ToolsGuiDefaultProfile"; + profile = "ToolsMenubarProfile"; Position = "116 3"; Extent = "123 27"; Padding = "4"; @@ -296,7 +296,7 @@ new GuiControl(ToggleButtonBar){ isContainer = "1"; - profile = "ToolsGuiDefaultProfile"; + profile = "ToolsMenubarProfile"; Position = "313 3"; Extent = "65 27"; @@ -377,7 +377,7 @@ new GuiControl(ToggleNodeBar){ isContainer = "1"; - profile = "ToolsGuiDefaultProfile"; + profile = "ToolsMenubarProfile"; Position = "386 3"; Extent = "63 27"; @@ -441,7 +441,7 @@ new GuiControl(PrefabBar){ isContainer = "1"; - profile = "ToolsGuiDefaultProfile"; + profile = "ToolsMenubarProfile"; Position = "386 3"; Extent = "63 27"; visible = true; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui index cae52e378..92966857f 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/WorldEditorTreeWindow.ed.gui @@ -274,6 +274,7 @@ canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; + profile = "ToolsGuiScrollProfile"; hovertime = "1000"; Docking = "Client"; Margin = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorCreatorWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorCreatorWindow.ed.gui index 03a3d6d8a..31652d293 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorCreatorWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiWorldEditorCreatorWindow.ed.gui @@ -79,6 +79,7 @@ canSave = "1"; Visible = "1"; tooltipprofile = "ToolsGuiToolTipProfile"; + profile = "ToolsGuiScrollProfile"; hovertime = "1000"; Docking = "Client"; Margin = "0 0 0 0"; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs index 574063460..1b2e5de3d 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/lightViz.cs @@ -51,13 +51,11 @@ function toggleColorBufferViz( %enable ) } else if ( %enable ) { - AL_DeferredShading.disable(); AL_ColorBufferVisualize.enable(); } else if ( !%enable ) { AL_ColorBufferVisualize.disable(); - AL_DeferredShading.enable(); } } @@ -360,12 +358,7 @@ function toggleBackbufferViz( %enable ) if ( %enable $= "" ) { $AL_BackbufferVisualizeVar = AL_DeferredShading.isEnabled() ? true : false; - AL_DeferredShading.toggle(); } - else if ( %enable ) - AL_DeferredShading.disable(); - else if ( !%enable ) - AL_DeferredShading.enable(); } function toggleColorBlindnessViz( %enable ) diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs index 7f87df251..43bb65ea4 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs @@ -116,7 +116,7 @@ function EditorGui::buildMenus(%this) extent = Canvas.extent.x SPC "20"; minExtent = "320 20"; horizSizing = "width"; - profile = "GuiMenuBarProfile"; + profile = "ToolsGuiMenuBarProfile"; }; // File Menu @@ -185,11 +185,12 @@ function EditorGui::buildMenus(%this) Item[9] = "Select..." TAB "" TAB "EditorGui.toggleObjectSelectionsWindow();"; item[10] = "-"; item[11] = "Audio Parameters..." TAB "" TAB "EditorGui.toggleSFXParametersWindow();"; - item[12] = "Editor Settings..." TAB "" TAB "ESettingsWindow.ToggleVisibility();"; - item[13] = "Snap Options..." TAB "" TAB "ESnapOptions.ToggleVisibility();"; - item[14] = "-"; - item[15] = "Game Options..." TAB "" TAB "Canvas.pushDialog(optionsDlg);"; - item[16] = "PostEffect Manager" TAB "" TAB "Canvas.pushDialog(PostFXManager);"; + item[12] = "Editor Settings..." TAB "" TAB "ESettingsWindow.toggleEditorSettings();"; + item[13] = "Game Settings..." TAB "" TAB "ESettingsWindow.toggleProjectSettings();"; + item[14] = "Snap Options..." TAB "" TAB "ESnapOptions.ToggleVisibility();"; + item[15] = "-"; + item[16] = "Game Options..." TAB "" TAB "Canvas.pushDialog(optionsDlg);"; + item[17] = "PostEffect Manager" TAB "" TAB "Canvas.pushDialog(PostFXManager);"; }; %this.menuBar.insert(%editMenu);