static sky can also use dynamic clouds

This commit is contained in:
Turanszki Janos
2020-09-08 20:09:39 +02:00
parent ac01278c7a
commit 31d6cbe249
3 changed files with 5 additions and 2 deletions
+3 -1
View File
@@ -6,5 +6,7 @@ TEXTURECUBE(texture_sky, float4, TEXSLOT_ONDEMAND0);
float4 main(PSIn_Sky_EnvmapRendering input) : SV_TARGET
{
float3 normal = normalize(input.nor);
return float4(DEGAMMA(texture_sky.SampleLevel(sampler_linear_clamp, normal, 0).rgb), 1);
float3 sky = DEGAMMA(texture_sky.SampleLevel(sampler_linear_clamp, normal, 0).rgb);
CalculateClouds(sky, normal, false);
return float4(sky, 1);
}
+1
View File
@@ -9,6 +9,7 @@ GBUFFEROutputType_Thin main(float4 pos : SV_POSITION, float2 clipspace : TEXCOOR
const float3 V = normalize(unprojected.xyz - g_xCamera_CamPos);
float4 color = float4(DEGAMMA_SKY(texture_globalenvmap.SampleLevel(sampler_linear_clamp, V, 0).rgb), 1);
CalculateClouds(color.rgb, V, false);
float4 pos2DPrev = mul(g_xFrame_MainCamera_PrevVP, float4(unprojected.xyz, 1));
float2 velocity = ((pos2DPrev.xy / pos2DPrev.w - g_xFrame_TemporalAAJitterPrev) - (clipspace - g_xFrame_TemporalAAJitter)) * float2(0.5f, -0.5f);
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates, breaking API changes
const int minor = 47;
// minor bug fixes, alterations, refactors, updates
const int revision = 33;
const int revision = 34;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);