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

postfFx to postFX dir listing fixes

Browse source
This commit is contained in:
AzaezelX 2020-10-09 12:56:38 -05:00
parent 4a11b0dea3
commit e8ca1a6705
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/lighting/scripts/advancedLighting_Shaders.cs
View file

@ -296,10 +296,10 @@ singleton shaderData( PrefiterCubemapShader )
// //
singleton ShaderData( PFX_ReflectionProbeArray ) singleton ShaderData( PFX_ReflectionProbeArray )
{ {
DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/reflectionProbeArrayP.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"; OGLPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/gl/reflectionProbeArrayP.glsl";
samplerNames[0] = "$deferredBuffer"; samplerNames[0] = "$deferredBuffer";

2
Templates/BaseGame/game/core/lighting/scripts/deferredShading.cs
View file

@ -1,6 +1,6 @@
singleton ShaderData( DeferredColorShader ) singleton ShaderData( DeferredColorShader )
{ {
DXVertexShaderFile = $Core::CommonShaderPath @ "/postFx/postFxV.hlsl"; DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredColorShaderP.hlsl"; DXPixelShaderFile = $Core::CommonShaderPath @ "/lighting/advanced/deferredColorShaderP.hlsl";
OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl"; OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";

6
Templates/BaseGame/game/core/postFX/scripts/afxHighlight.cs
View file

@ -6,11 +6,11 @@
singleton ShaderData( PFX_afxHighlightShader ) singleton ShaderData( PFX_afxHighlightShader )
{ {
DXVertexShaderFile = "shaders/common/postFx/postFxV.hlsl"; DXVertexShaderFile = "shaders/common/postFX/postFxV.hlsl";
DXPixelShaderFile = "shaders/AFX/afxPostFX_Highlight_P.hlsl"; DXPixelShaderFile = "shaders/AFX/afxPostFX_Highlight_P.hlsl";
//OGLVertexShaderFile = "shaders/common/postFx/gl//postFxV.glsl"; //OGLVertexShaderFile = "shaders/common/postFX/gl//postFxV.glsl";
//OGLPixelShaderFile = "shaders/common/postFx/gl/passthruP.glsl"; //OGLPixelShaderFile = "shaders/common/postFX/gl/passthruP.glsl";
samplerNames[0] = "$inputTex"; samplerNames[0] = "$inputTex";

2
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/deferredShadingP.glsl
View file

@ -22,7 +22,7 @@
#include "../../../gl/hlslCompat.glsl" #include "../../../gl/hlslCompat.glsl"
#include "shadergen:/autogenConditioners.h" #include "shadergen:/autogenConditioners.h"
#include "../../../postFx/gl/postFx.glsl" #include "../../../postFX/gl/postFx.glsl"
#include "../../../gl/torque.glsl" #include "../../../gl/torque.glsl"
uniform sampler2D colorBufferTex; uniform sampler2D colorBufferTex;

2
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl
View file

@ -1,4 +1,4 @@
#include "../../postFx/postFx.hlsl" #include "../../postFX/postFx.hlsl"
#include "../../shaderModel.hlsl" #include "../../shaderModel.hlsl"
#include "../../shaderModelAutoGen.hlsl" #include "../../shaderModelAutoGen.hlsl"
#include "../../lighting.hlsl" #include "../../lighting.hlsl"

2
Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterP.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../postFx/postFx.hlsl" #include "../../postFX/postFx.hlsl"
TORQUE_UNIFORM_SAMPLER2D(diffuseMap, 0); TORQUE_UNIFORM_SAMPLER2D(diffuseMap, 0);

2
Templates/BaseGame/game/core/rendering/shaders/lighting/basic/shadowFilterV.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "../../postFx/postFx.hlsl" #include "../../postFX/postFx.hlsl"
#include "../../torque.hlsl" #include "../../torque.hlsl"
float4 rtParams0; float4 rtParams0;