Skip to content

Commit aad0793

Browse files
Xottab-DUTYXottab-DUTY
committed
Added new advanced video and gameplay options:
FXAA, Grass details radius, shadow map size, DX10.1 usage, Loading stages and Always active Also added currently commented G-Buffer optimization and A-Test smoothing (Translation does not fit with the current UI size)
1 parent 7e4400a commit aad0793

7 files changed

Lines changed: 179 additions & 3 deletions

File tree

‎res/gamedata/configs/text/eng/ui_st_mm.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,9 @@
426426
<string id="ui_mm_alternative">
427427
<text>Alternative</text>
428428
</string>
429+
<string id="ui_mm_always_active">
430+
<text>Always active</text>
431+
</string>
429432
<string id="ui_mm_anisotropic">
430433
<text>Anisotropic filtering</text>
431434
</string>
@@ -471,6 +474,9 @@
471474
<string id="ui_mm_detail_density">
472475
<text>Grass detail density</text>
473476
</string>
477+
<string id="ui_mm_detail_radius">
478+
<text>Grass detail radius</text>
479+
</string>
474480
<string id="ui_mm_difficulty">
475481
<text>Difficulty</text>
476482
</string>
@@ -525,6 +531,9 @@
525531
<string id="ui_mm_load_game">
526532
<text>Load game</text>
527533
</string>
534+
<string id="ui_mm_loadingstages">
535+
<text>Show loading stages</text>
536+
</string>
528537
<string id="ui_mm_logout">
529538
<text>Quit profile</text>
530539
</string>
@@ -594,6 +603,9 @@
594603
<string id="ui_mm_r2_detail_bump">
595604
<text>Detail bump</text>
596605
</string>
606+
<string id="ui_mm_r2_fxaa">
607+
<text>FXAA</text>
608+
</string>
597609
<string id="ui_mm_r2_steep_parallax">
598610
<text>Steep parallax</text>
599611
</string>
@@ -606,6 +618,9 @@
606618
<string id="ui_mm_r2_sun_quality">
607619
<text>Sun quality</text>
608620
</string>
621+
<string id="ui_mm_r2_smap_size">
622+
<text>Shadow map quality</text>
623+
</string>
609624
<string id="ui_mm_r3_DX10_1">
610625
<text>Use DX10.1</text>
611626
</string>

‎res/gamedata/configs/text/rus/ui_st_mm.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,9 @@
426426
<string id="ui_mm_alternative">
427427
<text>Àëüòåðíàòèâà</text>
428428
</string>
429+
<string id="ui_mm_always_active">
430+
<text>Âñåãäà àêòèâåí</text>
431+
</string>
429432
<string id="ui_mm_anisotropic">
430433
<text>Ôèëüòðàöèÿ òåêñòóð</text>
431434
</string>
@@ -471,6 +474,9 @@
471474
<string id="ui_mm_detail_density">
472475
<text>Ïëîòíîñòü òðàâû</text>
473476
</string>
477+
<string id="ui_mm_detail_radius">
478+
<text>Äàëüíîñòü ïðîð. òðàâû</text>
479+
</string>
474480
<string id="ui_mm_difficulty">
475481
<text>Ñëîæíîñòü</text>
476482
</string>
@@ -525,6 +531,9 @@
525531
<string id="ui_mm_load_game">
526532
<text>Çàãðóçèòü èãðó</text>
527533
</string>
534+
<string id="ui_mm_loadingstages">
535+
<text>Ïîêàçûâàòü ñòàäèè çàãðóçêè</text>
536+
</string>
528537
<string id="ui_mm_logout">
529538
<text>Âûéòè èç ïðîôèëÿ</text>
530539
</string>
@@ -594,6 +603,9 @@
594603
<string id="ui_mm_r2_detail_bump">
595604
<text>Äåòàëüíûé ðåëüåô</text>
596605
</string>
606+
<string id="ui_mm_r2_fxaa">
607+
<text>FXAA</text>
608+
</string>
597609
<string id="ui_mm_r2_steep_parallax">
598610
<text>Steep parallax</text>
599611
</string>
@@ -606,6 +618,9 @@
606618
<string id="ui_mm_r2_sun_quality">
607619
<text>Êà÷åñòâî ñîëíöà</text>
608620
</string>
621+
<string id="ui_mm_r2_smap_size">
622+
<text>Êà÷åñòâî òåíåâûõ êàðò</text>
623+
</string>
609624
<string id="ui_mm_r3_DX10_1">
610625
<text>Èñïîëüçîâàòü DX10.1</text>
611626
</string>

