From cd821862313de223ee7fc4eea40bdd39ff1c5c3c Mon Sep 17 00:00:00 2001 From: Areloch Date: Tue, 30 Aug 2022 01:29:39 -0500 Subject: [PATCH] Fixes setter issue for image/shape/material custom inspector fields where it was not correctly passing through the changed value from the Asset Browser select Swapped the water's disableTrueReflections variable to be enableTrueReflections for simplicity and consistency(also fixed a persistent typo) Swapped disableVerticalSync to be enableVerticalSync for simplicity and consistency Swapped disableParallaxMapping to be enableParallaxMapping for simplicity and consistency Fix click detection on slider mode entries for guiGameSettingsCtrl so the click position correctly matches the percentage Fixed problem where postFX initialization would always exec default.postfxpreset.tscript, even if a level's got it's own preset, which can cause problems Fixed range field type behavior so that editing the values applies in real time, and also consistently applies between slider and text field --- Engine/source/T3D/assets/ImageAsset.cpp | 2 +- Engine/source/T3D/assets/MaterialAsset.cpp | 2 +- Engine/source/T3D/assets/ShapeAsset.cpp | 2 +- Engine/source/environment/waterObject.cpp | 22 +++---- Engine/source/environment/waterObject.h | 6 +- Engine/source/gfx/D3D11/gfxD3D11Device.cpp | 2 +- Engine/source/gfx/D3D11/gfxD3D11Target.cpp | 2 +- Engine/source/gfx/gfxDevice.cpp | 6 +- Engine/source/gfx/gfxDevice.h | 2 +- Engine/source/gfx/gl/gfxGLDevice.cpp | 6 +- .../gui/controls/guiGameSettingsCtrl.cpp | 65 +++++++------------ Engine/source/materials/materialManager.cpp | 6 +- .../scripts/client/levelDownload.tscript | 8 +-- .../scripts/default.postfxpreset.tscript | 6 -- .../game/core/postFX/scripts/postFx.tscript | 7 ++ .../rendering/scripts/graphicsOptions.tscript | 20 +++--- .../game/core/utility/scripts/globals.tscript | 4 +- .../game/data/UI/guis/optionsMenu.tscript | 12 ++-- Templates/BaseGame/game/data/defaults.tscript | 6 +- .../game/tools/gui/fieldTypes/range.tscript | 7 +- 20 files changed, 91 insertions(+), 102 deletions(-) diff --git a/Engine/source/T3D/assets/ImageAsset.cpp b/Engine/source/T3D/assets/ImageAsset.cpp index a2227691e..7e56c555f 100644 --- a/Engine/source/T3D/assets/ImageAsset.cpp +++ b/Engine/source/T3D/assets/ImageAsset.cpp @@ -491,7 +491,7 @@ GuiControl* GuiInspectorTypeImageAssetPtr::constructEditControl() { //if we don't have a target object, we'll be manipulating the desination value directly char szBuffer[512]; - dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"ImageAsset\", \"AssetBrowser.changeAsset\", %s, %s);", + dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"ImageAsset\", \"AssetBrowser.changeAsset\", %s, \"%s\");", mInspector->getIdString(), mVariableName); mBrowseButton->setField("Command", szBuffer); } diff --git a/Engine/source/T3D/assets/MaterialAsset.cpp b/Engine/source/T3D/assets/MaterialAsset.cpp index d68381e41..de46d18f8 100644 --- a/Engine/source/T3D/assets/MaterialAsset.cpp +++ b/Engine/source/T3D/assets/MaterialAsset.cpp @@ -491,7 +491,7 @@ GuiControl* GuiInspectorTypeMaterialAssetPtr::constructEditControl() else { //if we don't have a target object, we'll be manipulating the desination value directly - dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"MaterialAsset\", \"AssetBrowser.changeAsset\", %s, %s);", + dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"MaterialAsset\", \"AssetBrowser.changeAsset\", %s, \"%s\");", mInspector->getIdString(), mVariableName); mBrowseButton->setField("Command", szBuffer); } diff --git a/Engine/source/T3D/assets/ShapeAsset.cpp b/Engine/source/T3D/assets/ShapeAsset.cpp index e00cc73d0..1cc848741 100644 --- a/Engine/source/T3D/assets/ShapeAsset.cpp +++ b/Engine/source/T3D/assets/ShapeAsset.cpp @@ -760,7 +760,7 @@ GuiControl* GuiInspectorTypeShapeAssetPtr::constructEditControl() else { //if we don't have a target object, we'll be manipulating the desination value directly - dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"ShapeAsset\", \"AssetBrowser.changeAsset\", %s, %s);", + dSprintf(szBuffer, sizeof(szBuffer), "AssetBrowser.showDialog(\"ShapeAsset\", \"AssetBrowser.changeAsset\", %s, \"%s\");", mInspector->getIdString(), mVariableName); mBrowseButton->setField("Command", szBuffer); } diff --git a/Engine/source/environment/waterObject.cpp b/Engine/source/environment/waterObject.cpp index 7aba59163..246e95c78 100644 --- a/Engine/source/environment/waterObject.cpp +++ b/Engine/source/environment/waterObject.cpp @@ -137,7 +137,7 @@ void WaterMatParams::init( BaseMatInstance* matInst ) bool WaterObject::smWireframe = false; -bool WaterObject::smDisableTrueReflections = false; +bool WaterObject::smEnableTrueReflections = true; //------------------------------------------------------------------------- // WaterObject Class @@ -406,7 +406,7 @@ void WaterObject::consoleInit() { Parent::consoleInit(); - Con::addVariable( "$pref::Water::disableTrueReflections", TypeBool, &WaterObject::smDisableTrueReflections, + Con::addVariable( "$pref::Water::EnableTrueReflections", TypeBool, &WaterObject::smEnableTrueReflections, "Force all water objects to use static cubemap reflections.\n" "@ingroup Water"); } @@ -438,7 +438,7 @@ bool WaterObject::_setFullReflect( void *object, const char *index, const char * { bool isEnabled = water->mPlaneReflector.isEnabled(); - bool enable = water->mFullReflect && !smDisableTrueReflections; + bool enable = water->mFullReflect && smEnableTrueReflections; if ( enable && !isEnabled ) water->mPlaneReflector.registerReflector( water, &water->mReflectorDesc ); @@ -582,7 +582,7 @@ void WaterObject::unpackUpdate( NetConnection * conn, BitStream *stream ) mReflectorDesc.useOcclusionQuery = stream->readFlag(); mReflectorDesc.texSize = stream->readInt( 32 ); - if ( isProperlyAdded() && !mPlaneReflector.isEnabled() && !smDisableTrueReflections ) + if ( isProperlyAdded() && !mPlaneReflector.isEnabled() && smEnableTrueReflections ) mPlaneReflector.registerReflector( this, &mReflectorDesc ); } else @@ -868,8 +868,8 @@ bool WaterObject::onAdd() if ( !Parent::onAdd() ) return false; - Con::NotifyDelegate clbk( this, &WaterObject::_onDisableTrueRelfections ); - Con::addVariableNotify( "$pref::Water::disableTrueReflections", clbk ); + Con::NotifyDelegate clbk( this, &WaterObject::_onEnableTrueReflections ); + Con::addVariableNotify( "$pref::Water::EnableTrueReflections", clbk ); if ( isClientObject() ) { @@ -886,7 +886,7 @@ bool WaterObject::onAdd() initTextures(); - if ( mFullReflect && !smDisableTrueReflections ) + if ( mFullReflect && smEnableTrueReflections ) mPlaneReflector.registerReflector( this, &mReflectorDesc ); } @@ -895,8 +895,8 @@ bool WaterObject::onAdd() void WaterObject::onRemove() { - Con::NotifyDelegate clbk( this, &WaterObject::_onDisableTrueRelfections ); - Con::removeVariableNotify( "$pref::Water::disableTrueReflections", clbk ); + Con::NotifyDelegate clbk( this, &WaterObject::_onEnableTrueReflections ); + Con::removeVariableNotify( "$pref::Water::EnableTrueReflections", clbk ); if ( isClientObject() ) { @@ -911,14 +911,14 @@ void WaterObject::onRemove() Parent::onRemove(); } -void WaterObject::_onDisableTrueRelfections() +void WaterObject::_onEnableTrueReflections() { // Same code as _setFullReflect if ( isProperlyAdded() && isClientObject() ) { bool isEnabled = mPlaneReflector.isEnabled(); - bool enable = mFullReflect && !smDisableTrueReflections; + bool enable = mFullReflect && smEnableTrueReflections; if ( enable && !isEnabled ) mPlaneReflector.registerReflector( this, &mReflectorDesc ); diff --git a/Engine/source/environment/waterObject.h b/Engine/source/environment/waterObject.h index 17d5d8428..7c6bb7df2 100644 --- a/Engine/source/environment/waterObject.h +++ b/Engine/source/environment/waterObject.h @@ -199,8 +199,8 @@ protected: virtual void _getWaterPlane( const Point3F &camPos, PlaneF &outPlane, Point3F &outPos ) {} - /// Callback used internally when smDisableTrueReflections changes. - void _onDisableTrueRelfections(); + /// Callback used internally when smEnableTrueReflections changes. + void _onEnableTrueReflections(); void onRippleTexChanged() {} void onFoamTexChanged() {} @@ -307,7 +307,7 @@ protected: static bool smWireframe; /// Force all water objects to use static cubemap reflections - static bool smDisableTrueReflections; + static bool smEnableTrueReflections; // Rendering bool mBasicLighting; diff --git a/Engine/source/gfx/D3D11/gfxD3D11Device.cpp b/Engine/source/gfx/D3D11/gfxD3D11Device.cpp index 1b578c34b..b1af047bb 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Device.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11Device.cpp @@ -228,7 +228,7 @@ DXGI_SWAP_CHAIN_DESC GFXD3D11Device::setupPresentParams(const GFXVideoMode &mode mMultisampleDesc = sampleDesc; - d3dpp.BufferCount = !smDisableVSync ? 2 : 1; // triple buffering when vsync is on. + d3dpp.BufferCount = smEnableVSync ? 2 : 1; // triple buffering when vsync is on. d3dpp.BufferDesc.Width = mode.resolution.x; d3dpp.BufferDesc.Height = mode.resolution.y; d3dpp.BufferDesc.Format = GFXD3D11TextureFormat[GFXFormatR8G8B8A8_SRGB]; diff --git a/Engine/source/gfx/D3D11/gfxD3D11Target.cpp b/Engine/source/gfx/D3D11/gfxD3D11Target.cpp index 29eb8fb46..cd5973ac1 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11Target.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11Target.cpp @@ -367,7 +367,7 @@ GFXFormat GFXD3D11WindowTarget::getFormat() bool GFXD3D11WindowTarget::present() { - HRESULT hr = mSwapChain->Present(!D3D11->smDisableVSync, 0); + HRESULT hr = mSwapChain->Present(D3D11->smEnableVSync, 0); if (hr == DXGI_ERROR_DEVICE_REMOVED) { HRESULT result = D3D11->getDevice()->GetDeviceRemovedReason(); diff --git a/Engine/source/gfx/gfxDevice.cpp b/Engine/source/gfx/gfxDevice.cpp index 9895057a7..71d345f81 100644 --- a/Engine/source/gfx/gfxDevice.cpp +++ b/Engine/source/gfx/gfxDevice.cpp @@ -47,7 +47,7 @@ GFXDevice * GFXDevice::smGFXDevice = NULL; bool GFXDevice::smWireframe = false; -bool GFXDevice::smDisableVSync = true; +bool GFXDevice::smEnableVSync = false; F32 GFXDevice::smForcedPixVersion = -1.0f; bool GFXDevice::smDisableOcclusionQuery = false; bool gDisassembleAllShaders = false; @@ -71,8 +71,8 @@ void GFXDevice::initConsole() "them to return only the visibile state.\n" "@ingroup GFX\n" ); - Con::addVariable( "$pref::Video::disableVerticalSync", TypeBool, &smDisableVSync, - "Disables vertical sync on the active device.\n" + Con::addVariable( "$pref::Video::enableVerticalSync", TypeBool, &smEnableVSync, + "Enables vertical sync on the active device.\n" "@note The video mode must be reset for the change to take affect.\n" "@ingroup GFX\n" ); diff --git a/Engine/source/gfx/gfxDevice.h b/Engine/source/gfx/gfxDevice.h index 1e2b68bab..98c0184f4 100644 --- a/Engine/source/gfx/gfxDevice.h +++ b/Engine/source/gfx/gfxDevice.h @@ -525,7 +525,7 @@ protected: static bool smWireframe; /// The global vsync state. - static bool smDisableVSync; + static bool smEnableVSync; /// The forced shader model version if non-zero. static F32 smForcedPixVersion; diff --git a/Engine/source/gfx/gl/gfxGLDevice.cpp b/Engine/source/gfx/gl/gfxGLDevice.cpp index e550b2f88..88026a56c 100644 --- a/Engine/source/gfx/gl/gfxGLDevice.cpp +++ b/Engine/source/gfx/gl/gfxGLDevice.cpp @@ -180,11 +180,11 @@ void GFXGLDevice::initGLState() } #endif - PlatformGL::setVSync(smDisableVSync ? 0 : 1); + PlatformGL::setVSync(smEnableVSync); //install vsync callback Con::NotifyDelegate clbk(this, &GFXGLDevice::vsyncCallback); - Con::addVariableNotify("$pref::Video::disableVerticalSync", clbk); + Con::addVariableNotify("$pref::Video::enableVerticalSync", clbk); //OpenGL 3 need a binded VAO for render GLuint vao; @@ -200,7 +200,7 @@ void GFXGLDevice::initGLState() void GFXGLDevice::vsyncCallback() { - PlatformGL::setVSync(smDisableVSync ? 0 : 1); + PlatformGL::setVSync(smEnableVSync); } GFXGLDevice::GFXGLDevice(U32 adapterIndex) : diff --git a/Engine/source/gui/controls/guiGameSettingsCtrl.cpp b/Engine/source/gui/controls/guiGameSettingsCtrl.cpp index 3a1822e0a..618b3acb8 100644 --- a/Engine/source/gui/controls/guiGameSettingsCtrl.cpp +++ b/Engine/source/gui/controls/guiGameSettingsCtrl.cpp @@ -776,55 +776,38 @@ IMPLEMENT_CONOBJECT(GuiGameSettingsCtrl); void GuiGameSettingsCtrl::clickSlider(S32 xPos) { - F32 xScale = (float)getWidth(); + RectI sliderRect; - S32 leftArrowX1 = mColumnSplit; - S32 leftArrowX2 = leftArrowX1 + mArrowSize; + S32 sliderOffset = 5; + S32 height = getHeight(); - S32 rightArrowX2 = getWidth() - mRightPad; - S32 rightArrowX1 = rightArrowX2 - mArrowSize; + RectI optionRect; - S32 sliderWidth = rightArrowX1 - leftArrowX2; - sliderWidth *= 0.6; //remove the number text spacing + sliderRect.point.x = mColumnSplit + mArrowSize; + sliderRect.point.y = sliderOffset; - /*if ((leftArrowX1 <= xPos) && (xPos <= leftArrowX2)) + sliderRect.extent.x = (getWidth() - mRightPad - mArrowSize) - sliderRect.point.x; + sliderRect.extent.y = height - sliderOffset * 2; + + optionRect = sliderRect; + + S32 textWidth = sliderRect.extent.x * 0.3; + sliderRect.extent.x -= textWidth; + + //Now adjust the bar to match-to our value + + S32 barStart = sliderRect.point.x; + S32 barEnd = sliderRect.point.x + sliderRect.extent.x; + + if (xPos >= barStart && xPos <= barEnd) { - mValue -= mStepSize; + //find the position + F32 newValue = (((xPos - barStart) * (mRange.y - mRange.x)) / (barEnd - barStart)) + mRange.x; - mValue = mRound(mValue / mStepSize) * mStepSize; - - if (mValue < mRange.x) - mValue = mRange.x; + newValue = mRound(newValue / mStepSize) * mStepSize; + mValue = newValue; } - else if ((rightArrowX1 <= xPos) && (xPos <= rightArrowX2)) - { - //F32 snap = mValue % mStepSize; - //mValue.y -= snap; - - mValue += mStepSize; - - mValue = mRound(mValue / mStepSize) * mStepSize; - - if (mValue > mRange.y) - mValue = mRange.y; - } - else - {*/ - //see if we clicked on the sliderbar itself - S32 barStart = leftArrowX2; - S32 barEnd = barStart + sliderWidth; - - if (xPos >= barStart && xPos <= barEnd) - { - //find the position - F32 newValue = (((xPos - barStart) * (mRange.y - mRange.x)) / (barEnd - barStart)) + mRange.x; - - newValue = mRound(newValue / mStepSize) * mStepSize; - - mValue = newValue; - } - //} onChange_callback(); } diff --git a/Engine/source/materials/materialManager.cpp b/Engine/source/materials/materialManager.cpp index 376b67a4e..e0496e2d2 100644 --- a/Engine/source/materials/materialManager.cpp +++ b/Engine/source/materials/materialManager.cpp @@ -87,8 +87,8 @@ MaterialManager::MaterialManager() Con::addVariableNotify( "$pref::Video::disableNormalMapping", callabck2 ); Con::setVariable( "$pref::Video::disableCubemapping", "false" ); Con::addVariableNotify( "$pref::Video::disableCubemapping", callabck2 ); - Con::setVariable( "$pref::Video::disableParallaxMapping", "false" ); - Con::addVariableNotify( "$pref::Video::disableParallaxMapping", callabck2 ); + Con::setVariable( "$pref::Video::enableParallaxMapping", "true" ); + Con::addVariableNotify( "$pref::Video::enableParallaxMapping", callabck2 ); } MaterialManager::~MaterialManager() @@ -472,7 +472,7 @@ void MaterialManager::recalcFeaturesFromPrefs() Con::getBoolVariable( "$pref::Video::disableCubemapping", false ) ); mExclusionFeatures.setFeature( MFT_Parallax, - Con::getBoolVariable( "$pref::Video::disableParallaxMapping", false ) ); + !Con::getBoolVariable( "$pref::Video::enableParallaxMapping", true ) ); } bool MaterialManager::_handleGFXEvent( GFXDevice::GFXDeviceEventType event_ ) diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript b/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript index 1149424df..665e3812e 100644 --- a/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript +++ b/Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript @@ -45,12 +45,12 @@ function clientCmdMissionStartPhase1_LoadCache(%seq, %levelAsset) { if ($pref::Client::EnableDatablockCache && $loadFromDatablockCache) { - if (!$pref::Video::disableVerticalSync) + if ($pref::Video::enableVerticalSync) { warn("Disabling Vertical Sync during datablock cache load to avoid significant slowdown."); $AFX_tempDisableVSync = true; - $pref::Video::disableVerticalSync = true; + $pref::Video::enableVerticalSync = false; Canvas.resetVideoMode(); } @@ -75,7 +75,7 @@ function updateLoadDatablockCacheProgress(%seq, %levelAsset) warn("Restoring Vertical Sync setting."); $AFX_tempDisableVSync = false; - $pref::Video::disableVerticalSync = false; + $pref::Video::enableVerticalSync = true; Canvas.resetVideoMode(); } @@ -96,7 +96,7 @@ function updateLoadDatablockCacheProgress(%seq, %levelAsset) warn("Restoring Vertical Sync setting."); $AFX_tempDisableVSync = false; - $pref::Video::disableVerticalSync = false; + $pref::Video::enableVerticalSync = true; Canvas.resetVideoMode(); } diff --git a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript index 87cbec96c..3f8a9d85b 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript +++ b/Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript @@ -13,9 +13,3 @@ $PostFX::HDRPostFX::enableAutoExposure = "0"; $PostFX::HDRPostFX::keyValue = "0.18"; $PostFX::HDRPostFX::enableBlueShift = "0"; $PostFX::HDRPostFX::blueShiftColor = "1.05 0.97 1.27"; -$PostFX::SharpenPostFX::Enabled = "1"; -$PostFX::SharpenPostFX::sharpness = "0.15"; -$PostFX::VignettePostFX::Enabled = "1"; -$PostFX::VignettePostFX::VMin = "0.25"; -$PostFX::VignettePostFX::VMax = "0.9"; -$PostFX::VignettePostFX::Color = "0 0 0 1"; diff --git a/Templates/BaseGame/game/core/postFX/scripts/postFx.tscript b/Templates/BaseGame/game/core/postFX/scripts/postFx.tscript index 24035a97f..45eea030e 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/postFx.tscript +++ b/Templates/BaseGame/game/core/postFX/scripts/postFx.tscript @@ -50,6 +50,13 @@ function postFXInit() while( %file !$= "" ) { + //we need to make sure we don't inadvertently forcefully exec the default postfx preset + if(fileName(%file) $= "default.postfxpreset.tscript") + { + %file = findNextFile( %pattern ); + continue; + } + exec( %file ); %file = findNextFile( %pattern ); } diff --git a/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript b/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript index 25c7e19f7..34b1ecd80 100644 --- a/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript +++ b/Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript @@ -678,8 +678,8 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::Shadows::useShadowCaching = true; - $pref::Water::disableTrueReflections = true; - $pref::Video::disableParallaxMapping = true; + $pref::Water::enableTrueReflections = false; + $pref::Video::enableParallaxMapping = false; $pref::PostFX::EnableSSAO = false; $pref::PostFX::EnableHDR = false; $pref::PostFX::EnableDOF = false; @@ -704,8 +704,8 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::Shadows::useShadowCaching = true; - $pref::Water::disableTrueReflections = true; - $pref::Video::disableParallaxMapping = true; + $pref::Water::enableTrueReflections = false; + $pref::Video::enableParallaxMapping = false; $pref::PostFX::EnableSSAO = false; $pref::PostFX::EnableHDR = false; $pref::PostFX::EnableDOF = false; @@ -734,8 +734,8 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) //Should this default to on in ultra settings? $pref::Shadows::useShadowCaching = true; - $pref::Water::disableTrueReflections = false; - $pref::Video::disableParallaxMapping = false; + $pref::Water::enableTrueReflections = true; + $pref::Video::enableParallaxMapping = true; $pref::PostFX::EnableSSAO = true; $pref::PostFX::EnableHDR = true; $pref::PostFX::EnableDOF = true; @@ -760,8 +760,8 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::Shadows::useShadowCaching = true; - $pref::Water::disableTrueReflections = false; - $pref::Video::disableParallaxMapping = true; + $pref::Water::enableTrueReflections = true; + $pref::Video::enableParallaxMapping = true; $pref::PostFX::EnableSSAO = false; $pref::PostFX::EnableHDR = true; $pref::PostFX::EnableDOF = true; @@ -789,8 +789,8 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem ) $pref::Shadows::useShadowCaching = true; - $pref::Water::disableTrueReflections = false; - $pref::Video::disableParallaxMapping = true; + $pref::Water::enableTrueReflections = true; + $pref::Video::enableParallaxMapping = true; $pref::PostFX::EnableSSAO = false; $pref::PostFX::EnableHDR = false; $pref::PostFX::EnableDOF = false; diff --git a/Templates/BaseGame/game/core/utility/scripts/globals.tscript b/Templates/BaseGame/game/core/utility/scripts/globals.tscript index aa95903f3..bef6467d1 100644 --- a/Templates/BaseGame/game/core/utility/scripts/globals.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/globals.tscript @@ -37,7 +37,7 @@ $pref::Input::JoystickEnabled = 0; // Set directory paths for various data or default images. $pref::Video::ProfilePath = "core/rendering/scripts/gfxprofile"; -$pref::Video::disableVerticalSync = 1; +$pref::Video::enableVerticalSync = 0; $pref::Video::mode = "1920 1080 false 32 60 4"; $pref::Video::defaultFenceCount = 0; @@ -50,7 +50,7 @@ $pref::Video::disableHardwareAA = true; $pref::Video::disableNormalmapping = false; $pref::Video::disablePixSpecular = false; $pref::Video::disableCubemapping = false; -$pref::Video::disableParallaxMapping = false; +$pref::Video::enableParallaxMapping = true; // The number of mipmap levels to drop on loaded textures to reduce video memory // usage. It will skip any textures that have been defined as not allowing down diff --git a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript index 881a43edf..faa83ad78 100644 --- a/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript +++ b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript @@ -444,7 +444,7 @@ function populateDisplaySettingsList() OptionsMenuSettingsList.addOptionRow("Resolution", "$pref::Video::Resolution", %resolutionList, false, "", true, "Resolution of the game window", %resolution); } - OptionsMenuSettingsList.addOptionBoolRow("VSync", "$pref::Video::disableVerticalSync", $yesNoList, false, "", true, "", ""); + OptionsMenuSettingsList.addOptionBoolRow("VSync", "$pref::Video::enableVerticalSync", $YesNoList, false, "", true, "", ""); %refreshList = getScreenRefreshList($pref::Video::mode); @@ -504,8 +504,8 @@ function populateGraphicsSettingsList() OptionsMenuSettingsList.addOptionRow("Anisotropic Filtering", "$pref::Video::defaultAnisotropy", %anisoFilter, false, "", true, "Amount of Anisotropic Filtering on textures, which dictates their sharpness at a distance"); OptionsMenuSettingsList.addOptionRow("Anti-Aliasing", "$pref::Video::AA", %aaFilter, false, "", true, "Amount of Post-Processing Anti-Aliasing applied to rendering"); - OptionsMenuSettingsList.addOptionBoolRow("Parallax", "$pref::Video::disableParallaxMapping", %onOffList, false, "", true, "Whether the surface parallax shader effect is enabled", ""); - OptionsMenuSettingsList.addOptionBoolRow("Water Reflections", "$pref::Water::disableTrueReflections", %onOffList, false, "", true, "Whether water reflections are enabled", ""); + OptionsMenuSettingsList.addOptionBoolRow("Parallax", "$pref::Video::enableParallaxMapping", %onOffList, false, "", true, "Whether the surface parallax shader effect is enabled", ""); + OptionsMenuSettingsList.addOptionBoolRow("Water Reflections", "$pref::Water::enableTrueReflections", %onOffList, false, "", true, "Whether water reflections are enabled", ""); OptionsMenuSettingsList.addOptionBoolRow("SSAO", "$pref::PostFX::EnableSSAO", %onOffList, false, "", true, "Whether Screen-Space Ambient Occlusion is enabled"); OptionsMenuSettingsList.addOptionBoolRow("Depth of Field", "$pref::PostFX::EnableDOF", %onOffList, false, "", true, "Whether the Depth of Field effect is enabled"); @@ -581,7 +581,7 @@ function updateDisplaySettings() %newBpp = 32; // ... its not 1997 anymore. %newFullScreen = %deviceModeName $= "Fullscreen" ? true : false; %newRefresh = $pref::Video::RefreshRate; - %newVsync = !$pref::Video::disableVerticalSync; + %newVsync = $pref::Video::enableVerticalSync; %newFSAA = $pref::Video::AA; // Build the final mode string. @@ -589,7 +589,7 @@ function updateDisplaySettings() // Change the video mode. if ( %newMode !$= $pref::Video::mode || %newDeviceID != $pref::Video::deviceId || - %newVsync != $pref::Video::disableVerticalSync || %newDeviceMode != $pref::Video::deviceMode) + %newVsync != $pref::Video::enableVerticalSync || %newDeviceMode != $pref::Video::deviceMode) { //****Edge Case Hack // If we're in fullscreen mode and switching to a different monitor at the @@ -607,7 +607,7 @@ function updateDisplaySettings() } $pref::Video::mode = %newMode; - $pref::Video::disableVerticalSync = %newVsync; + $pref::Video::enableVerticalSync = %newVsync; $pref::Video::deviceId = %newDeviceID; $pref::Video::deviceMode = %newDeviceMode; $pref::Video::Resolution = %newRes; diff --git a/Templates/BaseGame/game/data/defaults.tscript b/Templates/BaseGame/game/data/defaults.tscript index acd2a0f43..5c36c414f 100644 --- a/Templates/BaseGame/game/data/defaults.tscript +++ b/Templates/BaseGame/game/data/defaults.tscript @@ -28,7 +28,7 @@ $sceneLighting::purgeMethod = "lastCreated"; $sceneLighting::cacheLighting = 1; $pref::Video::displayDevice = ($platform $= "windows") ? "D3D11" : "OpenGL"; -$pref::Video::disableVerticalSync = 1; +$pref::Video::enableVerticalSync = 0; $pref::Video::defaultFenceCount = 0; $pref::Video::screenShotSession = 0; $pref::Video::screenShotFormat = "PNG"; @@ -50,7 +50,7 @@ $pref::Video::disablePixSpecular = false; $pref::Video::disableCubemapping = false; /// -$pref::Video::disableParallaxMapping = false; +$pref::Video::enableParallaxMapping = true; $pref::Video::Gamma = 2.2; $pref::Video::Contrast = 1.0; @@ -137,7 +137,7 @@ $pref::Reflect::refractTexScale = 1.0; $pref::Reflect::frameLimitMS = 10; /// Set true to force all water objects to use static cubemap reflections. -$pref::Water::disableTrueReflections = false; +$pref::Water::enableTrueReflections = true; // A global LOD scalar which can reduce the overall density of placed GroundCover. $pref::GroundCover::densityScale = 1.0; diff --git a/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript b/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript index efa78ca46..5539626ed 100644 --- a/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript +++ b/Templates/BaseGame/game/tools/gui/fieldTypes/range.tscript @@ -111,13 +111,13 @@ function GuiInspectorVariableGroup::buildRangeField(%this, %fieldName, %fieldLab function guiInspectorRangeField::onResize(%this) { - echo("RESIIIIIIIIIIIZED"); } function guiInspectorRangeFieldText::onReturn(%this) { %value = %this.getText(); %this.sliderControl.setValue(%value); + %this.sliderControl.onDragComplete(); } function guiInspectorRangeFieldSlider::onDragComplete( %this ) @@ -141,4 +141,9 @@ function guiInspectorRangeFieldSlider::onDragComplete( %this ) } eval(%setCommand); +} + +function guiInspectorRangeFieldSlider::onMouseDragged(%this) +{ + %this.onDragComplete(); } \ No newline at end of file