From e8ca1a6705ef0b37a7da54434c91b50b32e1acf9 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Fri, 9 Oct 2020 12:56:38 -0500 Subject: [PATCH] postfFx to postFX dir listing fixes --- .../game/core/lighting/scripts/advancedLighting_Shaders.cs | 4 ++-- .../BaseGame/game/core/lighting/scripts/deferredShading.cs | 2 +- Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs | 6 +++--- .../shaders/lighting/advanced/gl/deferredShadingP.glsl | 2 +- .../shaders/lighting/advanced/reflectionProbeArrayP.hlsl | 2 +- .../rendering/shaders/lighting/basic/shadowFilterP.hlsl | 2 +- .../rendering/shaders/lighting/basic/shadowFilterV.hlsl | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs index c99336478..f7bdf56f9 100644 --- a/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs +++ b/Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs @@ -296,10 +296,10 @@ singleton shaderData( PrefiterCubemapShader ) // singleton ShaderData( PFX_ReflectionProbeArray ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/reflectionProbeArrayP.hlsl"; - OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFx/gl/postFxV.glsl"; + OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/gl/reflectionProbeArrayP.glsl"; samplerNames[0] = "$deferredBuffer"; diff --git a/Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs b/Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs index f2c9e43af..f5bfc6d54 100644 --- a/Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs +++ b/Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs @@ -1,6 +1,6 @@ singleton ShaderData( DeferredColorShader ) { - DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; + DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl"; DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredColorShaderP.hlsl"; OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; diff --git a/Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs b/Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs index d7a310a19..115decbbf 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs +++ b/Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs @@ -6,11 +6,11 @@ singleton ShaderData( PFX_afxHighlightShader ) { - DXVertexShaderFile = "shaders/common/postFx/postFxV.hlsl"; + DXVertexShaderFile = "shaders/common/postFX/postFxV.hlsl"; DXPixelShaderFile = "shaders/AFX/afxPostFX_Highlight_P.hlsl"; - //OGLVertexShaderFile = "shaders/common/postFx/gl//postFxV.glsl"; - //OGLPixelShaderFile = "shaders/common/postFx/gl/passthruP.glsl"; + //OGLVertexShaderFile = "shaders/common/postFX/gl//postFxV.glsl"; + //OGLPixelShaderFile = "shaders/common/postFX/gl/passthruP.glsl"; samplerNames[0] = "$inputTex"; diff --git a/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl index 949aec129..639ca1add 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl +++ b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl @@ -22,7 +22,7 @@ #include "../../../gl/hlslCompat.glsl" #include "shadergen:/autogenConditioners.h" -#include "../../../postFx/gl/postFx.glsl" +#include "../../../postFX/gl/postFx.glsl" #include "../../../gl/torque.glsl" uniform sampler2D colorBufferTex; diff --git a/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl index e2345e5df..d47967c6c 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl @@ -1,4 +1,4 @@ -#include "../../postFx/postFx.hlsl" +#include "../../postFX/postFx.hlsl" #include "../../shaderModel.hlsl" #include "../../shaderModelAutoGen.hlsl" #include "../../lighting.hlsl" diff --git a/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl index cf819eed3..8d5edd65d 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postFx/postFx.hlsl" +#include "../../postFX/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(diffuseMap, 0); diff --git a/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl index d0838016b..85d731757 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../postFx/postFx.hlsl" +#include "../../postFX/postFx.hlsl" #include "../../torque.hlsl" float4 rtParams0;