AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for CModelShaders hlsl/metal

This commit is contained in:
Luke Street 2021-01-06 21:07:36 -05:00
parent 4b9bdcc802
commit 5191534841
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shaders/CModelShaders.frag.hlsl
View File

@ -155,7 +155,7 @@ cbuffer ThermalUniform : register(b2) {
}; };
#endif #endif
#if defined(URDE_THERMAL_COLD) #if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC)
float3 LightingFunc(in VertToFrag vtf) { float3 LightingFunc(in VertToFrag vtf) {
return float3(1.0, 1.0, 1.0); return float3(1.0, 1.0, 1.0);
} }
@ -279,6 +279,12 @@ float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
} }
#endif #endif
#if defined(URDE_THERMAL_STATIC)
float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
return colorIn;
}
#endif
#if defined(URDE_SOLID) #if defined(URDE_SOLID)
float4 PostFunc(in VertToFrag vtf, float4 colorIn) { float4 PostFunc(in VertToFrag vtf, float4 colorIn) {
return solidColor; return solidColor;

10
Shaders/CModelShaders.frag.metal
View File

@ -136,7 +136,7 @@ float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, textur
} }
#endif #endif
#if defined(URDE_THERMAL_COLD) #if defined(URDE_THERMAL_COLD) || defined(URDE_THERMAL_STATIC)
struct LightingUniform {}; struct LightingUniform {};
float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, texture2d<float> extTex0, sampler clampSamp) { float3 LightingFunc(thread VertToFrag& vtf, constant LightingUniform& lu, texture2d<float> extTex0, sampler clampSamp) {
return float3(1.0, 1.0, 1.0); return float3(1.0, 1.0, 1.0);
@ -267,6 +267,14 @@ float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
} }
#endif #endif
#if defined(URDE_THERMAL_STATIC)
float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2,
sampler samp, sampler clampSamp, sampler clampEdgeSamp, float4 colorIn) {
return colorIn;
}
#endif
#if defined(URDE_SOLID) #if defined(URDE_SOLID)
float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu, float4 PostFunc(thread VertToFrag& vtf, constant LightingUniform& lu,
texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2, texture2d<float> extTex0, texture2d<float> extTex1, texture2d<float> extTex2,

2
hecl

@ -1 +1 @@
Subproject commit 8d5c99e10a9f23399906f606d59ed7e55abba09e Subproject commit eebc1a8b622acce6b71c91c132e9c1438a669d32