Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions Game/Resources_SoC_1.0006/gamedata/config/text/eng/ui_st_mm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,63 @@
<string id="st_opt_taa">
<text>TAA</text>
</string>
<string id="ui_mm_dlss_quality">
<text>DLSS quality</text>
</string>
<string id="ui_mm_dlss_preset">
<text>DLSS preset</text>
</string>
<string id="ui_mm_fsr3_quality">
<text>FSR3 quality</text>
</string>
<string id="st_opt_dlaa">
<text>DLAA</text>
</string>
<string id="st_opt_dlss_default">
<text>Default</text>
</string>
<string id="st_opt_dlss_f">
<text>F (CNN)</text>
</string>
<string id="st_opt_dlss_j">
<text>J (Transformer)</text>
</string>
<string id="st_opt_dlss_k">
<text>K (Transformer)</text>
</string>
<string id="st_opt_dlss_l">
<text>L (Transformer)</text>
</string>
<string id="st_opt_dlss_m">
<text>M (Transformer)</text>
</string>
<string id="st_opt_dlss_quality">
<text>Quality</text>
</string>
<string id="st_opt_dlss_balanced">
<text>Balanced</text>
</string>
<string id="st_opt_dlss_performance">
<text>Performance</text>
</string>
<string id="st_opt_dlss_ultra_performance">
<text>Ultra Performance</text>
</string>
<string id="st_opt_fsr3_native_aa">
<text>Native AA</text>
</string>
<string id="st_opt_fsr3_quality">
<text>Quality</text>
</string>
<string id="st_opt_fsr3_balanced">
<text>Balanced</text>
</string>
<string id="st_opt_fsr3_performance">
<text>Performance</text>
</string>
<string id="st_opt_fsr3_ultra_performance">
<text>Ultra Performance</text>
</string>
<string id="ui_mm_r2_aa_mode">
<text>Antialiasing mode (R2)</text>
</string>
Expand Down Expand Up @@ -886,6 +943,15 @@
<string id="video_settings_name_69">
<text>Image upscaling in 3D scopes - r_3dss_scale_factor</text>
</string>
<string id="video_settings_name_70">
<text>DLSS quality - r_aa_dlss_quality</text>
</string>
<string id="video_settings_name_71">
<text>FSR3 quality - r_aa_fsr3_quality</text>
</string>
<string id="video_settings_name_72">
<text>DLSS preset - r_aa_dlss_preset</text>
</string>

<string id="video_settings_desc_1">
<text>Motion blur - blurring of the image when turning the camera, playing scenes of movement or fast-moving objects.</text>
Expand Down Expand Up @@ -1080,5 +1146,17 @@
<string id="video_settings_desc_69">
<text>If DLSS or FSR is enabled, this setting adjusts the scaling of the image in the 3D scopes to improve its clarity. %c[yellow] \nWhen set to 1, the image is not scaled. %c[green] \nOptimal value: 2. %c[red] \nValues ??greater than 2 may noticeably reduce FPS.</text>
</string>
<string id="video_settings_desc_70">
<text>Sets the NVIDIA DLSS internal render scale. DLAA renders at native resolution for maximum image quality. Quality, Balanced, Performance and Ultra Performance render at progressively lower internal resolutions to gain FPS. Apply video settings or run vid_restart after changing this option.</text>
</string>
<string id="video_settings_desc_71">
<text>Sets the AMD FSR3 internal render scale. Native AA renders at native resolution for maximum image quality. Quality, Balanced, Performance and Ultra Performance render at progressively lower internal resolutions to gain FPS. Apply video settings or run vid_restart after changing this option.</text>
</string>
<string id="video_settings_desc_72">
<text>Selects the NVIDIA DLSS model. Presets not supported by the loaded DLSS library are grayed out.
%c[yellow] \nCNN:\nF - legacy CNN model (deprecated).
%c[green] \nTransformer:\nJ - less ghosting, more flicker (NVIDIA recommends K).\nK - 1st-gen transformer, default for DLAA / Quality / Balanced.\nL - 2nd-gen transformer, sharper and slower, default for Ultra Performance (RTX 40+).\nM - 2nd-gen transformer, similar to L but faster, default for Performance (RTX 40+).
Default follows NVIDIA / driver OTA.</text>
</string>