‎res/gamedata/configs/ui/ui_mm_opt.xml‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,16 @@
172172
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_density</text>
173173
</cap_detail_density>
174174
<track_detail_density x="180" y="6" width="235" height="16" step="0.02" invert="1">
175-
<options_item entry="r__detail_density" group="mm_opt_video_adv"/>
175+
<options_item entry="r__detail_density" group="mm_opt_video_adv" depend="vid"/>
176176
</track_detail_density>
177177

178+
<cap_detail_radius x="20" y="3" width="135" height="24">
179+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_density</text>
180+
</cap_detail_radius>
181+
<track_detail_radius x="180" y="6" width="235" height="16" step="10" is_integer="1">
182+
<options_item entry="r__detail_density" group="mm_opt_video_adv" depend="vid"/>
183+
</track_detail_radius>
184+
178185
<cap_texture_lod x="20" y="3" width="135" height="24" >
179186
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_texture_quality</text>
180187
</cap_texture_lod>
@@ -228,6 +235,14 @@
228235
<options_item entry="r2_detail_bump" group="mm_opt_video"/>
229236
</check_r2_detail_bump>
230237

238+
<cap_r2_fxaa x="20" y="3" width="135" height="24">
239+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_fxaa</text>
240+
</cap_r2_fxaa>
241+
<check_r2_fxaa x="167" y="0" width="44" height="29">
242+
<texture>ui_inGame2_checkbox</texture>
243+
<options_item entry="r2_fxaa" group="mm_opt_video" depend="runtime"/>
244+
</check_r2_fxaa>
245+
231246
<cap_r2_steep_parallax x="20" y="3" width="135" height="24">
232247
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_steep_parallax</text>
233248
</cap_r2_steep_parallax>
@@ -236,6 +251,18 @@
236251
<options_item entry="r2_steep_parallax" group="mm_opt_video"/>
237252
</check_r2_steep_parallax>
238253

254+
<cap_r2_smap_size x="20" y="3" width="135" height="24">
255+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_smap_size</text>
256+
</cap_r2_smap_size>
257+
<list_r2_smap_size x="180" y="0" width="235" height="20" list_length="3">
258+
<options_item entry="r2_smap_size" group="mm_opt_video" depend="restart"/>
259+
<list_font r="170" g="170" b="170" font="letterica16"/>
260+
<text_color>
261+
<e r="170" g="170" b="170"/>
262+
<d r="70" g="70" b="70"/>
263+
</text_color>
264+
</list_r2_smap_size>
265+
239266
<cap_r2_sun_quality x="20" y="3" width="135" height="24">
240267
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_sun_quality</text>
241268
</cap_r2_sun_quality>
@@ -303,6 +330,13 @@
303330
<options_item entry="rs_refresh_60hz" group="mm_opt_video_adv" depend="vid"/>
304331
</check_60hz>
305332

333+
<cap_always_active x="20" y="3" width="135" height="24">
334+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_always_active</text>
335+
</cap_always_active>
336+
<check_always_active x="167" y="0" width="44" height="29">
337+
<texture>ui_inGame2_checkbox</texture>
338+
<options_item entry="always_active" group="mm_opt_video_adv" is_integer="1"/>
339+
</check_always_active>
306340

307341
<cap_sun_shafts x="20" y="3" width="135" height="24">
308342
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_sun_shafts</text>
@@ -407,6 +441,14 @@
407441
</text_color>
408442
</combo_r3_msaa_alphatest>
409443

