Skip to content

Commit

Permalink
Added new advanced video and gameplay options:
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Jun 18, 2018
1 parent 7e4400a commit aad0793
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 3 deletions.
15 changes: 15 additions & 0 deletions res/gamedata/configs/text/eng/ui_st_mm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,9 @@
<string id="ui_mm_alternative">
<text>Alternative</text>
</string>
<string id="ui_mm_always_active">
<text>Always active</text>
</string>
<string id="ui_mm_anisotropic">
<text>Anisotropic filtering</text>
</string>
Expand Down Expand Up @@ -471,6 +474,9 @@
<string id="ui_mm_detail_density">
<text>Grass detail density</text>
</string>
<string id="ui_mm_detail_radius">
<text>Grass detail radius</text>
</string>
<string id="ui_mm_difficulty">
<text>Difficulty</text>
</string>
Expand Down Expand Up @@ -525,6 +531,9 @@
<string id="ui_mm_load_game">
<text>Load game</text>
</string>
<string id="ui_mm_loadingstages">
<text>Show loading stages</text>
</string>
<string id="ui_mm_logout">
<text>Quit profile</text>
</string>
Expand Down Expand Up @@ -594,6 +603,9 @@
<string id="ui_mm_r2_detail_bump">
<text>Detail bump</text>
</string>
<string id="ui_mm_r2_fxaa">
<text>FXAA</text>
</string>
<string id="ui_mm_r2_steep_parallax">
<text>Steep parallax</text>
</string>
Expand All @@ -606,6 +618,9 @@
<string id="ui_mm_r2_sun_quality">
<text>Sun quality</text>
</string>
<string id="ui_mm_r2_smap_size">
<text>Shadow map quality</text>
</string>
<string id="ui_mm_r3_DX10_1">
<text>Use DX10.1</text>
</string>
Expand Down
15 changes: 15 additions & 0 deletions res/gamedata/configs/text/rus/ui_st_mm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,9 @@
<string id="ui_mm_alternative">
<text>Àëüòåðíàòèâà</text>
</string>
<string id="ui_mm_always_active">
<text>Âñåãäà àêòèâåí</text>
</string>
<string id="ui_mm_anisotropic">
<text>Ôèëüòðàöèÿ òåêñòóð</text>
</string>
Expand Down Expand Up @@ -471,6 +474,9 @@
<string id="ui_mm_detail_density">
<text>Ïëîòíîñòü òðàâû</text>
</string>
<string id="ui_mm_detail_radius">
<text>Äàëüíîñòü ïðîð. òðàâû</text>
</string>
<string id="ui_mm_difficulty">
<text>Ñëîæíîñòü</text>
</string>
Expand Down Expand Up @@ -525,6 +531,9 @@
<string id="ui_mm_load_game">
<text>Çàãðóçèòü èãðó</text>
</string>
<string id="ui_mm_loadingstages">
<text>Ïîêàçûâàòü ñòàäèè çàãðóçêè</text>
</string>
<string id="ui_mm_logout">
<text>Âûéòè èç ïðîôèëÿ</text>
</string>
Expand Down Expand Up @@ -594,6 +603,9 @@
<string id="ui_mm_r2_detail_bump">
<text>Äåòàëüíûé ðåëüåô</text>
</string>
<string id="ui_mm_r2_fxaa">
<text>FXAA</text>
</string>
<string id="ui_mm_r2_steep_parallax">
<text>Steep parallax</text>
</string>
Expand All @@ -606,6 +618,9 @@
<string id="ui_mm_r2_sun_quality">
<text>Êà÷åñòâî ñîëíöà</text>
</string>
<string id="ui_mm_r2_smap_size">
<text>Êà÷åñòâî òåíåâûõ êàðò</text>
</string>
<string id="ui_mm_r3_DX10_1">
<text>Èñïîëüçîâàòü DX10.1</text>
</string>
Expand Down
52 changes: 51 additions & 1 deletion res/gamedata/configs/ui/ui_mm_opt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,16 @@
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_density</text>
</cap_detail_density>
<track_detail_density x="180" y="6" width="235" height="16" step="0.02" invert="1">
<options_item entry="r__detail_density" group="mm_opt_video_adv"/>
<options_item entry="r__detail_density" group="mm_opt_video_adv" depend="vid"/>
</track_detail_density>

<cap_detail_radius x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_density</text>
</cap_detail_radius>
<track_detail_radius x="180" y="6" width="235" height="16" step="10" is_integer="1">
<options_item entry="r__detail_density" group="mm_opt_video_adv" depend="vid"/>
</track_detail_radius>

<cap_texture_lod x="20" y="3" width="135" height="24" >
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_texture_quality</text>
</cap_texture_lod>
Expand Down Expand Up @@ -228,6 +235,14 @@
<options_item entry="r2_detail_bump" group="mm_opt_video"/>
</check_r2_detail_bump>

