TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-08 06:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #349 from lukaspj/fix/caustics-shader-paths

Browse source 
Fix paths in caustics shader
This commit is contained in:
Brian Roberts 2020-10-04 17:57:45 -05:00 • committed by GitHub
commit 605591b315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.cs
View file

@ -36,10 +36,10 @@ singleton GFXStateBlockData( PFX_CausticsStateBlock : PFX_DefaultStateBlock )
singleton ShaderData( PFX_CausticsShader )
{
DXVertexShaderFile = $Core::CommonShaderPath @ "/postFX/postFxV.hlsl";
DXPixelShaderFile = "./causticsP.hlsl";
DXPixelShaderFile = "./CausticsPostFXP.hlsl";
OGLVertexShaderFile = $Core::CommonShaderPath @ "/postFX/gl/postFxV.glsl";
OGLPixelShaderFile = "./causticsP.glsl";
OGLPixelShaderFile = "./CausticsPostFXP.glsl";
samplerNames[0] = "$deferredTex";
samplerNames[1] = "$causticsTex0";

2
Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFXP.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "core/rendering/shaders/postFx.hlsl"
#include "core/rendering/shaders/postFX/postFx.hlsl"
#include "core/rendering/shaders/shaderModelAutoGen.hlsl"
uniform float accumTime;