From 967fa62ddd809f7cc2e14badef742fee2e3c6ad7 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 23 Jan 2025 11:19:27 -0600 Subject: [PATCH] shaders/common/ no longer exists --- .../rendering/shaders/AFX/afxPostFX_Highlight_ALT_P.hlsl | 6 +++--- .../core/rendering/shaders/AFX/afxPostFX_Highlight_P.hlsl | 6 +++--- .../core/rendering/shaders/AFX/afxZodiac_Interior_P.hlsl | 2 +- .../core/rendering/shaders/AFX/afxZodiac_Interior_V.hlsl | 2 +- .../core/rendering/shaders/AFX/afxZodiac_Polysoup_P.hlsl | 2 +- .../core/rendering/shaders/AFX/afxZodiac_Polysoup_V.hlsl | 2 +- .../core/rendering/shaders/AFX/afxZodiac_Terrain_P.hlsl | 2 +- .../core/rendering/shaders/AFX/afxZodiac_Terrain_V.hlsl | 2 +- .../core/rendering/shaders/AFX/gl/afxZodiac_Polysoup_V.glsl | 2 +- .../core/rendering/shaders/AFX/gl/afxZodiac_Terrain_V.glsl | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_ALT_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_ALT_P.hlsl index 563942d8e..dbe59db3a 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_ALT_P.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_ALT_P.hlsl @@ -5,9 +5,9 @@ // (currently not used for default AFX selection-highlighting) //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" -#include "../common/shaderModelAutoGen.hlsl" -#include "shaders/common/postFX/postFx.hlsl" +#include "../shaderModel.hlsl" +#include "../shaderModelAutoGen.hlsl" +#include "../postFX/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(highlightBuffer,0); TORQUE_UNIFORM_SAMPLER2D(backBuffer,1); diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_P.hlsl index 91a14e834..8f85b3779 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_P.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxPostFX_Highlight_P.hlsl @@ -4,9 +4,9 @@ // http://www.garagegames.com/community/resources/view/17821 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" -#include "../common/shaderModelAutoGen.hlsl" -#include "shaders/common/postFX/postFx.hlsl" +#include "../shaderModel.hlsl" +#include "../shaderModelAutoGen.hlsl" +#include "../postFX/postFx.hlsl" TORQUE_UNIFORM_SAMPLER2D(highlightBuffer,0); TORQUE_UNIFORM_SAMPLER2D(backBuffer,1); diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_P.hlsl index ddf031a0e..b1a80548e 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_P.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_P.hlsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" +#include "../shaderModel.hlsl" struct ConnectData { diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_V.hlsl index ceffc05e7..088bbb844 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_V.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Interior_V.hlsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" +#include "../shaderModel.hlsl" struct VertData { float3 position : POSITION; diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_P.hlsl index 3aff7f5c3..17b73fcc8 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_P.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_P.hlsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" +#include "../shaderModel.hlsl" struct ConnectData { diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_V.hlsl index a1c125da1..fb8c8487c 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_V.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Polysoup_V.hlsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" +#include "../shaderModel.hlsl" struct VertData { float3 position : POSITION; diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_P.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_P.hlsl index 7bc1dc6e9..2381641b4 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_P.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_P.hlsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" +#include "../shaderModel.hlsl" struct ConnectData { diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_V.hlsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_V.hlsl index 446d9e63f..7c6794d82 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_V.hlsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/afxZodiac_Terrain_V.hlsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../common/shaderModel.hlsl" +#include "../shaderModel.hlsl" struct VertData { float3 position : POSITION; diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Polysoup_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Polysoup_V.glsl index ad3503db3..7e55dd452 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Polysoup_V.glsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Polysoup_V.glsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../../common/gl/hlslCompat.glsl" +#include "../../gl/hlslCompat.glsl" uniform mat4 modelview; diff --git a/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Terrain_V.glsl b/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Terrain_V.glsl index 73547b958..e42f61e9b 100644 --- a/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Terrain_V.glsl +++ b/Templates/BaseGame/game/core/rendering/shaders/AFX/gl/afxZodiac_Terrain_V.glsl @@ -8,7 +8,7 @@ // Copyright (C) Faust Logic, Inc. //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// -#include "../../common/gl/hlslCompat.glsl" +#include "../../gl/hlslCompat.glsl" uniform mat4 modelview;