浏览代码

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

Fix paths in caustics shader
Brian Roberts 5 年之前
父节点
当前提交
605591b315

+ 2 - 2
Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFX.cs

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

+ 1 - 1
Templates/BaseGame/game/core/postFX/scripts/Caustics/CausticsPostFXP.hlsl

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