Commit Graph

1523 Commits

Author SHA1 Message Date
2e6800f586 Enable NRT in RulesetResourcesSkin 2021-06-23 09:52:00 +03:00
0db06c727b Dispose resource stores on finalizer 2021-06-23 09:41:45 +03:00
ee84364d7c Resolve conflict issues 2021-06-22 20:38:24 +03:00
896c1dc202 Merge branch 'master' into ruleset-resources-skin 2021-06-22 20:36:49 +03:00
4cb9c6a842 Merge pull request #13423 from frenzibyte/transformers-per-skin
Refactor ruleset skin transforming logic to be per-`ISkin` rather than one `ISkinSource`
2021-06-22 21:24:56 +09:00
71e2815e7e Update and improve code documentation
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-06-22 12:05:17 +03:00
c1284940e1 Fix potentially providing the same skin instance twice in AllSources 2021-06-22 10:49:37 +03:00
d0cdc07b11 Reuse AllSources when looking up on FindProvider 2021-06-22 10:49:21 +03:00
4b3165084d Move scoped functionality into local function 2021-06-22 16:40:56 +09:00
ffac32a848 Reword xmldoc 2021-06-22 16:40:48 +09:00
14bdcef26b Add missing newline 2021-06-22 16:20:09 +09:00
0ad189e357 Expose skin sources via ISkinSource and revert to consuming based on hierarchy 2021-06-22 16:19:55 +09:00
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
ec040ff3fc Fix leak due to not properly unbinding SourceChanged event on disposal 2021-06-22 05:05:41 +03:00
caa90bccc6 Fix default skin potentially added twice in RulesetSkinProvidingContainer 2021-06-22 03:45:43 +03:00
627c857da8 Propagate SourceChanged events from SkinManager down in the ruleset skin container 2021-06-22 03:45:24 +03:00
9e5bb146d3 Add xmldoc to SkinManager
The `<summary>` part comes from `BeatmapManager`, which I believe works correctly here as well, as this does handle the "storage and retrieval" of skins.
2021-06-22 03:07:31 +03:00
97dbc7f20e Add back SkinManager.DefaultSkin to the ruleset skin lookup sources 2021-06-22 02:54:34 +03:00
d53a43cf3c Isolate RulesetSkinProvidingContainer from falling back to parent skin sources
For simplicity of lookup order, and which sources are used for the lookup.
2021-06-22 02:53:22 +03:00
ebe0d43790 Add ability to disallow falling back to parent skins 2021-06-22 02:51:17 +03:00
5cfd0e3223 Remove implicit LegacySkin check and refactor anything using it 2021-06-21 04:16:58 +03:00
c751e087ca Merge branch 'master' into skin-editor-closest-anchor 2021-06-18 18:54:07 +09:00
780388d174 Fix incorrect return value 2021-06-17 03:48:29 +03:00
74ad6f9117 Remove default skin from the ruleset skin sources
That one doesn't need any changes to it, can be fetched from the `SkinManager` instead.
2021-06-16 17:24:31 +03:00
52ddf08532 Consider not adding legacy skin transformers to non-legacy skins 2021-06-16 17:24:16 +03:00
5ebf570ec4 Revert GetRulesetTransformedSkin accessibility change
This reverts commit 521077b714.

Forgot to do it when I made this `protected`, but subclasses in test scenes require this.
2021-06-16 16:49:38 +03:00
2155a4da0a Fix intermittent HUD test failure 2021-06-16 19:52:58 +09:00
521077b714 Make getRulesetTransformedSkin private 2021-06-16 17:44:18 +09:00
4b45d8318e Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
8de0d33c5a Revert "Move collection change bind to LoadComplete"
This reverts commit d6d87e1975.

Actually that broke things due to the "disableable" instances not added early enough, revert for now.
2021-06-11 17:59:29 +03:00
b6947c25ec Fix potentially adding the same skin multiple times 2021-06-11 17:55:07 +03:00
d6d87e1975 Move collection change bind to LoadComplete
Best practice anyways
2021-06-11 17:35:33 +03:00
108a3deb27 Also handle null Ruleset.CreateLegacySkinProvider values
Let's just go this way for now, maybe it's a better choice to always create transformers and disallow null, but it's too much work and out of scope at this point
2021-06-11 16:26:54 +03:00
550d566bf9 Simplify member access 2021-06-11 14:24:17 +02:00
876a357bf2 Add support for animated colour fill in new style legacy health bar 2021-06-11 14:24:17 +02:00
0c8851f4b7 Extract drawable.ScreenSpaceDrawQuad to a variable 2021-06-11 07:06:22 -04:00
a6774eb5b5 Inline getOriginPositionFromQuad 2021-06-11 06:59:00 -04:00
c9b4f9eb71 Make getOriginPositionFromQuad local 2021-06-11 06:55:47 -04:00
1bc8460902 Rename getTieredComponent to getAnchorFromPosition
Also rename parameter `component` to `xOrY`.
2021-06-11 06:53:40 -04:00
6e181a6b63 Rename parameters of getTieredComponent 2021-06-11 06:53:04 -04:00
a76eaeb52d Make getTieredComponent local 2021-06-11 06:51:12 -04:00
635300b311 Recalculate closest anchor when origin is changed 2021-06-11 06:28:30 -04:00
a506f2a776 Revert rename of lambda variables 2021-06-11 06:22:24 -04:00
f20146d446 Fix potentially adding null skin sources 2021-06-11 12:58:38 +03:00
e59beffc4e Forward all base transformer lookup methods to Skin 2021-06-11 12:44:25 +03:00
9e16359f18 Refactor disallowing in SkinProvidingContainer to become per source
Fixes `FindProvider` becoming completely broken, because of no way to perform the checks on one skin source.
2021-06-11 12:29:29 +03:00
2e01e61177 Move TODO comment to correct location 2021-06-11 11:46:30 +03:00
8132852753 Add other affectable change action cases 2021-06-11 11:34:22 +03:00
a985e3b8d3 Apply documentation settings for better readability
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-06-11 11:25:07 +03:00
debd359d2e Update xmldoc 2021-06-11 14:50:21 +09:00