</string_table>
78 changes: 78 additions & 0 deletions Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_mm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,63 @@
<string id="st_opt_fsr3">
<text>AMD FSR3</text>
</string>
<string id="ui_mm_dlss_quality">
<text>�������� DLSS</text>
</string>
<string id="ui_mm_dlss_preset">
<text>������ DLSS</text>
</string>
<string id="ui_mm_fsr3_quality">
<text>�������� FSR 3</text>
</string>
<string id="st_opt_dlaa">
<text>DLAA</text>
</string>
<string id="st_opt_dlss_default">
<text>Default</text>
</string>
<string id="st_opt_dlss_f">
<text>F (CNN)</text>
</string>
<string id="st_opt_dlss_j">
<text>J (Transformer)</text>
</string>
<string id="st_opt_dlss_k">
<text>K (Transformer)</text>
</string>
<string id="st_opt_dlss_l">
<text>L (Transformer)</text>
</string>
<string id="st_opt_dlss_m">
<text>M (Transformer)</text>
</string>
<string id="st_opt_dlss_quality">
<text>��������</text>
</string>
<string id="st_opt_dlss_balanced">
<text>������</text>
</string>
<string id="st_opt_dlss_performance">
<text>������������������</text>
</string>
<string id="st_opt_dlss_ultra_performance">
<text>������������������������</text>
</string>
<string id="st_opt_fsr3_native_aa">
<text>����������� � �������� ����������</text>
</string>
<string id="st_opt_fsr3_quality">
<text>��������</text>
</string>
<string id="st_opt_fsr3_balanced">
<text>������</text>
</string>
<string id="st_opt_fsr3_performance">
<text>������������������</text>
</string>
<string id="st_opt_fsr3_ultra_performance">
<text>������������������������</text>
</string>
<string id="st_opt_taa">
<text>TAA</text>
</string>
Expand Down Expand Up @@ -861,6 +918,15 @@
<string id="video_settings_name_69">
<text>���������� ����������� � 3D �������� - r_3dss_scale_factor</text>
</string>
<string id="video_settings_name_70">
<text>�������� DLSS - r_aa_dlss_quality</text>
</string>
<string id="video_settings_name_71">
<text>�������� FSR 3 - r_aa_fsr3_quality</text>
</string>
<string id="video_settings_name_72">
<text>������ DLSS - r_aa_dlss_preset</text>
</string>

<string id="video_settings_desc_1">
<text>Motion blur - �������� ����������� ��� �������� ������, ��������������� ���� �������� ��� ������ ���������� ��������.</text>
Expand Down Expand Up @@ -1046,5 +1112,17 @@
<string id="video_settings_desc_69">
<text>���� ������� DLSS ��� FSR, ��� ��������� ���������� ��������������� ����������� � 3D ������� ��� ��������� ��� ��������. %c[yellow] \n��� �������� 1 ����������� �� ��������������. %c[green] \n����������� ��������: 2. %c[red] \n��� ��������� ������ 2 ����� ������� ������ FPS.</text>
</string>
<string id="video_settings_desc_70">
<text>����� ���������� ���������� NVIDIA DLSS. DLAA �������� � �������� ���������� ��� ������������� ��������. Quality, Balanced, Performance � Ultra Performance ���������� ������� ���������� ���������� ���� FPS. ����� ��������� ��������� ����� ��������� (vid_restart).</text>
</string>
<string id="video_settings_desc_71">
<text>����� ���������� ���������� AMD FSR 3. �������� ����������� �������� � �������� ���������� ��� ������������� ��������. Quality, Balanced, Performance � Ultra Performance ���������� ������� ���������� ���������� ���� FPS. ����� ��������� ��������� ����� ��������� (vid_restart).</text>
</string>
<string id="video_settings_desc_72">
<text>����� ������ NVIDIA DLSS. �������, ������� �� ������������ ����������� ���������� DLSS, ������������ �����.
%c[yellow] \nCNN:\nF � ���������� CNN-������ (deprecated).
%c[green] \nTransformer:\nJ � ������ �������, ������ �������� (NVIDIA ����������� K).\nK � ����������� 1-�� ���������, �� ��������� ��� DLAA / Quality / Balanced.\nL � ����������� 2-�� ���������, ����� � ���������, �� ��������� ��� Ultra Performance (RTX 40+).\nM � ����������� 2-�� ���������, �������� ��� � L, �� �������, �� ��������� ��� Performance (RTX 40+).
Default ������� �� NVIDIA / OTA ��������.</text>
</string>

</string_table>
39 changes: 39 additions & 0 deletions Game/Resources_SoC_1.0006/gamedata/config/ui/ui_mm_opt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,45 @@
<list_font r="216" g="186" b="140" font="letterica16"/>
</list_aa>

