From a8177885e2c7268c30c9025970ea489dc7ddde3a Mon Sep 17 00:00:00 2001 From: Areloch Date: Fri, 11 Sep 2020 13:36:27 -0500 Subject: [PATCH] Fixes the glowBlur shader paths --- .../BaseGame/game/core/postFX/scripts/Glow/glowBlurP.glsl | 2 +- .../BaseGame/game/core/postFX/scripts/Glow/glowBlurP.hlsl | 2 +- .../BaseGame/game/core/postFX/scripts/Glow/glowBlurV.glsl | 4 ++-- .../BaseGame/game/core/postFX/scripts/Glow/glowBlurV.hlsl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.glsl b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.glsl index 9ebca32fa..cbe5ab8d3 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.glsl +++ b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.glsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../gl/hlslCompat.glsl" +#include "core/rendering/shaders/gl/hlslCompat.glsl" uniform sampler2D diffuseMap ; diff --git a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.hlsl b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.hlsl index 80f8ed02d..a11d72e4c 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.hlsl +++ b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurP.hlsl @@ -20,7 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "./postFx.hlsl" +#include "core/rendering/shaders/postFX/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(diffuseMap, 0); diff --git a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.glsl b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.glsl index 70445d7fe..fdacf6377 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.glsl +++ b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.glsl @@ -20,8 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "../../gl/hlslCompat.glsl" -#include "../../gl/torque.glsl" +#include "core/rendering/shaders/gl/hlslCompat.glsl" +#include "core/rendering/shaders/gl/torque.glsl" in vec4 vPosition; in vec2 vTexCoord0; diff --git a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.hlsl b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.hlsl index b8f5cf9c2..2db44393a 100644 --- a/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.hlsl +++ b/Templates/BaseGame/game/core/postFX/scripts/Glow/glowBlurV.hlsl @@ -20,8 +20,8 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -#include "./postFx.hlsl" -#include "./../torque.hlsl" +#include "core/rendering/shaders/postFX/postFx.hlsl" +#include "core/rendering/shaders/torque.hlsl" uniform float2 texSize0;