Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ui' into dev

This commit is contained in:
Mr-Wiseguy 2024-03-31 23:13:25 -04:00
parent 81fca5bf96 b01bdf5b12
commit 62dfd7ffbe
4 changed files with 269 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
assets/config_menu/graphics.rml
View File

@ -3,104 +3,251 @@
</head> </head>
<body> <body>
<form class="config__form"> <form class="config__form">
<div class="config__wrapper"> <div class="config__hz-wrapper">
<div class="config__row"> <div class="config__wrapper" data-event-mouseout="set_current_gfx_description(-1)">
<div class="config-option"> <div class="config-option" data-event-mouseover="set_current_gfx_description(0)">
<label class="config-option__title">Resolution</label> <label class="config-option__title">Resolution</label>
<div class="config-option__list"> <div class="config-option__list">
<input type="radio" name="resolution" data-checked="res_option" value="Original" id="res_original" style="nav-left:none;nav-up:#tab_graphics"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(0)"
name="resolution"
data-checked="res_option"
value="Original"
id="res_original"
style="nav-up:#tab_graphics; nav-down: #ds_windowed"
data-attr-style="res_option == 'Auto' ? 'nav-up:#tab_graphics; nav-down: #ar_original' : 'nav-up:#tab_graphics; nav-down: #ds_windowed'"
/>
<label class="config-option__tab-label" for="res_original">Original</label> <label class="config-option__tab-label" for="res_original">Original</label>
<input type="radio" name="resolution" data-checked="res_option" value="Original2x" id="res_2x" style="nav-up:#tab_graphics"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(0)"
name="resolution"
data-checked="res_option"
value="Original2x"
id="res_2x"
style="nav-up:#tab_graphics; nav-down: #ds_2x"
data-attr-style="res_option == 'Auto' ? 'nav-up:#tab_graphics; nav-down: #ar_expand' : 'nav-up:#tab_graphics; nav-down: #ds_2x'"
/>
<label class="config-option__tab-label" for="res_2x">Original 2x</label> <label class="config-option__tab-label" for="res_2x">Original 2x</label>
<input type="radio" name="resolution" data-checked="res_option" value="Auto" id="res_auto" style="nav-down:#ar_expand;nav-up:#tab_graphics"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(0)"
name="resolution"
data-checked="res_option"
value="Auto"
id="res_auto"
style="nav-up:#tab_graphics; nav-down: #ds_4x"
data-attr-style="res_option == 'Auto' ? 'nav-up:#tab_graphics; nav-down: #ar_expand' : 'nav-up:#tab_graphics; nav-down: #ds_4x'"
/>
<label class="config-option__tab-label" for="res_auto">Auto</label> <label class="config-option__tab-label" for="res_auto">Auto</label>
</div> </div>
</div> </div>
<div class="config-option">
<div class="config-option" data-event-mouseover="set_current_gfx_description(1)">
<label class="config-option__title">Downsampling Quality</label> <label class="config-option__title">Downsampling Quality</label>
<div class="config-option__list"> <div class="config-option__list">
<input type="radio" name="downsampling" data-checked="ds_option" value="1" id="ds_windowed" style="nav-up:#tab_graphics"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(1)"
name="downsampling"
data-attrif-disabled="res_option == 'Auto'"
data-checked="ds_option"
value="1"
id="ds_windowed"
style="nav-up: #res_original; nav-down: #ar_original"
/>
<label class="config-option__tab-label" for="ds_windowed">Off</label> <label class="config-option__tab-label" for="ds_windowed">Off</label>
<input type="radio" name="downsampling" data-checked="ds_option" value="2" id="ds_2x" style="nav-up:#tab_graphics"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(1)"
name="downsampling"
data-attrif-disabled="res_option == 'Auto'"
data-checked="ds_option"
value="2"
id="ds_2x"
style="nav-up: #res_2x; nav-down: #ar_expand"
/>
<label class="config-option__tab-label" for="ds_2x">2x</label> <label class="config-option__tab-label" for="ds_2x">2x</label>
<input type="radio" name="downsampling" data-checked="ds_option" value="4" id="ds_4x" style="nav-right:none;nav-up:#tab_graphics"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(1)"
name="downsampling"
data-attrif-disabled="res_option == 'Auto'"
data-checked="ds_option"
value="4"
id="ds_4x"
style="nav-up: #res_auto; nav-down: #ar_expand"
/>
<label class="config-option__tab-label" for="ds_4x">4x</label> <label class="config-option__tab-label" for="ds_4x">4x</label>
<div class="config-option__details">{{ds_info}}</div>
</div> </div>
<div class="config-option__details">{{ds_info}}</div>
</div> </div>
</div>
<div class="config__row"> <div class="config-option" data-event-mouseover="set_current_gfx_description(2)">
<div class="config-option">
<label class="config-option__title">Aspect Ratio</label> <label class="config-option__title">Aspect Ratio</label>
<div class="config-option__list"> <div class="config-option__list">
<input type="radio" name="aspectratio" data-checked="ar_option" value="Original" id="ar_original" style="nav-left:none"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(2)"
name="aspectratio"
data-checked="ar_option"
value="Original"
id="ar_original"
style="nav-up: #ds_windowed; nav-down: #wm_windowed"
data-attr-style="res_option == 'Auto' ? 'nav-up:#res_original; nav-down: #wm_windowed' : 'nav-up:#ds_windowed; nav-down: #wm_windowed'"
/>
<label class="config-option__tab-label" for="ar_original">Original</label> <label class="config-option__tab-label" for="ar_original">Original</label>
<input type="radio" name="aspectratio" data-checked="ar_option" value="Expand" id="ar_expand" style="nav-up:#res_2x"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(2)"
name="aspectratio"
data-checked="ar_option"
value="Expand"
id="ar_expand"
style="nav-up: #ds_2x; nav-down: #wm_fullscreen"
data-attr-style="res_option == 'Auto' ? 'nav-up:#res_2x; nav-down: #wm_fullscreen' : 'nav-up:#ds_2x; nav-down: #wm_fullscreen'"
/>
<label class="config-option__tab-label" for="ar_expand">Expand</label> <label class="config-option__tab-label" for="ar_expand">Expand</label>
</div> </div>
<div class="config-option__details"></div>
</div> </div>
<div class="config-option">
<div class="config-option" data-event-mouseover="set_current_gfx_description(3)">
<label class="config-option__title">Window Mode</label> <label class="config-option__title">Window Mode</label>
<div class="config-option__list"> <div class="config-option__list">
<input type="radio" name="windowmode" data-checked="wm_option" value="Windowed" id="wm_windowed" /> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(3)"
name="windowmode"
data-checked="wm_option"
value="Windowed"
id="wm_windowed"
style="nav-up: #ar_original; nav-down: #rr_original"
/>
<label class="config-option__tab-label" for="wm_windowed">Windowed</label> <label class="config-option__tab-label" for="wm_windowed">Windowed</label>
<input type="radio" name="windowmode" data-checked="wm_option" value="Fullscreen" id="wm_fullscreen" style="nav-right:none"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(3)"
name="windowmode"
data-checked="wm_option"
value="Fullscreen"
id="wm_fullscreen"
style="nav-up: #ar_expand; nav-down: #rr_display"
/>
<label class="config-option__tab-label" for="wm_fullscreen">Fullscreen</label> <label class="config-option__tab-label" for="wm_fullscreen">Fullscreen</label>
</div> </div>
<div class="config-option__details"></div>
</div> </div>
</div>
<div class="config__row"> <div class="config-option" data-event-mouseover="set_current_gfx_description(4)">
<div class="config-option">
<label class="config-option__title">Framerate</label> <label class="config-option__title">Framerate</label>
<div class="config-option__list"> <div class="config-option__list">
<input type="radio" <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(4)"
name="refreshrate" name="refreshrate"
data-checked="rr_option" data-checked="rr_option"
value="Original" value="Original"
id="rr_original" id="rr_original"
data-attr-style="rr_option=='Manual' ? 'nav-left:none;nav-down:#rr_manual_input' : 'nav-left:none;nav-down:#apply_button'" data-attr-style="rr_option=='Manual' ? 'nav-up: #wm_windowed; nav-down: #rr_manual_input' : 'nav-up: #wm_windowed; nav-down: #msaa_none'"
/> />
<label class="config-option__tab-label" for="rr_original">Original</label> <label class="config-option__tab-label" for="rr_original">Original</label>
<input type="radio" <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(4)"
name="refreshrate" name="refreshrate"
data-checked="rr_option" data-checked="rr_option"
value="Display" value="Display"
id="rr_display" id="rr_display"
data-attr-style="rr_option=='Manual' ? 'nav-down:#rr_manual_input' : 'nav-down:#apply_button'" data-attr-style="rr_option=='Manual' ? 'nav-up: #wm_fullscreen; nav-down: #rr_manual_input' : 'nav-up: #wm_fullscreen; nav-down: #msaa_2x'"
/> />
<label class="config-option__tab-label" for="rr_display">Display</label> <label class="config-option__tab-label" for="rr_display">Display</label>
<input type="radio" <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(4)"
name="refreshrate" name="refreshrate"
data-checked="rr_option" data-checked="rr_option"
value="Manual" value="Manual"
id="rr_manual" id="rr_manual"
data-attr-style="rr_option=='Manual' ? 'nav-up:#ar_expand;nav-down:#rr_manual_input' : 'nav-up:#ar_expand;nav-down:#apply_button'" data-attr-style="rr_option=='Manual' ? 'nav-up: #wm_fullscreen; nav-down: #rr_manual_input' : 'nav-up: #wm_fullscreen; nav-down: #msaa_4x'"
/> />
<label class="config-option__tab-label" for="rr_manual">Manual</label> <label class="config-option__tab-label" for="rr_manual">Manual</label>
</div> </div>
<div data-if="rr_option=='Manual'" class="config-option__range-wrapper config-option__list"> <div data-if="rr_option=='Manual'" class="config-option__range-wrapper config-option__list">
<label class="config-option__range-label">{{rr_manual_value}}</label> <label class="config-option__range-label">{{rr_manual_value}}</label>
<input id="rr_manual_input" type="range" min="20" max="360" style="flex:1;margin: 0dp;nav-up:auto;nav-down:auto;" data-value="rr_manual_value"/> <input
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(4)"
id="rr_manual_input"
type="range"
min="20"
max="360"
style="flex:1;margin: 0dp;nav-up:auto;nav-down:auto;"
data-value="rr_manual_value"
/>
</div> </div>
<div class="config-option__details"></div>
</div> </div>
<div class="config-option">
<div class="config-option" data-event-mouseover="set_current_gfx_description(5)">
<label class="config-option__title">MS Anti-Aliasing</label> <label class="config-option__title">MS Anti-Aliasing</label>
<div class="config-option__list"> <div class="config-option__list">
<input type="radio" name="antialiasing" data-checked="msaa_option" value="None" id="msaa_none" style="nav-down:#apply_button"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(5)"
name="antialiasing"
data-checked="msaa_option"
value="None"
id="msaa_none"
data-attr-style="rr_option=='Manual' ? 'nav-up: #rr_manual_input; nav-down: #apply_button' : 'nav-up: #rr_original; nav-down: #apply_button'"
/>
<label class="config-option__tab-label" for="msaa_none">None</label> <label class="config-option__tab-label" for="msaa_none">None</label>
<input type="radio" name="antialiasing" data-checked="msaa_option" value="MSAA2X" id="msaa_2x" style="nav-down:#apply_button"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(5)"
name="antialiasing"
data-checked="msaa_option"
value="MSAA2X"
id="msaa_2x"
data-attr-style="rr_option=='Manual' ? 'nav-up: #rr_manual_input; nav-down: #apply_button' : 'nav-up: #rr_display; nav-down: #apply_button'"
/>
<label class="config-option__tab-label" for="msaa_2x">2x</label> <label class="config-option__tab-label" for="msaa_2x">2x</label>
<input type="radio" name="antialiasing" data-checked="msaa_option" value="MSAA4X" id="msaa_4x" style="nav-down:#apply_button"/> <input type="radio"
data-event-blur="set_current_gfx_description(-1)"
data-event-focus="set_current_gfx_description(5)"
name="antialiasing"
data-checked="msaa_option"
value="MSAA4X"
id="msaa_4x"
data-attr-style="rr_option=='Manual' ? 'nav-up: #rr_manual_input; nav-down: #apply_button' : 'nav-up: #rr_manual; nav-down: #apply_button'"
/>
<label class="config-option__tab-label" for="msaa_4x">4x</label> <label class="config-option__tab-label" for="msaa_4x">4x</label>
<!-- <input type="radio" name="antialiasing" data-checked="msaa_option" value="MSAA8X" id="msaa_8x" style="nav-right:none;nav-down:#apply_button"/> <!-- <input type="radio" data-event-blur="set_current_gfx_description(-1)" name="antialiasing" data-checked="msaa_option" value="MSAA8X" id="msaa_8x" style="nav-right:none;nav-down:#apply_button"/>
<label class="config-option__tab-label" for="msaa_8x">8x</label> --> <label class="config-option__tab-label" for="msaa_8x">8x</label> -->
</div> </div>
<div class="config-option__details"></div>
</div> </div>
</div>
<div class="config__wrapper">
<p data-if="cur_gfx_description == 0">
Sets the output resolution of the game.
</p>
<p data-if="cur_gfx_description == 1">
Renders at a higher resolution and scales it down to the output resolution for increased quality. Only available in Original and Original 2x resolution.
</p>
<p data-if="cur_gfx_description == 2">
Sets the horizontal aspect ratio. Original limits the game to 4:3 (N64). Expand will adjust the game to match your display's horizontal resolution.
</p>
<p data-if="cur_gfx_description == 3">
Sets whether the game should display on a Window or Fullscreen. You can also use Alt + Enter to toggle this option.
</p>
<p data-if="cur_gfx_description == 4">
Doesn't affect gameplay. If you have issues on Display while using an external frame limiter, use Manual with that frame limit instead.
</p>
<p data-if="cur_gfx_description == 5">
Sets the Multisample anti-aliasing (MSAA) quality level. This reduces jagged edges in the final image at the expense of rendering performance.
<br />
<br />
Note: This option won't be available if your GPU does not support MSAA Sample Positions during the time being as it is required to avoid rendering glitches.
</p>
</div> </div>
</div> </div>
<div class="config__footer"> <div class="config__footer">
@ -113,8 +260,7 @@
data-attrif-disabled="!options_changed" data-attrif-disabled="!options_changed"
onclick="apply_options" onclick="apply_options"
id="apply_button" id="apply_button"
style="nav-up:#rr_original" style="nav-up:#msaa_none"
data-attr-style="rr_option=='Manual' ? 'nav-up:#rr_manual_input' : 'nav-up:#rr_original'"
> >
<div class="button__label">Apply</div> <div class="button__label">Apply</div>
</button> </button>