<cap_dlss_quality x="5" y="5" width="143" height="21">
<text font="letterica16" r="215" g="195" b="170">ui_mm_dlss_quality</text>
</cap_dlss_quality>
<list_dlss_quality x="249" y="0" width="190" height="21" list_length="5" always_show_scroll="0">
<options_item entry="r_aa_dlss_quality" group="mm_opt_video_adv" depend="vid"/>
<text_color>
<e r="216" g="186" b="140"/>
<d r="227" g="199" b="178"/>
</text_color>
<list_font_s r="240" g="217" b="182"/>
<list_font r="216" g="186" b="140" font="letterica16"/>
</list_dlss_quality>

<cap_dlss_preset x="5" y="5" width="240" height="21">
<text font="letterica16" r="215" g="195" b="170">ui_mm_dlss_preset</text>
</cap_dlss_preset>
<list_dlss_preset x="249" y="0" width="190" height="21" list_length="6" always_show_scroll="0">
<options_item entry="r_aa_dlss_preset" group="mm_opt_video_adv" depend="vid"/>
<text_color>
<e r="216" g="186" b="140"/>
<d r="227" g="199" b="178"/>
</text_color>
<list_font_s r="240" g="217" b="182"/>
<list_font r="216" g="186" b="140" font="letterica16"/>
</list_dlss_preset>

<cap_fsr3_quality x="5" y="5" width="143" height="21">
<text font="letterica16" r="215" g="195" b="170">ui_mm_fsr3_quality</text>
</cap_fsr3_quality>
<list_fsr3_quality x="249" y="0" width="190" height="21" list_length="5" always_show_scroll="0">
<options_item entry="r_aa_fsr3_quality" group="mm_opt_video_adv" depend="vid"/>
<text_color>
<e r="216" g="186" b="140"/>
<d r="227" g="199" b="178"/>
</text_color>
<list_font_s r="240" g="217" b="182"/>
<list_font r="216" g="186" b="140" font="letterica16"/>
</list_fsr3_quality>

<cap_cas x="5" y="5" width="143" height="21">
<text font="letterica16" r="215" g="195" b="170">ui_mm_cas</text>
</cap_cas>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ function options_dialog:OnPresetChanged()
opt:SetCurrentValues("mm_opt_video")
opt:SetCurrentValues("mm_opt_video_adv")

if self.dlg_video_adv and self.dlg_video_adv.UpdateUpscalerQualityRows then
self.dlg_video_adv:UpdateUpscalerQualityRows()
end

self:show_need_restart_wnd()
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ local adv_vid_opt_params = {
{ "hud_fov", "track", 0, hint_colors.green , "video_settings_name_62", "video_settings_desc_62" },
--
{ "aa", "list", 0, hint_colors.green , "video_settings_name_19", "video_settings_desc_19" },
{ "dlss_quality", "list", 0, hint_colors.green , "video_settings_name_70", "video_settings_desc_70" },
{ "dlss_preset", "list", 0, hint_colors.green , "video_settings_name_72", "video_settings_desc_72" },
{ "fsr3_quality", "list", 0, hint_colors.green , "video_settings_name_71", "video_settings_desc_71" },
{ "cas", "track", 0, hint_colors.green , "video_settings_name_20", "video_settings_desc_20" },
-- { "3dss_scale_factor", "track", 0, hint_colors.yellow, "video_settings_name_69", "video_settings_desc_69" },
--
Expand Down Expand Up @@ -81,6 +84,7 @@ function opt_video_adv:InitControls(x, y, xml, handler)

xml:InitFrame("frame", self)
self.scroll_v = xml:InitScrollView("video_adv:scroll_v", self)
self.upscaler_rows = {}

-- перебираем с конца, поскольку в настройках scroll view в xml стоит параметр flip_vert="1",
-- который инвертирует порядок элементов, что в свою очередь сделано для того, чтобы визуально первые элементы
Expand All @@ -104,7 +108,14 @@ function opt_video_adv:InitControls(x, y, xml, handler)
ui_events.STATIC_FOCUS_RECEIVED,
function()
handler.hint_name:SetText(hint_caption and game.translate_string(hint_caption) or "")
handler.hint_caption:SetText(hint_string and game.translate_string(hint_string) or "")
local desc = hint_string and game.translate_string(hint_string) or ""
if opt == "dlss_preset" then
local ver = get_console():get_string("r_aa_dlss_version") or ""
if ver ~= "" then
desc = desc .. "\nDLL: " .. ver
end
end
handler.hint_caption:SetText(desc)
end
)

