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

Fog rendering for HLSL

This commit is contained in:
Jack Andersen 2016-08-08 08:54:05 -10:00
parent e7a339344d
commit 1d32843970
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
View File

@ -12,6 +12,12 @@ static const char* LightingHLSL =
" float4 linAtt;\n" " float4 linAtt;\n"
" float4 angAtt;\n" " float4 angAtt;\n"
"};\n" "};\n"
"struct Fog\n"
"{\n"
" float4 color;\n"
" float rangeScale;\n"
" float start;\n"
"};\n"
"\n" "\n"
"cbuffer LightingUniform : register(b2)\n" "cbuffer LightingUniform : register(b2)\n"
"{\n" "{\n"
@ -20,6 +26,7 @@ static const char* LightingHLSL =
" float4 colorReg0;\n" " float4 colorReg0;\n"
" float4 colorReg1;\n" " float4 colorReg1;\n"
" float4 colorReg2;\n" " float4 colorReg2;\n"
" Fog fog;\n"
"};\n" "};\n"
"\n" "\n"
"static float4 LightingFunc(float4 mvPosIn, float4 mvNormIn)\n" "static float4 LightingFunc(float4 mvPosIn, float4 mvNormIn)\n"
@ -43,6 +50,14 @@ static const char* LightingHLSL =
" return saturate(ret);\n" " return saturate(ret);\n"
"}\n"; "}\n";
static const char* MainPostHLSL =
"float4 MainPostFunc(in VertToFrag vtf, float4 colorIn)\n"
"{\n"
" float fogZ = (-vtf.mvPos.z - fog.start) * fog.rangeScale;\n"
" return lerp(fog.color, colorIn, saturate(exp2(-8.0 * fogZ)));\n"
"}\n"
"\n";
static const char* ThermalPostHLSL = static const char* ThermalPostHLSL =
"cbuffer ThermalUniform : register(b2)\n" "cbuffer ThermalUniform : register(b2)\n"
"{\n" "{\n"
@ -61,7 +76,7 @@ CModelShaders::GetShaderExtensionsHLSL(boo::IGraphicsDataFactory::Platform plat)
hecl::Runtime::ShaderCacheExtensions ext(plat); hecl::Runtime::ShaderCacheExtensions ext(plat);
/* Normal lit shading */ /* Normal lit shading */
ext.registerExtensionSlot({LightingHLSL, "LightingFunc"}, {}, 0, nullptr, 0, nullptr, ext.registerExtensionSlot({LightingHLSL, "LightingFunc"}, {MainPostHLSL, "MainPostFunc"}, 0, nullptr, 0, nullptr,
hecl::Backend::BlendFactor::Original, hecl::Backend::BlendFactor::Original); hecl::Backend::BlendFactor::Original, hecl::Backend::BlendFactor::Original);
/* Thermal Visor shading */ /* Thermal Visor shading */

2
hecl

@ -1 +1 @@
Subproject commit 16eaa99c0af151404fc431f9adc76fc4739e86fc Subproject commit da8e8021f1417d213d18d783d779bd8eeb435be2