Апдейт шейдеров [skip ci]

Author: xrSimpodin

Game/Resources_SoC_1.0006/gamedata/shaders/r3/Gauss.h

@@ -1,8 +1,6 @@
 #ifndef GAUSSBLUR_H_INCLUDED
 #define GAUSSBLUR_H_INCLUDED
 
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
-
 float4 Gauss(Texture2D t2d, float2 texCoord, int factor, bool optimize)
 {
     float4 outColor = 0.f;

Game/Resources_SoC_1.0006/gamedata/shaders/r3/accum_sun_near_old.ps

@@ -10,7 +10,6 @@
 #include "common_cbuffers.h"
 #include "common_functions.h"
 
-// #define USE_SUPER_SPECULAR
 #define USE_SUNMASK
 
 #ifdef USE_R2_STATIC_SUN
@@ -29,7 +28,6 @@
 // #define DBG_TEST_LIGHT
 // #define DBG_TEST_LIGHT_SPEC
 
-// #define USE_GAMMA_22
 // #define USE_SJITTER
 // #define USE_SUNFILTER
 // #define USE_FETCH4
@@ -48,7 +46,6 @@
 // #define USE_LM_HEMI                	//- shader defined
 // #define USE_DISTORT                	//- shader defined
 // #define USE_SUNMASK                		//- shader defined
-// #define DBG_TMAPPING
 //////////////////////////////////////////////////////////////////////////////////////////
 
 uniform float4                J_direct        [6];

Game/Resources_SoC_1.0006/gamedata/shaders/r3/accum_volumetric_sun.ps

@@ -91,50 +91,20 @@ float3 calc_reflection(float3 pos_w, float3 norm_w) { return reflect(normalize(p
 #define USABLE_BIT_15 uint(0x80000000)
 #define MUST_BE_SET uint(0x40000000) // This flag *must* be stored in the floating-point representation of the bit flag to store
 
-/*
-float2 gbuf_pack_normal( float3 norm )
+// RainbowZerg: use spheremap transform (Crytek's implementation) for normals packing
+float2 gbuf_pack_normal(float3 N)
 {
-   float2 res;
-
-   res = 0.5 * ( norm.xy + float2( 1, 1 ) ) ;
-   res.x *= ( norm.z < 0 ? -1.0 : 1.0 );
-
-   return res;
-}
-
-float3 gbuf_unpack_normal( float2 norm )
-{
-   float3 res;
-
-   res.xy = ( 2.0 * abs( norm ) ) - float2(1,1);
-
-   res.z = ( norm.x < 0 ? -1.0 : 1.0 ) * sqrt( abs( 1 - res.x * res.x - res.y * res.y ) );
-
-   return res;
+    return normalize(N.xy) * sqrt(N.z * 0.5 + 0.5);
+    ;
 }
-*/
 
-// Holger Gruen AMD - I change normal packing and unpacking to make sure N.z is accessible without ALU cost
-// this help the HDAO compute shader to run more efficiently
-float2 gbuf_pack_normal(float3 norm)
-{
-    float2 res;
-
-    res.x = norm.z;
-    res.y = 0.5f * (norm.x + 1.0f);
-    res.y *= (norm.y < 0.0f ? -1.0f : 1.0f);
-
-    return res;
-}
-
-float3 gbuf_unpack_normal(float2 norm)
+float3 gbuf_unpack_normal(float2 enc)
 {
+    // Spheremap transform
     float3 res;
-
-    res.z = norm.x;
-    res.x = (2.0f * abs(norm.y)) - 1.0f;
-    res.y = (norm.y < 0 ? -1.0 : 1.0) * sqrt(abs(1 - res.x * res.x - res.z * res.z));
-
+    float l = length(enc.xy);
+    res.z = l * l * 2.0 - 1.0;
+    res.xy = normalize(enc.xy) * sqrt(1.0 - res.z * res.z);
     return res;
 }
 

Game/Resources_SoC_1.0006/gamedata/shaders/r3/combine_1.ps

@@ -26,7 +26,7 @@ function normal                (shader, t_base, t_second, t_detail)
 	shader:dx10texture	("s_env0",		tex_env0)
 	shader:dx10texture	("s_env1",		tex_env1)
 	shader:dx10texture	("s_position",	"$user$position")
-	shader:dx10texture	("s_image", "$user$generic0_temp")
+	shader:dx10texture	("s_last_frame", "$user$generic0_temp")
 	shader:dx10texture	("s_leaves",	tex_leaves)
 
 	shader:dx10sampler	("smp_base")

Game/Resources_SoC_1.0006/gamedata/shaders/r3/common.h

@@ -26,7 +26,7 @@ function normal                (shader, t_base, t_second, t_detail)
 	shader:dx10texture	("s_env0",		tex_env0)
 	shader:dx10texture	("s_env1",		tex_env1)
 	shader:dx10texture	("s_position",	"$user$position")
-	shader:dx10texture	("s_image", "$user$generic0_temp")
+	shader:dx10texture	("s_last_frame", "$user$generic0_temp")
 	shader:dx10texture	("s_leaves",	tex_leaves)
 
 	shader:dx10sampler	("smp_base")

Game/Resources_SoC_1.0006/gamedata/shaders/r3/common_functions.h

@@ -26,7 +26,7 @@ function normal                (shader, t_base, t_second, t_detail)
 	shader:dx10texture	("s_env0",		tex_env0)
 	shader:dx10texture	("s_env1",		tex_env1)
 	shader:dx10texture	("s_position",	"$user$position")
-	shader:dx10texture	("s_image", "$user$generic0_temp")
+	shader:dx10texture	("s_last_frame", "$user$generic0_temp")
 	shader:dx10texture	("s_leaves",	tex_leaves)
 
 	shader:dx10sampler	("smp_base")

Game/Resources_SoC_1.0006/gamedata/shaders/r3/effects_water.s

@@ -1,7 +1,4 @@
-#include "common_iostructs.h"
-//#include "common.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/effects_waterryaska.s

@@ -1,7 +1,5 @@
 #include "common.h"
 
-uniform float4 screen_res; // x - width, y - height, z - 1/width, w - 1/height
-
 v2p_TL main(v_TL_positiont v)
 {
     v2p_TL O;

Game/Resources_SoC_1.0006/gamedata/shaders/r3/effects_waterstuden.s

@@ -11,7 +11,7 @@ float normalize_depth(float depth) { return (saturate(depth / FARPLANE)); }
 // global constants
 uniform float4 ogse_c_screen; // x - fFOV, y - fAspect, z - Zf/(Zf-Zn), w - Zn*tan(fFov/2)
 
-half is_sky(float depth) { return step(abs(depth - SKY_DEPTH), SKY_EPS); }
+float is_sky(float depth) { return step(depth, SKY_EPS); }
 half is_not_sky(float depth) { return step(SKY_EPS, abs(depth - SKY_DEPTH)); }
 
 float4 proj_to_screen(float4 proj)

Game/Resources_SoC_1.0006/gamedata/shaders/r3/hud_crosshair.vs

@@ -7,7 +7,6 @@
 
 uniform float4 SSLR_params; // x - L
 uniform float4x4 m_inv_v; 
-uniform float4 screen_res;
 
 
 float3 calc_envmap(float3 vreflect)

Game/Resources_SoC_1.0006/gamedata/shaders/r3/hud_scope.vs

@@ -25,7 +25,11 @@ By LVutner for X-Ray Oxygen project (2020)
 #define SSR_SAMPLES int(20) // Extreme
 #define SSR_DISTANCE float(400.0)
 
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#if defined(USE_MSAA)
+TEXTURE2DMS(float4, MSAA_SAMPLES) s_last_frame;
+#else
+Texture2D s_last_frame;
+#endif
 
 /*Helper functions*/
 float RayAttenBorder(float2 pos, float value)
@@ -108,7 +112,11 @@ float4 compute_ssr(float3 position, float3 normal)
 	float edge = RayAttenBorder(refl_tc.xy, SSR_EDGE_ATTENUATION);
 
 	/*Sample image with reflected TC*/	
-	float3 img = s_image.Load(int3(refl_tc.xy * screen_res.xy,0),0);
+#if defined(USE_MSAA)
+    float3 img = s_last_frame.Load(refl_tc.xy * screen_res.xy, 0);
+#else
+    float3 img = s_last_frame.Sample(smp_nofilter, refl_tc.xy);
+#endif
 
 	/*Image.rgb, Reflcontrol.a*/
 	return float4(img.xyz, reflection*edge);
@@ -145,57 +153,61 @@ float3 specular_phong(float3 pnt, float3 normal, float3 light_direction)
 //*******************************************************************************************************************
 uniform float4 rain_params; //x = raindensity
 
+#define WATER_SPLASHES_MAX_RADIUS 1.5 // Maximum number of cells a ripple can cross.
+//#define WATER_SPLASHES_DOUBLE_HASH	  // дополнительный шум
+
 float hash12(float2 p)
 {
-	float3 p3  = frac(float3(p.xyx) * .1031);
-    p3 += dot(p3, p3.yzx + 19.19);
-    return frac((p3.x + p3.y) * p3.z);
+	float3 p3 = frac(float3(p.xyx) * .1031);
+	p3 += dot(p3, p3.yzx + 19.19);
+	return frac((p3.x + p3.y) * p3.z);
 }
 
 float2 hash22(float2 p)
 {
 	float3 p3 = frac(float3(p.xyx) * float3(.1031, .1030, .0973));
-    p3 += dot(p3, p3.yzx+19.19);
-    return frac((p3.xx+p3.yz)*p3.zy);
+	p3 += dot(p3, p3.yzx + 19.19);
+	return frac((p3.xx + p3.yz) * p3.zy);
 }
 
-float ripples(float2 tc, float size)
+float3 calc_rain_splashes(float2 tc)
 {
-	float2 uv = tc * size;
-    float2 p0 = floor(uv);
-
-    float2 circles;
-    for (int j = -2; j <= 2; ++j)
-    {
-        for (int i = -2; i <= 2; ++i)
-        {
+	float2 p0 = floor(tc * 35);
+
+	float circles = 0;
+
+	for (int j = -WATER_SPLASHES_MAX_RADIUS; j <= WATER_SPLASHES_MAX_RADIUS; ++j)
+	{
+		for (int i = -WATER_SPLASHES_MAX_RADIUS; i <= WATER_SPLASHES_MAX_RADIUS; ++i)
+		{
 			float2 pi = p0 + float2(i, j);
-            float2 hsh = hash22(pi);
-            float2 p = pi + hash22(hsh);
-
-            float t = frac(0.35f*timers.x + hash12(hsh));
-            float2 v = p - uv;
-            float d = length(v) - (float(2.f) + 1.)*t;
-
-            float h = 1e-3;
-
-			//1st pass
-            float d1 = d - h;
-            float p1 = sin(31.*d1) * smoothstep(-0.6, -0.3, d1) * smoothstep(0., -0.3, d1);
-			//sec pass
-            float d2 = d + h;
-            float p2 = sin(31.*d2) * smoothstep(-0.6, -0.3, d2) * smoothstep(0., -0.3, d2);
-            circles += 0.5 * normalize(v) * ((p2 - p1) / (2. * h) * (1. - t) * (1. - t));
-        }
-    }
-    circles /= float((2*3+1)*(2*2+1));
-
-    float intensity = lerp(0.025f, 0.15, smoothstep(0.1, 0.6, frac(0.05 + 0.05)*2.-1.));
-    float3 n = float3(circles, sqrt(1. - dot(circles, circles)));
-	
-	float final = 10.*pow(clamp(dot(n, normalize(float3(1., 0.7, 0.5))), 0., 1.), 6.);
-	return final;
+		#ifdef WATER_SPLASHES_DOUBLE_HASH
+			float2 hsh = hash22(pi);
+		#else
+			float2 hsh = pi;
+		#endif
+			float2 p = pi + hash22(hsh);
+
+			float t = frac(1.45f * timers.x + hash12(hsh));
+			float2 v = p - tc * 35;
+
+			float d = (length(v) * 2.0f) - (float(WATER_SPLASHES_MAX_RADIUS) + 1.0) * t;
+
+			const float h = 1e-3;
+			float d1 = d - h;
+			float d2 = d + h;
+			float p1 = sin(31. * d1) * smoothstep(-0.6, -0.3, d1) * smoothstep(0., -0.3, d1);
+			float p2 = sin(31. * d2) * smoothstep(-0.6, -0.3, d2) * smoothstep(0., -0.3, d2);
+			circles += 0.5 * normalize(v) * ((p2 - p1) / (2. * h) * (1. - t) * (1. - t));
+		}
+	}
+
+	float c = float(WATER_SPLASHES_MAX_RADIUS * 2 + 1);
+	circles /= c * c;
+
+	return float3(circles.xx, sqrt(1.0f - dot(circles, circles)));
 }
+
 //*******************************************************************************************************************
 
 #endif

Game/Resources_SoC_1.0006/gamedata/shaders/r3/models_lense_scope.ps

@@ -43,7 +43,7 @@ cbuffer static_globals
     uniform float4 pos_decompression_params2;
 
     uniform float4 parallax;
-    //	uniform float4		screen_res;		// Screen resolution (x-Width,y-Height, zw - 1/resolution)
+    uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
 }
 
 /*

Game/Resources_SoC_1.0006/gamedata/shaders/r3/models_lense_scope_night.ps

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/models_lfo_light_dot_weapons.ps

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/models_zoom_gauss.ps

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/ogse_functions.h

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/ogsr_sslr.h

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/rain_layer.ps

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/reflections.h

@@ -1,6 +1,4 @@
-#include "common_iostructs.h"
-
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
+#include "common.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex

Game/Resources_SoC_1.0006/gamedata/shaders/r3/shared/common.h

@@ -1,7 +1,5 @@
 #include "common.h"
 
-uniform float4 screen_res; // Screen resolution (x-Width,y-Height, zw - 1/resolution)
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex
 p_screen main(v2p_screen I)