Expand All @@ -119,8 +130,65 @@ function opt_video_adv:InitControls(x, y, xml, handler)

_st:Enable(enabled)
_st2:Enable(enabled)

if opt == "aa" then
self.aa_list = ctl
elseif opt == "dlss_quality" then
self.upscaler_rows[opt] = _st
self.dlss_quality_list = ctl
elseif opt == "dlss_preset" then
self.upscaler_rows[opt] = _st
self.dlss_preset_list = ctl
self.dlss_preset_cap = _st2
elseif opt == "fsr3_quality" then
self.upscaler_rows[opt] = _st
end
end

if self.aa_list then
handler:Register(self.aa_list, "video_adv:list_aa")
handler:AddCallback("video_adv:list_aa", ui_events.LIST_ITEM_SELECT, function()
self:UpdateUpscalerQualityRows()
end)
end
if self.dlss_quality_list then
handler:Register(self.dlss_quality_list, "video_adv:list_dlss_quality")
handler:AddCallback("video_adv:list_dlss_quality", ui_events.LIST_ITEM_SELECT, function()
if self.dlss_preset_list then
self.dlss_preset_list:SetCurrentValue()
end
end)
end
self:UpdateUpscalerQualityRows()

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

function opt_video_adv:UpdateUpscalerQualityRows()
local mode = get_console():get_string("r_aa_mode") or ""
if self.upscaler_rows.dlss_quality then
self.upscaler_rows.dlss_quality:Show(mode == "st_opt_dlss")
end
if self.upscaler_rows.dlss_preset then
self.upscaler_rows.dlss_preset:Show(mode == "st_opt_dlss")
end
if mode == "st_opt_dlss" and self.dlss_preset_list then
self.dlss_preset_list:SetCurrentValue()
end
if self.dlss_preset_cap then
local name = game.translate_string("ui_mm_dlss_preset")
local ver = get_console():get_string("r_aa_dlss_version") or ""
if mode == "st_opt_dlss" and ver ~= "" then
self.dlss_preset_cap:SetText(name .. " " .. ver)
else
self.dlss_preset_cap:SetText(name)
end
end
if self.upscaler_rows.fsr3_quality then
self.upscaler_rows.fsr3_quality:Show(mode == "st_opt_fsr3")
end
if self.scroll_v then
self.scroll_v:ForceUpdate()
end
end
Binary file modified Game/Resources_SoC_1.0006/gamedata/shaders/r3/3dss_reticle.ps
Binary file not shown.
4 changes: 2 additions & 2 deletions Game/Resources_SoC_1.0006/gamedata/shaders/r3/combine.s
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function element_3(shader, t_base, t_second, t_detail)
:fog(false)
:zb(false, false)
shader:dx10texture("s_position", "$user$position")
shader:dx10texture("s_image", "$user$generic0")
shader:dx10texture("s_image", "$user$postprocess0")
shader:dx10texture("s_bloom", "$user$bloom1")
shader:dx10texture("s_ssfx_bloom", "$user$ssfx_bloom1")

Expand All @@ -65,4 +65,4 @@ function element_3(shader, t_base, t_second, t_detail)
shader:dx10sampler("smp_nofilter")
shader:dx10sampler("smp_rtlinear")
shader:dx10sampler("smp_linear")
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ function element_0(shader, t_base, t_second, t_detail)
shader:begin("stub_screen_space", "postprocess_cas")
:fog(false)
:zb(false, false)
shader:dx10texture("t_current", "$user$generic0")
shader:dx10texture("t_current", "$user$postprocess0")
shader:dx10sampler("SamplerLinearClamp")
end
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
function normal (shader, t_base, t_second, t_detail)
shader:begin("stub_default","stub_default")
:zb(true, false)
shader:begin("effects_bullet_tracer","effects_bullet_tracer")
:zb(false, false)
:blend(true, blend.one, blend.one)
-- :blend(true, blend.srcalpha, blend.one)
-- :aref(true, 32)

-- Decouple sampler and texture
-- shader:sampler ("s_base") : texture(t_base) : clamp() : f_linear ()
-- TODO: DX10: move stub_default to smp_rtlinear
shader:dx10texture ("s_base", t_base)
shader:dx10texture ("s_position", "$user$position")
shader:dx10sampler ("smp_base")
end
shader:dx10sampler ("smp_nofilter")
end
Loading