TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'refs/remotes/upstream/development'

Browse source 
Conflicts:
	Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
This commit is contained in:
Samuel Skiff 2022-08-30 05:16:25 -05:00
commit 606da2e8ba
20 changed files with 94 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Templates/BaseGame/game/core/clientServer/scripts/client/levelDownload.tscript
View file

@ -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();
}

3
Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
$PostFX::BloomPostFX::Enabled = "1";
$PostFX::BloomPostFX::threshold = "0.5";
$PostFX::BloomPostFX::intensity = "0.5";
@ -19,6 +20,8 @@ $PostFX::HDRPostFX::minLuminace = "0.001";
$PostFX::HDRPostFX::adaptRate = "0.85";
$PostFX::HDRPostFX::tonemapMode = "ACES";
$PostFX::HDRPostFX::enableBloom = "1";
=======
>>>>>>> development
$PostFX::HDRPostFX::brightPassThreshold = "0.02";
$PostFX::HDRPostFX::gaussMultiplier = "0.4";
$PostFX::HDRPostFX::enableAutoExposure = "1";

7
Templates/BaseGame/game/core/postFX/scripts/postFx.tscript
View file

@ -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 );
}

20
Templates/BaseGame/game/core/rendering/scripts/graphicsOptions.tscript
View file

@ -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;

4
Templates/BaseGame/game/core/utility/scripts/globals.tscript
View file

@ -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