diff --git a/Shaders/CModelShaders.frag.hlsl b/Shaders/CModelShaders.frag.hlsl index 538492534..d59f44185 100644 --- a/Shaders/CModelShaders.frag.hlsl +++ b/Shaders/CModelShaders.frag.hlsl @@ -155,7 +155,7 @@ cbuffer ThermalUniform : register(b2) { }; #endif -#if defined(URDE_THERMAL_COLD) +#if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC) float3 LightingFunc(in VertToFrag vtf) { return float3(1.0, 1.0, 1.0); } @@ -279,6 +279,12 @@ float4 PostFunc(in VertToFrag vtf, float4 colorIn) { } #endif +#if defined(URDE_THERMAL_STATIC) +float4 PostFunc(in VertToFrag vtf, float4 colorIn) { + return colorIn; +} +#endif + #if defined(URDE_SOLID) float4 PostFunc(in VertToFrag vtf, float4 colorIn) { return solidColor; diff --git a/Shaders/CModelShaders.frag.metal b/Shaders/CModelShaders.frag.metal index 817c83015..679e02f92 100644 --- a/Shaders/CModelShaders.frag.metal +++ b/Shaders/CModelShaders.frag.metal @@ -136,7 +136,7 @@ float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, textur } #endif -#if defined(URDE_THERMAL_COLD) +#if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC) struct LightingUniform {}; float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, texture2d extTex0, sampler clampSamp) { return float3(1.0, 1.0, 1.0); @@ -267,6 +267,14 @@ float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu, } #endif +#if defined(URDE_THERMAL_STATIC) +float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu, + texture2d extTex0, texture2d extTex1, texture2d extTex2, + sampler samp, sampler clampSamp, sampler clampEdgeSamp, float4 colorIn) { + return colorIn; +} +#endif + #if defined(URDE_SOLID) float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu, texture2d extTex0, texture2d extTex1, texture2d extTex2, diff --git a/hecl b/hecl index 8d5c99e10..eebc1a8b6 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 8d5c99e10a9f23399906f606d59ed7e55abba09e +Subproject commit eebc1a8b622acce6b71c91c132e9c1438a669d32