444+
<cap_r3_gbuffer_opt x="20" y="3" width="135" height="24">
445+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_gbuffer_opt</text>
446+
</cap_r3_gbuffer_opt>
447+
<check_r3_gbuffer_opt x="167" y="0" width="44" height="29">
448+
<texture>ui_inGame2_checkbox</texture>
449+
<options_item entry="r3_msaa_opt" group="mm_opt_video_adv"/>
450+
</check_r3_gbuffer_opt>
451+
410452
<cap_r3_msaa_opt x="20" y="3" width="135" height="24">
411453
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_DX10_1</text>
412454
</cap_r3_msaa_opt>
@@ -553,6 +595,14 @@
553595
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
554596
</check_hud_draw>
555597

598+
<cap_check_loadingstages x="15" y="243" width="135" height="24">
599+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
600+
</cap_check_loadingstages>
601+
<check_loadingstages x="162" y="240" width="44" height="29">
602+
<texture>ui_inGame2_checkbox</texture>
603+
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
604+
</check_loadingstages>
605+
556606
<btn_check_updates x="338" y="322" width="108" height="24">
557607
<text align="c" font="letterica16">ui_mm_check_updates</text>
558608
<texture>ui_inGame2_button</texture>

‎res/gamedata/configs/ui/ui_mm_opt_16.xml‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,16 @@
175175
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_density</text>
176176
</cap_detail_density>
177177
<track_detail_density x="144" y="6" width="188" height="16" step="0.02" invert="1">
178-
<options_item entry="r__detail_density" group="mm_opt_video_adv"/>
178+
<options_item entry="r__detail_density" group="mm_opt_video_adv" depend="vid"/>
179179
</track_detail_density>
180180

181+
<cap_detail_radius x="16" y="3" width="108" height="24">
182+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_radius</text>
183+
</cap_detail_radius>
184+
<track_detail_radius x="144" y="6" width="188" height="16" step="10" is_integer="1">
185+
<options_item entry="r__detail_radius" group="mm_opt_video_adv" depend="vid"/>
186+
</track_detail_radius>
187+
181188
<cap_texture_lod x="16" y="3" width="108" height="24" >
182189
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_texture_quality</text>
183190
</cap_texture_lod>
@@ -231,6 +238,14 @@
231238
<options_item entry="r2_detail_bump" group="mm_opt_video"/>
232239
</check_r2_detail_bump>
233240

241+
<cap_r2_fxaa x="16" y="3" width="108" height="24">
242+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_fxaa</text>
243+
</cap_r2_fxaa>
244+
<check_r2_fxaa x="133" y="0" width="35" stretch="1" height="29">
245+
<texture>ui_inGame2_checkbox</texture>
246+
<options_item entry="r2_fxaa" group="mm_opt_video" depend="runtime"/>
247+
</check_r2_fxaa>
248+
234249
<cap_r2_steep_parallax x="16" y="3" width="108" height="24">
235250
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_steep_parallax</text>
236251
</cap_r2_steep_parallax>
@@ -239,6 +254,18 @@
239254
<options_item entry="r2_steep_parallax" group="mm_opt_video"/>
240255
</check_r2_steep_parallax>
241256

257+
<cap_r2_smap_size x="16" y="3" width="108" height="24">
258+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_smap_size</text>
259+
</cap_r2_smap_size>
260+
<list_r2_smap_size x="144" y="0" width="188" height="20" list_length="8">
261+
<options_item entry="r2_smap_size" group="mm_opt_video" depend="restart"/>
262+
<list_font r="170" g="170" b="170" font="letterica16"/>
263+
<text_color>
264+
<e r="170" g="170" b="170"/>
265+
<d r="70" g="70" b="70"/>
266+
</text_color>
267+
</list_r2_smap_size>
268+
242269
<cap_r2_sun_quality x="16" y="3" width="108" height="24">
243270
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_sun_quality</text>
244271
</cap_r2_sun_quality>
@@ -306,6 +333,13 @@
306333
<options_item entry="rs_refresh_60hz" group="mm_opt_video_adv" depend="vid"/>
307334
</check_60hz>
308335