<cap_r2_fxaa x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_fxaa</text>
</cap_r2_fxaa>
<check_r2_fxaa x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="r2_fxaa" group="mm_opt_video" depend="runtime"/>
</check_r2_fxaa>

<cap_r2_steep_parallax x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_steep_parallax</text>
</cap_r2_steep_parallax>
Expand All @@ -236,6 +251,18 @@
<options_item entry="r2_steep_parallax" group="mm_opt_video"/>
</check_r2_steep_parallax>

<cap_r2_smap_size x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_smap_size</text>
</cap_r2_smap_size>
<list_r2_smap_size x="180" y="0" width="235" height="20" list_length="3">
<options_item entry="r2_smap_size" group="mm_opt_video" depend="restart"/>
<list_font r="170" g="170" b="170" font="letterica16"/>
<text_color>
<e r="170" g="170" b="170"/>
<d r="70" g="70" b="70"/>
</text_color>
</list_r2_smap_size>

<cap_r2_sun_quality x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_sun_quality</text>
</cap_r2_sun_quality>
Expand Down Expand Up @@ -303,6 +330,13 @@
<options_item entry="rs_refresh_60hz" group="mm_opt_video_adv" depend="vid"/>
</check_60hz>

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

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

<cap_r3_gbuffer_opt x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_gbuffer_opt</text>
</cap_r3_gbuffer_opt>
<check_r3_gbuffer_opt x="167" y="0" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="r3_msaa_opt" group="mm_opt_video_adv"/>
</check_r3_gbuffer_opt>

<cap_r3_msaa_opt x="20" y="3" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_DX10_1</text>
</cap_r3_msaa_opt>
Expand Down Expand Up @@ -553,6 +595,14 @@
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
</check_hud_draw>

<cap_check_loadingstages x="15" y="243" width="135" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
</cap_check_loadingstages>
<check_loadingstages x="162" y="240" width="44" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
</check_loadingstages>

<btn_check_updates x="338" y="322" width="108" height="24">
<text align="c" font="letterica16">ui_mm_check_updates</text>
<texture>ui_inGame2_button</texture>
Expand Down
52 changes: 51 additions & 1 deletion res/gamedata/configs/ui/ui_mm_opt_16.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,16 @@
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_density</text>
</cap_detail_density>
<track_detail_density x="144" y="6" width="188" height="16" step="0.02" invert="1">
<options_item entry="r__detail_density" group="mm_opt_video_adv"/>
<options_item entry="r__detail_density" group="mm_opt_video_adv" depend="vid"/>
</track_detail_density>

<cap_detail_radius x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_detail_radius</text>
</cap_detail_radius>
<track_detail_radius x="144" y="6" width="188" height="16" step="10" is_integer="1">
<options_item entry="r__detail_radius" group="mm_opt_video_adv" depend="vid"/>
</track_detail_radius>

<cap_texture_lod x="16" y="3" width="108" height="24" >
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_texture_quality</text>
</cap_texture_lod>
Expand Down Expand Up @@ -231,6 +238,14 @@
<options_item entry="r2_detail_bump" group="mm_opt_video"/>
</check_r2_detail_bump>

<cap_r2_fxaa x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_fxaa</text>
</cap_r2_fxaa>
<check_r2_fxaa x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="r2_fxaa" group="mm_opt_video" depend="runtime"/>
</check_r2_fxaa>

<cap_r2_steep_parallax x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_steep_parallax</text>
</cap_r2_steep_parallax>
Expand All @@ -239,6 +254,18 @@
<options_item entry="r2_steep_parallax" group="mm_opt_video"/>
</check_r2_steep_parallax>

<cap_r2_smap_size x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_smap_size</text>
</cap_r2_smap_size>
<list_r2_smap_size x="144" y="0" width="188" height="20" list_length="8">
<options_item entry="r2_smap_size" group="mm_opt_video" depend="restart"/>
<list_font r="170" g="170" b="170" font="letterica16"/>
<text_color>
<e r="170" g="170" b="170"/>
<d r="70" g="70" b="70"/>
</text_color>
</list_r2_smap_size>

<cap_r2_sun_quality x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r2_sun_quality</text>
</cap_r2_sun_quality>
Expand Down Expand Up @@ -306,6 +333,13 @@
<options_item entry="rs_refresh_60hz" group="mm_opt_video_adv" depend="vid"/>
</check_60hz>

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

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

<cap_r3_gbuffer_opt x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_gbuffer_opt</text>
</cap_r3_gbuffer_opt>
<check_r3_gbuffer_opt x="133" y="0" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="r3_msaa_opt" group="mm_opt_video_adv"/>
</check_r3_gbuffer_opt>

<cap_r3_msaa_opt x="16" y="3" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_r3_DX10_1</text>
</cap_r3_msaa_opt>
Expand Down Expand Up @@ -556,6 +598,14 @@
<options_item entry="hud_draw" group="mm_opt_gameplay"/>
</check_hud_draw>