2
assets/recomp.rcss
View File

File diff suppressed because one or more lines are too long

66
assets/scss/styles/components/Config.scss
View File

@ -18,14 +18,28 @@
} }
.config__wrapper { .config__wrapper {
display: flex;
flex-direction: column;
border-radius: 0dp; border-radius: 0dp;
flex: 1 1 100%; flex: 1 1 100%;
height: 100%; height: 100%;
padding: space(16); padding: space(16);
text-align: left; text-align: left;
background-color: $color-bg-shadow; background-color: $color-bg-shadow;
p {
@extend %body;
padding: space(16);
white-space: pre-line;
line-height: space(28);
}
}
.config__hz-wrapper {
display: flex;
flex-direction: row;
border-radius: 0dp;
flex: 1 1 100%;
height: 100%;
text-align: left;
} }
.config__header, .config__footer { .config__header, .config__footer {
@ -69,7 +83,11 @@
flex: 1; flex: 1;
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: flex-start;
margin: space(8) 0 space(16); margin: space(16) space(0) space(24);
&:last-child {
margin-top: space(16);
}
} }
.config-option__title { .config-option__title {
@ -86,11 +104,20 @@
align-items: flex-start; align-items: flex-start;
justify-content: flex-start; justify-content: flex-start;
input:first-of-type {
nav-left: none;
}
input:last-of-type {
nav-right: none;
}
.config-option__tab-label { .config-option__tab-label {
@extend %label-sm; @extend %label-sm;
display: block; display: block;
padding: 12dp 0; padding: space(12) 0 space(8);
margin: 0 12dp; height: auto;
margin: 0 space(12);
margin-right: space(16); margin-right: space(16);
color: $color-text-inactive; color: $color-text-inactive;
tab-index: none; tab-index: none;
@ -103,23 +130,34 @@
input.radio { input.radio {
@extend %nav-all; @extend %nav-all;
@include trans-colors-opa;
visibility: visible; visibility: visible;
width: 0; width: 0;
height: 0; height: 0;
&:checked + .config-option__tab-label { &:not(:disabled) {
border-bottom: 1dp; &:checked + .config-option__tab-label {
border-color: $color-border-hard; border-bottom: 1dp;
border-color: $color-border-hard;
&:hover {
cursor: default;
}
}
&:focus + .config-option__tab-label,
&:hover + .config-option__tab-label {
color: $color-text;
}
}
&:disabled + .config-option__tab-label {
opacity: 0.5;
&:hover { &:hover {
cursor: default; cursor: default;
} }
} }
&:focus + .config-option__tab-label,
&:hover + .config-option__tab-label {
color: $color-text;
}
} }
input.range slidertrack { input.range slidertrack {
@ -164,7 +202,7 @@
.config-option__details { .config-option__details {
@extend %label-xs; @extend %label-xs;
color: $color-secondary; color: $color-secondary;
margin: space(8) space(12) 0; margin: space(14) space(12) 0;
height: space(18); height: space(18);
} }

35
src/ui/ui_config.cpp
View File

@ -45,7 +45,11 @@ template <typename T>
void bind_option(Rml::DataModelConstructor& constructor, const std::string& name, T* option) { void bind_option(Rml::DataModelConstructor& constructor, const std::string& name, T* option) {
constructor.BindFunc(name, constructor.BindFunc(name,
[option](Rml::Variant& out) { get_option(*option, out); }, [option](Rml::Variant& out) { get_option(*option, out); },
[option](const Rml::Variant& in) { set_option(*option, in); graphics_model_handle.DirtyVariable("options_changed"); graphics_model_handle.DirtyVariable("ds_info"); } [option](const Rml::Variant& in) {
set_option(*option, in);
graphics_model_handle.DirtyVariable("options_changed");
graphics_model_handle.DirtyVariable("ds_info");
}
); );
}; };
@ -65,6 +69,7 @@ void bind_atomic(Rml::DataModelConstructor& constructor, Rml::DataModelHandle ha
static int scanned_binding_index = -1; static int scanned_binding_index = -1;
static int scanned_input_index = -1; static int scanned_input_index = -1;
static int focused_input_index = -1; static int focused_input_index = -1;
static int focused_gfx_index = -1;
static bool cont_active = true; static bool cont_active = true;
@ -293,7 +298,15 @@ public:
} }
new_options = ultramodern::get_graphics_config(); new_options = ultramodern::get_graphics_config();
bind_option(constructor, "res_option", &new_options.res_option); constructor.BindFunc("res_option",
[](Rml::Variant& out) { get_option(new_options.res_option, out); },
[](const Rml::Variant& in) {
set_option(new_options.res_option, in);
graphics_model_handle.DirtyVariable("options_changed");
graphics_model_handle.DirtyVariable("ds_info");
graphics_model_handle.DirtyVariable("ds_option");
}
);
bind_option(constructor, "wm_option", &new_options.wm_option); bind_option(constructor, "wm_option", &new_options.wm_option);
bind_option(constructor, "ar_option", &new_options.ar_option); bind_option(constructor, "ar_option", &new_options.ar_option);
bind_option(constructor, "msaa_option", &new_options.msaa_option); bind_option(constructor, "msaa_option", &new_options.msaa_option);
@ -308,7 +321,11 @@ public:
}); });
constructor.BindFunc("ds_option", constructor.BindFunc("ds_option",
[](Rml::Variant& out) { [](Rml::Variant& out) {
out = new_options.ds_option; if (new_options.res_option == ultramodern::Resolution::Auto) {
out = 1;
} else {
out = new_options.ds_option;
}
}, },
[](const Rml::Variant& in) { [](const Rml::Variant& in) {
new_options.ds_option = in.Get<int>(); new_options.ds_option = in.Get<int>();
@ -344,6 +361,18 @@ public:
out = ""; out = "";
}); });
constructor.BindEventCallback("set_current_gfx_description",
[](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
int gfx_index = inputs.at(0).Get<size_t>();
// watch for mouseout being overzealous during event bubbling, only clear if the event's attached element matches the current
if (gfx_index == -1 && event.GetType() == "mouseout" && event.GetCurrentElement() != event.GetTargetElement()) {
return;
}
focused_gfx_index = gfx_index;
model_handle.DirtyVariable("cur_gfx_description");
});
constructor.Bind("cur_gfx_description", &focused_gfx_index);
graphics_model_handle = constructor.GetModelHandle(); graphics_model_handle = constructor.GetModelHandle();
} }