Merge branch 'dev' into add-pda-keys

.gitignore

@@ -12,7 +12,7 @@ cmake_install.cmake
 cmake-build-*
 install_manifest.txt
 bin/
-build/
+[bB]uild*/
 intermediate/
 intermediate_plugs/
 lib/

README.md

@@ -95,7 +95,10 @@ of all the original source code and S.T.A.L.K.E.R. franchise. However, they know
 You may provide financial support for this project by donating via different ways:
 * [Boosty](https://boosty.to/openxray) – a large part of the team is located in Russia, if you have an ability to donate through Boosty, please use it, since we don't have an ability to withdraw funds from services like Patreon, etc. to our local Russian banking cards/accounts.
 * [GitHub Sponsors](https://github.com/sponsors/OpenXRay), [Patreon](https://patreon.com/openxray), [Open Collective](https://opencollective.com/openxray) – funds raised from these services will be used to support our developers outside of Russia, and also we may use them to pay for paid services on GitHub, AppVeyor, etc.
-* Bitcoin wallet: 363ZUoWcQe9fDvRPK9Kee2YuPdyhSFQpr2
+* BTC: 363ZUoWcQe9fDvRPK9Kee2YuPdyhSFQpr2
+* ETH: 0x45a4fe8566e76946591e1eeabf190aa09b1cdb66
+* TRX: TGx7QAhTPsRcwnb4mwCtNDU7NF6kuoACpt
+* Please, contact @xottab_duty in [our Discord](discord.gg/sjRMQwv) if you would like to use another cryptocurrency.
 
 Thank you for your support!
 

res/gamedata/shaders/r3/common_defines.h

@@ -11,19 +11,12 @@
 #define def_hdr         float(9.h)         		// hight luminance range float(3.h)
 #define def_hdr_clip	float(0.75h)        		//
 
+#define	LUMINANCE_VECTOR	float3(0.3f, 0.38f, 0.22f)
+
 //////////////////////////////////////////////////////////////////////////////////////////
 #ifndef SMAP_size
-#define SMAP_size        2048
+#define SMAP_size        1024
 #endif
 //////////////////////////////////////////////////////////////////////////////////////////
 
-#define SKY_DEPTH float(10000.0)
-#define SKY_EPS float(0.001)
-#define FARPLANE float(180.0)
-
-#define USABLE_BIT_13 uint(0x02000000)   // This will be translated to a +/-MAX_FLOAT in the FP16 render target (0xFBFF/0x7BFF), overwriting the 
-#define USABLE_BIT_14 uint(0x04000000)   // mantissa bits where other bit flags are stored.
-#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
-
 #endif	//	common_defines_h_included

res/gamedata/shaders/r3/shared/common.h

@@ -2,6 +2,7 @@
 //  All comments by Nivenhbro are preceded by !
 /////////////////////////////////////////////////
 
+
 #ifndef SHARED_COMMON_H
 #define SHARED_COMMON_H
 
@@ -26,7 +27,6 @@ cbuffer	shader_params
 cbuffer	static_globals
 {
 	uniform float3x4		m_V;
-	uniform float3x4	m_inv_V;
 	uniform float4x4 	m_P;
 	uniform float4x4 	m_VP;
 
@@ -40,20 +40,14 @@ cbuffer	static_globals
 	uniform float3		L_sun_color;
 	uniform float3		L_sun_dir_w;
 	uniform float4		L_hemi_color;
-	uniform float4 		Ldynamic_dir;
-	uniform float4 		Ldynamic_pos;
-	uniform float4 		Ldynamic_color;
 
 	uniform float3 		eye_position;
 
 	uniform float4 		pos_decompression_params;
 	uniform float4 		pos_decompression_params2;
 
 	uniform float4		parallax;
-	uniform float4		screen_res;		// Screen resolution (x-Width,y-Height, zw - 1/resolution)
-	uniform float4		rain_params; //x = raindensity, y = wetness 
-	uniform float4		pp_img_corrections;
-	uniform float4		pp_img_cg;
+//	uniform float4		screen_res;		// Screen resolution (x-Width,y-Height, zw - 1/resolution)
 }
 
 /*
@@ -87,4 +81,5 @@ float2 	calc_xz_wave 	(float2 dir2D, float frac)
 	return  lerp	(ctrl_A, ctrl_B, frac);			//!This calculates tree wave. No changes made
 }
 
+
 #endif

res/gamedata/shaders/r5/accum_mask.vs

@@ -0,0 +1,7 @@
+#include "common.h"
+
+float4 main ( float4 P: POSITION ) : SV_Position
+{
+	return 	mul ( m_WVP, P );
+}
+FXVS;

res/gamedata/shaders/r5/accum_sun.vs

@@ -0,0 +1,21 @@
+#include "common.h"
+
+//////////////////////////////////////////////////////////////////////////////////////////
+uniform float4x4	m_texgen;
+#ifdef	USE_SJITTER
+uniform float4x4	m_texgen_J;
+#endif
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// Vertex
+v2p_volume main ( float4 P: POSITION )
+{
+	v2p_volume	O;
+	O.hpos 		= mul( m_WVP, P );
+	O.tc 		= mul( m_texgen, P );
+#ifdef	USE_SJITTER
+	O.tcJ 		= mul( m_texgen_J, P );
+#endif
+ 	return	O;
+}
+FXVS;

res/gamedata/shaders/r5/accum_volume.vs

@@ -0,0 +1,21 @@
+#include "common.h"
+
+//////////////////////////////////////////////////////////////////////////////////////////
+uniform float4x4	m_texgen;
+#ifdef	USE_SJITTER
+uniform float4x4	m_texgen_J;
+#endif
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// Vertex
+v2p_volume main ( float4 P: POSITION )
+{
+	v2p_volume	O;
+	O.hpos 		= mul( m_WVP, P );
+	O.tc 		= mul( m_texgen, P );
+#ifdef	USE_SJITTER
+	O.tcJ 		= mul( m_texgen_J, P );
+#endif
+ 	return	O;
+}
+FXVS;

res/gamedata/shaders/r5/accum_volumetric.s

@@ -0,0 +1,21 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_volumetric", "accum_volumetric")
+			: fog		(false)
+			: zb 		(true,false)
+			: blend		(true,blend.one,blend.one)
+--			: aref 		(true,0)
+			: sorting	(2, false)
+--	TODO: Implement sampler states
+--	shader:sampler	("s_lmap")      :texture	(t_base): clamp()
+--	shader:sampler	("s_smap")      :texture	("null")
+--	shader:sampler	("s_noise")    	:texture("fx\\fx_noise")	: f_linear ()
+
+	shader:dx10texture	("s_lmap", t_base)	
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_noise", "fx\\fx_noise")
+
+	shader:dx10sampler	("smp_rtlinear")
+	shader:dx10sampler	("smp_linear")
+--	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric.vs

@@ -0,0 +1,44 @@
+#include "common.h"
+
+cbuffer VolumetricLights
+{
+	float3	vMinBounds;
+	float3	vMaxBounds;
+	float4	FrustumClipPlane[6];
+}
+
+struct v2p
+{
+	float3 	lightToPos	: TEXCOORD0;		// light center to plane vector
+	float3 	vPos		: TEXCOORD1;		// position in camera space
+	float 	fDensity	: TEXCOORD2;		// plane density alon Z axis
+//	float2	tNoise 		: TEXCOORD3;		// projective noise
+	float3	clip0		: SV_ClipDistance0;
+	float3	clip1		: SV_ClipDistance1;
+	float4 	hpos		: SV_Position;
+};
+
+v2p main ( float3 P : POSITION )
+{
+	v2p 		o;
+	float4	vPos;
+	vPos.xyz 	= lerp( vMinBounds, vMaxBounds, P);	//	Position in camera space
+	vPos.w 		= 1;
+	o.hpos 		= mul			(m_P, vPos);		// xform, input in camera coordinates
+
+	o.lightToPos = vPos.xyz - Ldynamic_pos.xyz;
+	o.vPos = vPos;
+
+//	o.fDensity = (vMaxBounds.z-vMinBounds.z)/2000.0h;
+//	o.fDensity = (vMaxBounds.z-vMinBounds.z)/2000.0h*2;
+	o.fDensity = 1.0h/40.0h;
+//	o.fDensity = 1.0h/20.0h;
+
+	for (int i=0; i<3; ++i)
+	{
+		o.clip0[i] = dot( o.hpos, FrustumClipPlane[i]);
+		o.clip1[i] = dot( o.hpos, FrustumClipPlane[i+3]);
+	}
+
+	return o;
+}

res/gamedata/shaders/r5/accum_volumetric_nomsaa.s

@@ -0,0 +1,21 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_volumetric", "accum_volumetric")
+			: fog		(false)
+			: zb 		(true,false)
+			: blend		(true,blend.one,blend.one)
+--			: aref 		(true,0)
+			: sorting	(2, false)
+--	TODO: Implement sampler states
+--	shader:sampler	("s_lmap")      :texture	(t_base): clamp()
+--	shader:sampler	("s_smap")      :texture	("null")
+--	shader:sampler	("s_noise")    	:texture("fx\\fx_noise")	: f_linear ()
+
+	shader:dx10texture	("s_lmap", t_base)	
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_noise", "fx\\fx_noise")
+
+	shader:dx10sampler	("smp_rtlinear")
+	shader:dx10sampler	("smp_linear")
+--	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_nomsaa.vs

@@ -0,0 +1 @@
+#include "accum_volumetric.vs"

res/gamedata/shaders/r5/accum_volumetric_sun.s

@@ -0,0 +1,21 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("stub_notransform_2uv", "accum_volumetric_sun_normal")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture  ("s_smap_minmax",	"$user$smap_depth_minmax");
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_sun_minmax.s

@@ -0,0 +1,21 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_sun", "accum_volumetric_sun_minmax")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture  ("s_smap_minmax",	"$user$smap_depth_minmax");
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_sun_msaa0.s

@@ -0,0 +1,20 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_sun", "accum_volumetric_sun_msaa0")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_sun_msaa1.s

@@ -0,0 +1,20 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_sun", "accum_volumetric_sun_msaa1")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_sun_msaa2.s

@@ -0,0 +1,20 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_sun", "accum_volumetric_sun_msaa2")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_sun_msaa3.s

@@ -0,0 +1,20 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_sun", "accum_volumetric_sun_msaa3")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end

res/gamedata/shaders/r5/accum_volumetric_sun_msaa4.s

@@ -0,0 +1,20 @@
+function normal		(shader, t_base, t_second, t_detail)
+	shader:begin	("accum_sun", "accum_volumetric_sun_msaa4")
+			: fog		(false)
+			: zb 		(false,false)
+			: blend		(true,blend.one,blend.one)
+			: sorting	(2, false)
+--	TODO: DX10: Implement for near and far phase.
+--	TODO: DX10: Setup samplers.
+--	shader:sampler	("s_smap")      :texture ("null")
+--	shader:sampler	("s_position")	:texture ("$user$position")
+--	shader:sampler	("jitter0")	:texture ("$user$jitter_0") : f_none ()
+
+	shader:dx10texture	("s_smap", "null")
+	shader:dx10texture	("s_position", "$user$position")
+	shader:dx10texture	("jitter0", "$user$jitter_0")
+
+	shader:dx10sampler	("smp_nofilter")
+	shader:dx10sampler	("smp_jitter")
+	shader:dx10sampler	("smp_smap")
+end