336+
<cap_always_active x="16" y="3" width="108" height="24">
337+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_always_active</text>
338+
</cap_always_active>
339+
<check_always_active x="133" y="0" width="35" stretch="1" height="29">
340+
<texture>ui_inGame2_checkbox</texture>
341+
<options_item entry="always_active" group="mm_opt_video_adv" is_integer="1"/>
342+
</check_always_active>
309343

310344
<cap_sun_shafts x="16" y="3" width="108" height="24">
311345
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_sun_shafts</text>
@@ -410,6 +444,14 @@
410444
</text_color>
411445
</combo_r3_msaa_alphatest>
412446

447+
<cap_r3_gbuffer_opt x="16" y="3" width="108" height="24">
448+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_gbuffer_opt</text>
449+
</cap_r3_gbuffer_opt>
450+
<check_r3_gbuffer_opt x="133" y="0" width="35" stretch="1" height="29">
451+
<texture>ui_inGame2_checkbox</texture>
452+
<options_item entry="r3_msaa_opt" group="mm_opt_video_adv"/>
453+
</check_r3_gbuffer_opt>
454+
413455
<cap_r3_msaa_opt x="16" y="3" width="108" height="24">
414456
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_DX10_1</text>
415457
</cap_r3_msaa_opt>
@@ -556,6 +598,14 @@
556598
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
557599
</check_hud_draw>
558600

601+
<cap_check_loadingstages x="12" y="273" width="108" height="24">
602+
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
603+
</cap_check_loadingstages>
604+
<check_loadingstages x="129" y="270" width="35" stretch="1" height="29">
605+
<texture>ui_inGame2_checkbox</texture>
606+
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
607+
</check_loadingstages>
608+
559609
<btn_check_updates x="270" y="322" width="86" height="24" stretch="1">
560610
<text align="c" font="letterica16">ui_mm_check_updates</text>
561611
<texture>ui_inGame2_button</texture>

‎res/gamedata/scripts/ui_mm_opt_gameplay.script‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ function opt_gameplay:InitControls(x, y, xml, handler)
2424
xml:InitStatic("tab_gameplay:cap_check_important_save", self)
2525
xml:InitStatic("tab_gameplay:cap_check_crouch_toggle", self)
2626
xml:InitStatic("tab_gameplay:cap_check_hud_draw", self)
27+
xml:InitStatic("tab_gameplay:cap_check_loadingstages", self)
2728

2829
xml:InitCheck("tab_gameplay:check_tips", self)
2930
xml:InitCheck("tab_gameplay:check_crosshair", self)
@@ -33,6 +34,7 @@ function opt_gameplay:InitControls(x, y, xml, handler)
3334
xml:InitCheck("tab_gameplay:check_important_save", self)
3435
xml:InitCheck("tab_gameplay:check_crouch_toggle", self)
3536
xml:InitCheck("tab_gameplay:check_hud_draw", self)
37+
xml:InitCheck("tab_gameplay:check_loadingstages", self)
3638
xml:InitComboBox("tab_gameplay:list_difficulty", self)
3739

3840
local btn

‎res/gamedata/scripts/ui_mm_opt_video_adv.script‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ function mode_less_3(render_id)
3838
return render_id<4
3939
end
4040

41+
function mode_3(render_id)
42+
return render_id==4
43+
end
44+
4145
function mode_ge_3(render_id)
4246
return render_id>=4
4347
end
@@ -46,6 +50,10 @@ function mode_4(render_id)
4650
return render_id==5
4751
end
4852

53+
function mode_ge_4(render_id)
54+
return render_id>=5
55+
end
56+
4957
function opt_video_adv:InitControls(x, y, xml, handler)
5058
local ctl
5159
local _st
@@ -88,11 +96,26 @@ function opt_video_adv:InitControls(x, y, xml, handler)
8896
ctl = xml:InitComboBox("video_adv:combo_ssample", _st)
8997
table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})
9098

