Skip to content

Commit 617d43a

Browse files
xrSimpAIxrSimpAI
committed
Настройки для Motion blur от VOX93 + опции в меню
1 parent 220ebea commit 617d43a

File tree

6 files changed

+38
-20
lines changed

6 files changed

+38
-20
lines changed

‎Game/Resources_SoC_1.0006/gamedata/config/text/eng/ui_st_mm.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,11 @@
432432
<string id="ui_mm_r4_enable_tessellation">
433433
<text>Tessellation</text>
434434
</string>
435-
<string id="ui_mm_soft_particles">
436-
<text>Soft particles</text>
435+
<string id="ui_mm_mblur">
436+
<text>Motion blur</text>
437437
</string>
438-
<string id="ui_mm_r__bloodmarks">
439-
<text>Bloodmarks</text>
438+
<string id="ui_mm_mblur_param">
439+
<text>Motion blur intensity</text>
440440
</string>
441441
<string id="ui_mm_r2_details_opt">
442442
<text>Details optimization</text>
@@ -680,7 +680,7 @@
680680

681681

682682
<string id="video_settings_name_1">
683-
<text>Multisample anti-aliasing - r3_msaa</text>
683+
<text>Motion blur - r2_mblur_enable</text>
684684
</string>
685685
<string id="video_settings_name_2">
686686
<text>Visibility range-rs_vis_distance</text>
@@ -770,7 +770,7 @@
770770
<text>Volume ray type - r2_sunshafts_mode</text>
771771
</string>
772772
<string id="video_settings_name_31">
773-
<text>The soft edge of the water - r2_soft_water</text>
773+
<text>Motion blur intensity - r2_mblur</text>
774774
</string>
775775
<string id="video_settings_name_32">
776776
<text>Soft particles - r2_soft_particles</text>
@@ -888,7 +888,7 @@
888888
</string>
889889

890890
<string id="video_settings_desc_1">
891-
<text>MSAA is a very heavy and at the same time very high quality type of anti-aliasing. Qualitatively smoothes wires, vegetation, translucent geometry.</text>
891+
<text>Motion blur - blurring of the image when turning the camera, playing scenes of movement or fast-moving objects.</text>
892892
</string>
893893
<string id="video_settings_desc_2">
894894
<text>This setting adjusts the amount by which the visibility limit set in the current weather profile is multiplied. The range of values of this value is from 0.4 (minimum slider) to 1 (maximum slider). For example, in the weather, a viewing range of 150 meters is set. At the minimum of the slider you will see at 60 meters, at the maximum at 150.</text>

‎Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_mm.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,11 @@
426426
<string id="ui_mm_r4_enable_tessellation">
427427
<text>Òåññåëÿöèÿ</text>
428428
</string>
429-
<string id="ui_mm_soft_particles">
430-
<text>Ìÿãêèå ÷àñòèöû</text>
429+
<string id="ui_mm_mblur">
430+
<text>Ðàçìûòèå â äâèæåíèè</text>
431431
</string>
432-
<string id="ui_mm_r__bloodmarks">
433-
<text>Áëóäìàðêè</text>
432+
<string id="ui_mm_mblur_param">
433+
<text>Èíòåíñèâíîñòü ðàçìûòèÿ â äâèæåíèè</text>
434434
</string>
435435
<string id="ui_mm_r2_details_opt">
436436
<text>Îïòèìèçàöèÿ òðàâû</text>
@@ -661,7 +661,7 @@
661661

662662

663663
<string id="video_settings_name_1">
664-
<text>Multisample anti-aliasing - r3_msaa</text>
664+
<text>Ðàçìûòèå â äâèæåíèè - r2_mblur_enable</text>
665665
</string>
666666
<string id="video_settings_name_2">
667667
<text>Äàëüíîñòü âèäèìîñòè - rs_vis_distance</text>
@@ -745,7 +745,7 @@
745745
<text>Ìÿãêèå òåíè îò ñîëíöà</text>
746746
</string>
747747
<string id="video_settings_name_31">
748-
<text>Ìÿãêèå êðàÿ âîäû - r2_soft_water</text>
748+
<text>Èíòåíñèâíîñòü ðàçìûòèÿ â äâèæåíèè - r2_mblur</text>
749749
</string>
750750
<string id="video_settings_name_32">
751751
<text>Ìÿãêèå ÷àñòèöû - r2_soft_particles</text>
@@ -863,7 +863,7 @@
863863
</string>
864864

865865
<string id="video_settings_desc_1">
866-
<text>MSAA - î÷åíü òÿæåëûé è â òîæå âðåìÿ î÷åíü êà÷åñòâåííûé òèï ñãëàæèâàíèÿ. Êà÷åñòâåííî ñãëàæèâàåò ïðîâîäà, ðàñòèòåëüíîñòü, ïîëóïðîçðà÷íóþ ãåîìåòðèþ.</text>
866+
<text>Motion blur - ðàçìûòèå èçîáðàæåíèÿ ïðè ïîâîðîòå êàìåðû, âîñïðîèçâåäåíèè ñöåí äâèæåíèÿ èëè áûñòðî äâèæóùèõñÿ îáúåêòîâ.</text>
867867
</string>
868868
<string id="video_settings_desc_2">
869869
<text>Ýòà íàñòðîéêà ðåãóëèðóåò âåëè÷èíó, íà êîòîðóþ óìíîæàåòñÿ ïðåäåëüíîå ðàññòîÿíèå âèäèìîñòè, óñòàíîâëåííîå â ïðîôèëå òåêóùåé ïîãîäû. Äèàïàçîí çíà÷åíèé ýòîé âåëè÷èíû - îò 0.4 (ìèíèìóì ïîëçóíêà) äî 1 (ìàêñèìóì ïîëçóíêà). Íàïðèìåð, â ïîãîäå óñòàíîâëåíà äàëüíîñòü îáçîðà 150 ìåòðîâ. Íà ìèíèìóìå ïîëçóíêà âû áóäåòå âèäåòü íà 60 ìåòðîâ, íà ìàêñèìóìå íà 150.</text>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,20 @@
535535
<options_item entry="ssfx_wpn_dof_2" group="mm_opt_video_adv"/>
536536
</track_dof_zoom_param>
537537

