Апдейт ресурсов

Author: xrSimpodin

Game/Resources_SoC_1.0006/gamedata/config/external.ltx

@@ -240,7 +240,7 @@ run_speed      = 6.74
 walk_amplitude = 0.005
 walk_speed     = 6.26
 crouch_k = 0.75
-;zoom_k   = 0.1
+zoom_k   = 0.1
 scope_zoom_k = 0.1
 
 

Game/Resources_SoC_1.0006/gamedata/config/ui/ui_mm_opt.xml

@@ -622,7 +622,7 @@
 			<text font="letterica16" r="215" g="195" b="170">ui_mm_r2_actor_shadow</text>
 		</cap_r2_actor_shadow>
 		<check_r2_actor_shadow x="249" y="0" width="30" height="21">
-			<options_item entry="r__actor_shadow" group="mm_opt_video_adv"/>
+			<options_item entry="g_actor_shadow" group="mm_opt_video_adv"/>
 		</check_r2_actor_shadow>
 
 		<cap_r_sslr_enable x="5" y="5" width="143" height="21">

Game/Resources_SoC_1.0006/gamedata/scripts/level_weathers.script

@@ -55,7 +55,7 @@ function WeatherManager:select_weather(forced)
 		--
 		env_desc.wind_direction = utils.deg2rad(math.random(360)) --Рандомный угол ветра
 		--
-		env_desc.m_fSunShaftsIntensity = math.random(3000) * 0.0001 --Рандомная интенсивность лучей
+		env_desc.m_fSunShaftsIntensity = math.random(1500) * 0.0001 --Рандомная интенсивность лучей
 		--
 		--log3("--[%s][%s] wind_velocity: [%s], wind_direction: [%s], m_fSunShaftsIntensity: [%s]", script_name(), idx, env_desc.wind_velocity, env_desc.wind_direction, env_desc.m_fSunShaftsIntensity)
 	end

Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_video_adv.script

@@ -17,12 +17,12 @@ local adv_vid_opt_params = {
 	--
 	{ "vis_dist",              "track", 0, hint_colors.yellow, "video_settings_name_2" , "video_settings_desc_2"  },
 	{ "geometry_lod",          "track", 0, hint_colors.yellow, "video_settings_name_3" , "video_settings_desc_3"  },
-	{ "dyn_opt_dist",          "track", 0, hint_colors.yellow, "video_settings_name_68", "video_settings_desc_68" },
+--	{ "dyn_opt_dist",          "track", 0, hint_colors.yellow, "video_settings_name_68", "video_settings_desc_68" },
 	--
 	{ "r__smap_size",          "list",  1, hint_colors.red   , "video_settings_name_59", "video_settings_desc_59" },
 	{ "r2_sun_quality",        "list",  0, hint_colors.red   , "", ""                                             },
 	{ "sun_shafts",            "list",  0, hint_colors.yellow, "video_settings_name_29", "video_settings_desc_29" },
---	{ "r2_actor_shadow",       "check", 0, hint_colors.green , "video_settings_name_56", ""                       },
+	{ "r2_actor_shadow",       "check", 0, hint_colors.green , "video_settings_name_56", ""                       },
 	{ "lens_flare",            "check", 0, hint_colors.green,  "video_settings_name_67", "" },
 	--
 	{ "ao_mode",               "list",  0, hint_colors.red   , "video_settings_name_38", "video_settings_desc_38" },

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

@@ -1,10 +1,9 @@
 function normal(shader, t_base, t_second, t_detail)
-  shader:begin("effects_sun","stub_default")
---        : sorting        (2, false)
---        : blend                (true,blend.srcalpha,blend.invsrcalpha)
---        : blend                (true,blend.one,blend.one)
-        : blend                (true,blend.srcalpha,blend.one)
-		: zb                (false,false)
-	shader:dx10texture	("s_base", t_base)
-	shader:dx10sampler	("smp_base")
+	shader:begin("effects_flare", "effects_flare")
+		: blend(true, blend.srcalpha, blend.one)
+		: zb(false, false)
+	shader:dx10texture("s_base", t_base)
+	shader:dx10texture("s_position", "$user$position")
+	shader:dx10sampler("smp_base")
+	shader:dx10sampler("smp_nofilter")
 end

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

@@ -0,0 +1,28 @@
+#include "common.h"
+
+struct v2p_flare
+{
+    float2 Tex0 : TEXCOORD0;
+    float4 Tex1	: TEXCOORD1;
+    float4 Color : COLOR;
+    float4 HPos : SV_Position;
+};
+
+uniform float4x4 mVPTexgen;
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// Vertex
+v2p_flare main(v_TL I)
+{
+    v2p_flare O;
+
+    O.HPos = mul(m_VP, I.P); // xform, input in world coords
+
+    O.Tex0 = I.Tex0;
+    O.Tex1 = mul(mVPTexgen, I.P);
+    O.Tex1.z = O.HPos.z;
+
+    O.Color = I.Color.bgra; //	swizzle vertex colour
+
+    return O;
+}

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

@@ -1,11 +1,9 @@
 function normal(shader, t_base, t_second, t_detail)
-  shader:begin("effects_sun","stub_default")
---        : sorting        (2, false)
---        : blend                (true,blend.srcalpha,blend.invsrcalpha)
---        : blend                (true,blend.one,blend.one)
-        : blend                (true,blend.srcalpha,blend.one)
-		: zb                (true,false)
---  shader:sampler        ("s_base")       :texture  (t_base)
-	shader:dx10texture	("s_base", t_base)
-	shader:dx10sampler	("smp_base")
+  shader:begin("effects_sun","effects_sun")
+		: blend(true, blend.srcalpha, blend.one)
+		: zb(true,false)
+	shader:dx10texture("s_base", t_base)
+	shader:dx10texture("s_position", "$user$position")
+	shader:dx10sampler("smp_base")
+	shader:dx10sampler("smp_nofilter")
 end

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

@@ -1,15 +1,27 @@
 #include "common.h"
 
+struct v2p_sun
+{
+    float2 Tex0 : TEXCOORD0;
+    float4 Tex1	: TEXCOORD1;
+    float4 Color : COLOR;
+    float4 HPos : SV_Position;
+};
+
+uniform float4x4 mVPTexgen;
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Vertex
-v2p_TL main(v_TL I)
+v2p_sun main(v_TL I)
 {
-    v2p_TL O;
+    v2p_sun O;
 
-    //	O.HPos = I.P;
     O.HPos = mul(m_VP, I.P); // xform, input in world coords
-    O.HPos.z = O.HPos.w;
+
     O.Tex0 = I.Tex0;
+    O.Tex1 = mul(mVPTexgen, I.P);
+    O.Tex1.z = O.HPos.z;
+
     O.Color = I.Color.bgra; //	swizzle vertex colour
 
     return O;