From 9c05872304f1c9c234a4399cc35c22b41239b25d Mon Sep 17 00:00:00 2001 From: Xottab_DUTY Date: Sun, 7 Apr 2019 18:40:12 +0500 Subject: [PATCH] Revert "Changed default user.ltx settings to fix known glitches of default values" This reverts commit dd30b4a8b26ae43a9d426ea93ddf944b8849860b. --- .../layers/xrRender/xrRender_console.cpp | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/cs/engine/layers/xrRender/xrRender_console.cpp b/cs/engine/layers/xrRender/xrRender_console.cpp index cc66eb5cb..a3d7b009f 100644 --- a/cs/engine/layers/xrRender/xrRender_console.cpp +++ b/cs/engine/layers/xrRender/xrRender_console.cpp @@ -117,7 +117,7 @@ float ps_r1_pps_v = 0.f ; // R1-specific int ps_r1_GlowsPerFrame = 16 ; // r1-only -float ps_r1_fog_luminance = 1.1f ; // r1-only +float ps_r1_fog_luminance = 1.f ; // r1-only // R2 float ps_r2_ssaLOD_A = 48.f ; @@ -125,10 +125,7 @@ float ps_r2_ssaLOD_B = 32.f ; float ps_r2_tf_Mipbias = 0.0f ; // R2-specific -Flags32 ps_r2_ls_flags = { R2FLAG_SUN - | R2FLAG_SUN_FOCUS - | R2FLAG_SUN_TSM - | R2FLAG_TONEMAP +Flags32 ps_r2_ls_flags = { R2FLAG_SUN //| R2FLAG_SUN_IGNORE_PORTALS | R2FLAG_EXP_DONT_TEST_UNSHADOWED | R2FLAG_USE_NVSTENCIL | R2FLAG_EXP_SPLIT_SCENE @@ -146,45 +143,45 @@ Flags32 ps_r2_ls_flags_ext = { float ps_r2_df_parallax_h = 0.02f; float ps_r2_df_parallax_range = 75.f; -float ps_r2_tonemap_middlegray = 1.f; // r2-only -float ps_r2_tonemap_adaptation = 4.f; // r2-only -float ps_r2_tonemap_low_lum = 0.0001f; // r2-only -float ps_r2_tonemap_amount = 0.7f; // r2-only -float ps_r2_ls_bloom_kernel_g = 3.0f; // r2-only +float ps_r2_tonemap_middlegray = 0.25f; // r2-only +float ps_r2_tonemap_adaptation = 5.f; // r2-only +float ps_r2_tonemap_low_lum = 0.001f; // r2-only +float ps_r2_tonemap_amount = 0.5f; // r2-only +float ps_r2_ls_bloom_kernel_g = 3.3f; // r2-only float ps_r2_ls_bloom_kernel_b = .7f; // r2-only -float ps_r2_ls_bloom_speed = 100.f; // r2-only -float ps_r2_ls_bloom_kernel_scale = 0.6f; // r2-only // gauss +float ps_r2_ls_bloom_speed = 10.f; // r2-only +float ps_r2_ls_bloom_kernel_scale = 1.0f; // r2-only // gauss float ps_r2_ls_dsm_kernel = .7f; // r2-only float ps_r2_ls_psm_kernel = .7f; // r2-only float ps_r2_ls_ssm_kernel = .7f; // r2-only -float ps_r2_ls_bloom_threshold = .2f; // r2-only +float ps_r2_ls_bloom_threshold = .3f; // r2-only Fvector ps_r2_aa_barier = { .8f, .1f, 0}; // r2-only Fvector ps_r2_aa_weight = { .25f,.25f,0}; // r2-only float ps_r2_aa_kernel = .5f; // r2-only -float ps_r2_mblur = .0f; // .5f +float ps_r2_mblur = .5f; // .5f int ps_r2_GI_depth = 1; // 1..5 int ps_r2_GI_photons = 16; // 8..64 float ps_r2_GI_clip = EPS_L; // EPS float ps_r2_GI_refl = .9f; // .9f float ps_r2_ls_depth_scale = 1.00001f; // 1.00001f -float ps_r2_ls_depth_bias = -0.0003f; // -0.0001f +float ps_r2_ls_depth_bias = -0.0001f; // -0.0001f float ps_r2_ls_squality = 1.0f; // 1.00f -float ps_r2_sun_tsm_projection = 0.6f; // 0.18f -float ps_r2_sun_tsm_bias = -0.1f; // -float ps_r2_sun_near = 16.f; // 12.0f +float ps_r2_sun_tsm_projection = 0.18f; // 0.18f +float ps_r2_sun_tsm_bias = -0.05f; // +float ps_r2_sun_near = 12.f; // 12.0f extern float OLES_SUN_LIMIT_27_01_07; // actually sun_far float ps_r2_sun_near_border = 0.75f; // 1.0f -float ps_r2_sun_depth_far_scale = 0.9996f; // 1.00001f -float ps_r2_sun_depth_far_bias = -0.000002f; // -0.0000f -float ps_r2_sun_depth_near_scale = 0.9999f; // 1.00001f -float ps_r2_sun_depth_near_bias = 0.00005f; // -0.00005f +float ps_r2_sun_depth_far_scale = 1.00000f; // 1.00001f +float ps_r2_sun_depth_far_bias = 0.00000f; // -0.0000f +float ps_r2_sun_depth_near_scale = 1.00001f; // 1.00001f +float ps_r2_sun_depth_near_bias = -0.00004f; // -0.00005f float ps_r2_sun_lumscale = 1.0f; // 1.0f float ps_r2_sun_lumscale_hemi = 1.0f; // 1.0f float ps_r2_sun_lumscale_amb = 1.0f; -float ps_r2_gmaterial = 2.2f; // -float ps_r2_zfill = 0.5f; // .1f +float ps_r2_gmaterial = 0.f; // +float ps_r2_zfill = 0.1f; // .1f float ps_r2_dhemi_sky_scale = 0.08f; // 1.5f float ps_r2_dhemi_light_scale = 0.2f ; @@ -211,7 +208,7 @@ float ps_current_detail_density = 0.6; // KD // x - min (0), y - focus (1.4), z - max (100) -Fvector3 ps_r2_dof = Fvector3().set(-1.25f, 1.4f, 10000.f); +Fvector3 ps_r2_dof = Fvector3().set(-1.4f, 0.0f, 250.f); float ps_r2_dof_sky = 30; // distance to sky float ps_r2_dof_kernel_size = 7.0f; // 7.0f