538+
<cap_mblur x="5" y="5" width="143" height="21">
539+
<text font="letterica16" r="215" g="195" b="170">ui_mm_mblur</text>
540+
</cap_mblur>
541+
<check_mblur x="249" y="0" width="30" height="21">
542+
<options_item entry="r2_mblur_enable" group="mm_opt_video_adv" depend="vid"/>
543+
</check_mblur>
544+
545+
<cap_mblur_param x="5" y="5" width="143" height="21">
546+
<text font="letterica16" r="215" g="195" b="170">ui_mm_mblur_param</text>
547+
</cap_mblur_param>
548+
<track_mblur_param x="249" y="0" width="190" height="21" step="0.01">
549+
<options_item entry="r2_mblur" group="mm_opt_video_adv"/>
550+
</track_mblur_param>
551+
538552
<cap_3dss_scale_factor x="5" y="5" width="143" height="21">
539553
<text font="letterica16" r="215" g="195" b="170">ui_mm_3dss_scale_factor</text>
540554
</cap_3dss_scale_factor>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ local adv_vid_opt_params = {
4949
{ "dof_reload", "check", 0, hint_colors.green , "video_settings_name_41", "video_settings_desc_41" },
5050
{ "dof_zoom", "check", 0, hint_colors.green , "video_settings_name_42", "video_settings_desc_42" },
5151
{ "dof_zoom_param", "track", 0, hint_colors.green , "", "" },
52-
--
52+
--
53+
{ "mblur", "check", 0, hint_colors.green , "video_settings_name_1", "video_settings_desc_1" },
54+
{ "mblur_param", "track", 0, hint_colors.green , "video_settings_name_31", "" },
55+
--
5356
{ "r2_mask", "check", 0, hint_colors.green , "video_settings_name_66", "", },
5457
{ "r2_visor_refl", "check", 0, hint_colors.green , "video_settings_name_65", "", },
5558
{ "r2_rain_drops", "check", 0, hint_colors.green , "video_settings_name_47", "video_settings_desc_47" },

‎Game/Resources_SoC_1.0006/gamedata/shaders/r3/slb_motion_blur_settings.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#ifndef SLB_MOTION_BLUR_SETTINGS_H
22
#define SLB_MOTION_BLUR_SETTINGS_H
33

4-
#define SLB_MBLUR_SAMPLES int(4) /// Blur samples /// default int(4) /// vanilla int(6)
5-
#define SLB_MBLUR_CLAMP float(0.1) /// Max blur length /// default float(0.1) /// vanilla float(0.012)
6-
#define SLB_MBLUR_LENGTH float(120) /// Blur length /// default float(120) /// vanilla float(12)
4+
#define SLB_MBLUR_SAMPLES int(6) /// Blur samples /// default int(4) /// vanilla int(6)
5+
#define SLB_MBLUR_CLAMP float(0.012) /// Max blur length /// default float(0.1) /// vanilla float(0.012)
6+
#define SLB_MBLUR_LENGTH float(12) /// Blur length /// default float(120) /// vanilla float(12)
77

88
#define SLB_MBLUR_ANIMATED_DITHER /// Comment to disable
99
#define SLB_MBLUR_CONE_DITHER float(0.0) /// Cone like dithering aka blurriness // default float(0.0)
1010

11-
#define SLB_MBLUR_DUAL /// Blur in both directions. Comment to disable
12-
#define SLB_MBLUR_REVERSED /// Reverse blur direction. Comment to disable
11+
// #define SLB_MBLUR_DUAL /// Blur in both directions. Comment to disable
12+
// #define SLB_MBLUR_REVERSED /// Reverse blur direction. Comment to disable
1313

1414
#define SLB_MBLUR_WPN /// Disabled motion blur for weapon and hud. Comment to disable
1515
#define SLB_MBLUR_WPN_RADIUS float(1.3) /// default float(1.3)

‎ogsr_engine/xrGame/ui/UIOptionsItem.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ void CUIOptionsItem::SaveValue()
8080
m_entry == "r2_volumetric_lights" || m_entry == "r3_dynamic_wet_surfaces" || m_entry == "r__detail_radius" ||
8181
m_entry == "r2_sun_quality" || m_entry == "r_ao_mode" || m_entry == "r2_ssao" ||
8282
m_entry == "r_sslr_enable" || m_entry == "ssfx_height_fog" || m_entry == "ssfx_sky_debanding" || m_entry == "ssfx_indirect_light"
83+
|| m_entry == "r2_mblur_enable"
8384
)
8485
m_optionsManager.DoVidRestart();
8586

0 commit comments

Comments
 (0)