<cap_check_loadingstages x="12" y="273" width="108" height="24">
<text r="170" g="170" b="170" font="letterica16" align="r" vert_align="c">ui_mm_loadingstages</text>
</cap_check_loadingstages>
<check_loadingstages x="129" y="270" width="35" stretch="1" height="29">
<texture>ui_inGame2_checkbox</texture>
<options_item entry="rs_loadingstages" group="mm_opt_gameplay" is_integer="1"/>
</check_loadingstages>

<btn_check_updates x="270" y="322" width="86" height="24" stretch="1">
<text align="c" font="letterica16">ui_mm_check_updates</text>
<texture>ui_inGame2_button</texture>
Expand Down
2 changes: 2 additions & 0 deletions res/gamedata/scripts/ui_mm_opt_gameplay.script
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function opt_gameplay:InitControls(x, y, xml, handler)
xml:InitStatic("tab_gameplay:cap_check_important_save", self)
xml:InitStatic("tab_gameplay:cap_check_crouch_toggle", self)
xml:InitStatic("tab_gameplay:cap_check_hud_draw", self)
xml:InitStatic("tab_gameplay:cap_check_loadingstages", self)

xml:InitCheck("tab_gameplay:check_tips", self)
xml:InitCheck("tab_gameplay:check_crosshair", self)
Expand All @@ -33,6 +34,7 @@ function opt_gameplay:InitControls(x, y, xml, handler)
xml:InitCheck("tab_gameplay:check_important_save", self)
xml:InitCheck("tab_gameplay:check_crouch_toggle", self)
xml:InitCheck("tab_gameplay:check_hud_draw", self)
xml:InitCheck("tab_gameplay:check_loadingstages", self)
xml:InitComboBox("tab_gameplay:list_difficulty", self)

local btn
Expand Down
44 changes: 44 additions & 0 deletions res/gamedata/scripts/ui_mm_opt_video_adv.script
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ function mode_less_3(render_id)
return render_id<4
end

function mode_3(render_id)
return render_id==4
end

function mode_ge_3(render_id)
return render_id>=4
end
Expand All @@ -46,6 +50,10 @@ function mode_4(render_id)
return render_id==5
end

function mode_ge_4(render_id)
return render_id>=5
end

function opt_video_adv:InitControls(x, y, xml, handler)
local ctl
local _st
Expand Down Expand Up @@ -88,11 +96,26 @@ function opt_video_adv:InitControls(x, y, xml, handler)
ctl = xml:InitComboBox("video_adv:combo_ssample", _st)
table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})

-- XXX: Fix UI size
-- _st = xml:InitStatic("video_adv:templ_item", nil)
-- xml:InitStatic("video_adv:cap_r3_msaa_alphatest", _st)
-- ctl = xml:InitComboBox("video_adv:combo_r3_msaa_alphatest", _st)
-- table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})

_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_r2_fxaa", _st)
ctl = xml:InitCheck("video_adv:check_r2_fxaa", _st)
table.insert(handler.m_preconditions, {func=mode_ge_2, control=_st})

_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_detail_density", _st)
xml:InitTrackBar("video_adv:track_detail_density", _st)
table.insert(handler.m_preconditions, {func=all_modes, control=_st})

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

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

_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_r2_smap_size", _st)
ctl = xml:InitComboBox("video_adv:list_r2_smap_size", _st)
table.insert(handler.m_preconditions, {func=mode_ge_2, control=_st})

_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_npc_torch", _st)
xml:InitCheck("video_adv:check_npc_torch", _st)
Expand Down Expand Up @@ -188,6 +216,17 @@ function opt_video_adv:InitControls(x, y, xml, handler)
ctl = xml:InitCheck("video_adv:check_r3_volumetric_smoke", _st)
table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})

_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_r3_msaa_opt", _st)
ctl = xml:InitCheck("video_adv:check_r3_msaa_opt", _st)
table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})

-- XXX: Fix UI size
-- _st = xml:InitStatic("video_adv:templ_item", nil)
-- xml:InitStatic("video_adv:cap_r3_gbuffer_opt", _st)
-- ctl = xml:InitCheck("video_adv:check_r3_gbuffer_opt", _st)
-- table.insert(handler.m_preconditions, {func=mode_ge_3, control=_st})

-- r4_enable_tessellation only r4
_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_r4_tessellation", _st)
Expand All @@ -204,6 +243,11 @@ function opt_video_adv:InitControls(x, y, xml, handler)
xml:InitCheck("video_adv:check_60hz", _st)
table.insert(handler.m_preconditions, {func=all_modes, control=_st})

_st = xml:InitStatic("video_adv:templ_item", nil)
xml:InitStatic("video_adv:cap_always_active", _st)
xml:InitCheck("video_adv:check_always_active", _st)
table.insert(handler.m_preconditions, {func=all_modes, control=_st})

btn = xml:Init3tButton("video_adv:btn_to_simply", self)
handler:Register(btn, "btn_simply_graphic")
end
Loading

0 comments on commit aad0793

Please sign in to comment.