99+
-- XXX: Fix UI size
100+
-- _st = xml:InitStatic("video_adv:templ_item", nil)
101+
-- xml:InitStatic("video_adv:cap_r3_msaa_alphatest", _st)
102+
-- ctl = xml:InitComboBox("video_adv:combo_r3_msaa_alphatest", _st)
103+
-- table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})
104+
105+
_st = xml:InitStatic("video_adv:templ_item", nil)
106+
xml:InitStatic("video_adv:cap_r2_fxaa", _st)
107+
ctl = xml:InitCheck("video_adv:check_r2_fxaa", _st)
108+
table.insert(handler.m_preconditions, {func=mode_ge_2, control=_st})
109+
91110
_st = xml:InitStatic("video_adv:templ_item", nil)
92111
xml:InitStatic("video_adv:cap_detail_density", _st)
93112
xml:InitTrackBar("video_adv:track_detail_density", _st)
94113
table.insert(handler.m_preconditions, {func=all_modes, control=_st})
95114

115+
_st = xml:InitStatic("video_adv:templ_item", nil)
116+
xml:InitStatic("video_adv:cap_detail_radius", _st)
117+
xml:InitTrackBar("video_adv:track_detail_radius", _st)
118+
table.insert(handler.m_preconditions, {func=all_modes, control=_st})
96119

97120
_st = xml:InitStatic("video_adv:templ_item", nil)
98121
xml:InitStatic("video_adv:cap_r2_sun", _st)
@@ -109,6 +132,11 @@ function opt_video_adv:InitControls(x, y, xml, handler)
109132
ctl = xml:InitTrackBar("video_adv:track_particles_distance", _st)
110133
table.insert(handler.m_preconditions, {func=mode_ge_2a, control=_st})
111134

135+
_st = xml:InitStatic("video_adv:templ_item", nil)
136+
xml:InitStatic("video_adv:cap_r2_smap_size", _st)
137+
ctl = xml:InitComboBox("video_adv:list_r2_smap_size", _st)
138+
table.insert(handler.m_preconditions, {func=mode_ge_2, control=_st})
139+
112140
_st = xml:InitStatic("video_adv:templ_item", nil)
113141
xml:InitStatic("video_adv:cap_npc_torch", _st)
114142
xml:InitCheck("video_adv:check_npc_torch", _st)
@@ -188,6 +216,17 @@ function opt_video_adv:InitControls(x, y, xml, handler)
188216
ctl = xml:InitCheck("video_adv:check_r3_volumetric_smoke", _st)
189217
table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})
190218

219+
_st = xml:InitStatic("video_adv:templ_item", nil)
220+
xml:InitStatic("video_adv:cap_r3_msaa_opt", _st)
221+
ctl = xml:InitCheck("video_adv:check_r3_msaa_opt", _st)
222+
table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})
223+
224+
-- XXX: Fix UI size
225+
-- _st = xml:InitStatic("video_adv:templ_item", nil)
226+
-- xml:InitStatic("video_adv:cap_r3_gbuffer_opt", _st)
227+
-- ctl = xml:InitCheck("video_adv:check_r3_gbuffer_opt", _st)
228+
-- table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})
229+
191230
-- r4_enable_tessellation only r4
192231
_st = xml:InitStatic("video_adv:templ_item", nil)
193232
xml:InitStatic("video_adv:cap_r4_tessellation", _st)
@@ -204,6 +243,11 @@ function opt_video_adv:InitControls(x, y, xml, handler)
204243
xml:InitCheck("video_adv:check_60hz", _st)
205244
table.insert(handler.m_preconditions, {func=all_modes, control=_st})
206245

246+
_st = xml:InitStatic("video_adv:templ_item", nil)
247+
xml:InitStatic("video_adv:cap_always_active", _st)
248+
xml:InitCheck("video_adv:check_always_active", _st)
249+
table.insert(handler.m_preconditions, {func=all_modes, control=_st})
250+
207251
btn = xml:Init3tButton("video_adv:btn_to_simply", self)
208252
handler:Register(btn, "btn_simply_graphic")
209253
end

0 commit comments

Comments
 (0)