Commit Graph

15325 Commits

Author SHA1 Message Date
lat9nq
ff9538f8d7 configure_per_game: address reviewer concern
As far as I understand, it prevents the program from unnecessarily copying strings.

Co-Authored-By: LC <lioncash@users.noreply.github.com>
2020-07-09 04:46:38 -04:00
lat9nq
97e7d239a1 configuration_shared: translate "Use global configuration"
Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared.
2020-07-09 04:35:24 -04:00
lat9nq
9dcf22cfe6 complete rebase 2020-07-09 04:34:04 -04:00
lat9nq
70cff73d03 settings: Drop operator overrides from Setting template
Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog.
2020-07-09 03:59:55 -04:00
lat9nq
a24f700176 configuration_shared: address reviewer concerns except operator overrides
Dropping operator override usage in next commit.

Co-Authored-By: LC <lioncash@users.noreply.github.com>
2020-07-09 03:59:22 -04:00
lat9nq
0be18984ec main: only restore global settings when necessary
Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug.
2020-07-09 03:59:22 -04:00
lat9nq
6795d66c92 Revert "main: load per-game settings after LoadROM"
This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804.
2020-07-09 03:59:22 -04:00
lat9nq
47b1ccc812 main: load per-game settings after LoadROM
This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug.
2020-07-09 03:59:22 -04:00
lat9nq
3756dc2276 address reviewer concerns
Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static.

Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com>
2020-07-09 03:59:22 -04:00
lat9nq
eb458865d7 configure_graphics: guard device selector when Vulkan is global
Prevents the user from editing the device selector if Vulkan is the global
renderer backend. Also resets the vulkan_device variable when the users
switches back-and-forth between global and Vulkan.
2020-07-09 03:59:22 -04:00
lat9nq
2c0587df0e Revert "settings: initalize resolution factor with constructor instead of casting"
This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8.
2020-07-09 03:59:22 -04:00
lat9nq
83c50acf7c settings: initalize resolution factor with constructor instead of casting 2020-07-09 03:59:22 -04:00
lat9nq
a48125b5c9 use a zero 2020-07-09 03:59:22 -04:00
lat9nq
c21d62afc5 main: load settings if the file has a title id
In other words, don't exit if the loader has trouble getting a title id.
2020-07-09 03:59:22 -04:00
lat9nq
588209e514 settings: Log UseDockedMode in the Controls group
This should have happened when use_docked_mode was moved over to the controls group
internally. This just reflects this in the log.
2020-07-09 03:59:22 -04:00
lat9nq
525e14f452 main: fix status buttons reporting wrong settings after stop emulation 2020-07-09 03:59:22 -04:00
lat9nq
b0c15ac20e Revert "settings: literal instead of casting "
This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f.
2020-07-09 03:59:22 -04:00
lat9nq
8a7db4b6c7 settings: literal instead of casting
"No need to cast, use 1U instead"
Thanks, Morph!

Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
2020-07-09 03:59:22 -04:00
lat9nq
513356d21b address my own review
Basically revert unintended changes
2020-07-09 03:59:22 -04:00
lat9nq
fabb0b8c3d clang format take 4 2020-07-09 03:59:22 -04:00
lat9nq
dd28c11624 rebased 2020-07-09 03:59:22 -04:00
lat9nq
56321a8cbb clang format 2020-07-09 03:59:22 -04:00
lat9nq
f1640df97c fixed custom rtc and rng seed overwriting the global value 2020-07-09 03:59:22 -04:00
lat9nq
59aef94c94 configure_audio: set toggle_stretched_audio to tristate 2020-07-09 03:59:22 -04:00
lat9nq
20eef91cd4 fix another logic error
In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered
condition.
2020-07-09 03:59:22 -04:00
lat9nq
3b62d75257 fix more logic errors
Fixed the frame limit would set the global setting from the game properties
dialog. Also strengthened the Settings::Setting member variables and simplified
the logic in config reading (ReadSettingGlobal).
2020-07-09 03:59:22 -04:00
lat9nq
c39112299a restore settings' global state regardless of accept/cancel
Fixes loading a properties dialog and causing the global config dialog to show
local settings.
2020-07-09 03:59:22 -04:00
lat9nq
3893d8b39a configuration: fix a logic error
Should not be negated
2020-07-09 03:59:22 -04:00
lat9nq
081f91fcf8 configuration: add comments, assume less, and clang format
No longer assumes that a disabled UI element means the global state is turned
off, instead opting to directly answer that question. Still however assumes a
game is running if it is in that state.
2020-07-09 03:59:22 -04:00
lat9nq
4ac4554e9a config: don't write local settings in the global config
Simple guards to prevent writing the wrong settings in the wrong files.
2020-07-09 03:59:22 -04:00
lat9nq
256c50376f configuration: guard setting values incorrectly
This disables setting values while a game is running if the setting is
overwritten by a per game setting.
2020-07-09 03:59:22 -04:00
lat9nq
a542583075 settings: restore global state when necessary
Upon closing a game or the game properties dialog, we need to restore all global
settings to the original global state so that we can properly open the
configuration dialog or boot a different game.
2020-07-09 03:59:22 -04:00
lat9nq
c2d1750575 config: read and write settings with global awareness
Adds new functions to read and write settings while keeping the global state in
focus. Files now generated per-game are much smaller since often they only need
address the global state.
2020-07-09 03:59:22 -04:00
lat9nq
e2886132d9 address comments and style issues 2020-07-09 03:59:22 -04:00
lat9nq
08018d985c clang format take 2
can the docker container save this?
2020-07-09 03:59:22 -04:00
lat9nq
5afe9a375a clang format 2020-07-09 03:59:22 -04:00
lat9nq
36a5b83f1b configuration: implement hierarchical game properties dialog
This sets the apropriate global or local data in each setting.
2020-07-09 03:59:22 -04:00
lat9nq
3ad63dd4a0 settings: restore old values struct
No longer needed with the Settings::Setting class template.
2020-07-09 03:59:21 -04:00
lat9nq
ebcb9090ac settings: use a template to duplicate memory for each setting
Replaces the type of each variable in the Settings::Values struct with a new
class that allows basic data reading and writing. The new struct
Settings::Setting duplicates the data in memory and can manage global overrides
per each setting.
2020-07-09 03:58:56 -04:00
lat9nq
efab7a126a configuration: Fix the other yuzu executables and a regression
In main.cpp, we have to get the title ID before the ROM is loaded, else the
renderer will reflect only the global settings and now the user's game specific
settings.
2020-07-09 03:58:56 -04:00
lat9nq
de9350925b settings: move use_docked_mode to Controls group
`use_docked_mode` is set in the input settings and cannot be accessed from the
system settings. Grouping it with system settings causes it to be saved with
per-game settings, which may make transferring configs more difficult later on,
especially since docked mode cannot be set from within the game properties
dialog.
2020-07-09 03:58:56 -04:00
lat9nq
2d01d76ae5 settings: split Settings::values into two different structs
By splitting the settings into two mutually exclusive structs, it becomes easier,
as a developer, to determine how to use the Settings structs after per-game
configurations is merged. Other benefits include only duplicating the required
settings in memory.
2020-07-09 03:58:56 -04:00
lat9nq
94fb90596a configuration: user correct config during emulation
Creates a new pointer specifically for modifying the configuration while
emulation is in progress. Both the regular configuration dialog and the game
properties dialog now use the pointer Settings::config_values to focus edits to
the correct struct.
2020-07-09 03:58:56 -04:00
lat9nq
bb1461ce6c configuration: boot a game using per-game settings
Swaps values where needed to boot a game.
2020-07-09 03:58:56 -04:00
lat9nq
e66c9a79b5 configuration: change config interfaces to use config-specific pointers
When a game is booted, we need to be able to open the configuration dialogs
without changing the settings pointer in the game's emualtion. A new pointer
specific to just the configuration dialogs can be used to separate changes
to just those config dialogs without affecting the emulation.
2020-07-09 03:58:56 -04:00
lat9nq
4342f759a3 configuration: correct add-ons config and swap settings when apropriate
Any add-ons interaction happens directly through the global values struct.
Swapping bewteen structs now also includes copying the necessary global configs
that cannot be changed nor saved in per-game settings. General and System config
menus now update based on whether it is viewing the global or per-game settings.
2020-07-09 03:58:56 -04:00
lat9nq
1dedbbdaaa configuration: swap to per-game config memory for properties dialog
Does not set memory going in-game. Swaps to game values when opening the
properties dialog, then swaps back when closing it. Uses a `memcpy` to swap.
Also implements saving config files, limited to certain groups of configurations
so as to not risk setting unsafe configurations.
2020-07-09 03:58:56 -04:00
lat9nq
d96eb90144 configuration: setup global configuration checkbox
Global config checkbox now enables/disables the appropriate tabs in the game
properties dialog. The use global configuration setting is now saved to the
config, defaulting to true. This also addresses some changes requested in the PR.
2020-07-09 03:58:56 -04:00
lat9nq
9ca688a29e configuration: Rename files
These weren't included in the last commit. Now they are.
2020-07-09 03:58:56 -04:00
lat9nq
090f2ba446 configuration: add new UI without changing existing funcitonality
The new UI also adds General, System, Graphics, Advanced Graphics,
and Audio tabs, but as yet they do nothing. This commit keeps yuzu
to the same functionality as originally branched.
2020-07-09 03:58:56 -04:00