mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-29 16:25:42 +00:00
Cleans up some core execution behavior
Removes a duplicated material definition Fixes up PostFX init'ing order so it inits before trying to load the prefs Adds a skip of loading the CoreModule's materials so we don't double-execute any of them Fixes a typo for the Vignette PostFX's name so it properly integrates
This commit is contained in:
parent
54fb5837ec
commit
c6c2e9139f
6 changed files with 19 additions and 65 deletions
|
|
@ -55,23 +55,6 @@ singleton Material(CameraMat)
|
||||||
};
|
};
|
||||||
|
|
||||||
//--- camera.dts MATERIALS END ---
|
//--- camera.dts MATERIALS END ---
|
||||||
//--- noshape.dts MATERIALS BEGIN ---
|
|
||||||
singleton Material(noshape_NoShape)
|
|
||||||
{
|
|
||||||
mapTo = "NoShape";
|
|
||||||
|
|
||||||
diffuseMapAsset[0] = "";
|
|
||||||
|
|
||||||
diffuseColor[0] = "0.8 0.003067 0 .8";
|
|
||||||
emissive[0] = 0;
|
|
||||||
|
|
||||||
doubleSided = false;
|
|
||||||
translucent = 1;
|
|
||||||
translucentBlendOp = "LerpAlpha";
|
|
||||||
castShadows = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
//--- noshape.dts MATERIALS END ---
|
|
||||||
|
|
||||||
//--- noshapetext.dae MATERIALS BEGIN ---
|
//--- noshapetext.dae MATERIALS BEGIN ---
|
||||||
singleton Material(noshapetext_lambert1)
|
singleton Material(noshapetext_lambert1)
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// 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.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
singleton Material( Empty )
|
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
singleton Material(WarningMaterial) {
|
|
||||||
detailMapAsset[0] = "Core_PostFX:missingTexture_image";
|
|
||||||
diffuseColor[0] = "25 16 0";
|
|
||||||
emissive[0] = false;
|
|
||||||
translucent = false;
|
|
||||||
};
|
|
||||||
|
|
@ -20,21 +20,21 @@
|
||||||
// IN THE SOFTWARE.
|
// IN THE SOFTWARE.
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
singleton ShaderData( PFX_PassthruShader )
|
|
||||||
{
|
|
||||||
DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
|
|
||||||
DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/passthruP.hlsl";
|
|
||||||
|
|
||||||
OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
|
|
||||||
OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/passthruP.glsl";
|
|
||||||
|
|
||||||
samplerNames[0] = "$inputTex";
|
|
||||||
|
|
||||||
pixVersion = 2.0;
|
|
||||||
};
|
|
||||||
|
|
||||||
function postFXInit()
|
function postFXInit()
|
||||||
{
|
{
|
||||||
|
singleton ShaderData( PFX_PassthruShader )
|
||||||
|
{
|
||||||
|
DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
|
||||||
|
DXPixelShaderFile = $Core::CommonShaderPath @ "/postFX/passthruP.hlsl";
|
||||||
|
|
||||||
|
OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
|
||||||
|
OGLPixelShaderFile = $Core::CommonShaderPath @ "/postFX/gl/passthruP.glsl";
|
||||||
|
|
||||||
|
samplerNames[0] = "$inputTex";
|
||||||
|
|
||||||
|
pixVersion = 2.0;
|
||||||
|
};
|
||||||
|
|
||||||
//Load the core postFX files themselves
|
//Load the core postFX files themselves
|
||||||
if (!$Server::Dedicated)
|
if (!$Server::Dedicated)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -59,11 +59,11 @@ function Core_Rendering::initClient(%this)
|
||||||
|
|
||||||
configureCanvas();
|
configureCanvas();
|
||||||
|
|
||||||
|
postFXInit();
|
||||||
|
|
||||||
//Autodetect settings if it's our first time
|
//Autodetect settings if it's our first time
|
||||||
if($pref::Video::autoDetect)
|
if($pref::Video::autoDetect)
|
||||||
AutodetectGraphics();
|
AutodetectGraphics();
|
||||||
|
|
||||||
postFXInit();
|
|
||||||
|
|
||||||
closeSplashWindow();
|
closeSplashWindow();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -811,7 +811,7 @@ function AutodetectGraphics_Apply(%shaderVer, %intel, %videoMem )
|
||||||
PostFXManager.settingsEffectSetEnabled(HDRPostFX, $pref::PostFX::EnableHDR);
|
PostFXManager.settingsEffectSetEnabled(HDRPostFX, $pref::PostFX::EnableHDR);
|
||||||
PostFXManager.settingsEffectSetEnabled(DepthOfFieldPostFX, $pref::PostFX::EnableDOF);
|
PostFXManager.settingsEffectSetEnabled(DepthOfFieldPostFX, $pref::PostFX::EnableDOF);
|
||||||
PostFXManager.settingsEffectSetEnabled(LightRayPostFX, $pref::PostFX::EnableLightRays);
|
PostFXManager.settingsEffectSetEnabled(LightRayPostFX, $pref::PostFX::EnableLightRays);
|
||||||
PostFXManager.settingsEffectSetEnabled(VignettePostEffect, $pref::PostFX::EnableVignette);
|
PostFXManager.settingsEffectSetEnabled(VignettePostFX, $pref::PostFX::EnableVignette);
|
||||||
|
|
||||||
echo("Graphics quality settings have been auto detected.");
|
echo("Graphics quality settings have been auto detected.");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,9 @@ function loadModuleMaterials(%moduleGroup)
|
||||||
if(%module.group !$= %moduleGroup)
|
if(%module.group !$= %moduleGroup)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(%module.ModuleId $= "CoreModule") //the core container module is a special case that has some path complications
|
||||||
|
continue; //so we'll skip it so it doesn't complicate the other core modules' path tests
|
||||||
|
|
||||||
%modulePath = %module.ModulePath;
|
%modulePath = %module.ModulePath;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue