Dean Herbert
0e764538e0
Retrieve KeyBindingContainer via DI rather than traversal lookup
2022-01-31 17:05:04 +09:00
Dean Herbert
a84fd2e20c
Merge branch 'master' into master
2022-01-31 16:30:08 +09:00
Susko3
19467e58c1
Remove unused params from BDL methods
2022-01-15 01:06:39 +01:00
Dan Balasescu
52e240230b
Merge branch 'master' into mouse-button-disable-disables-touch
2022-01-12 17:14:39 +09:00
Dan Balasescu
a09563a7d9
Fix calculation of most common beat length for mania scroll speed
2022-01-11 11:00:30 +09:00
Dean Herbert
88602ec1b4
Fix mouse button disable not disabling touch input mappings
2022-01-05 18:29:32 +09:00
pikokr
dec1f31749
Make KeyBindingContainer public
2021-12-28 22:43:07 +09:00
pikokr
d629305002
Remove Cached attribute from DrawableRuleset.KeyBindingInputManager
2021-12-28 21:47:58 +09:00
pikokr
58994b790c
Get key binding container once instead of getting on every touch
2021-12-27 21:20:52 +09:00
Bartłomiej Dach
5cbaa028eb
Use extracted ruleset config cache implementation in DI
2021-12-23 19:02:10 +01:00
Bartłomiej Dach
1040590844
Add cancellation support to game-side IResourceStores
2021-12-23 10:33:17 +01:00
Dean Herbert
1eed2436e6
Clean up unused resolved properties
2021-12-03 18:49:49 +09:00
Dean Herbert
cdb2a92f86
Disable key repeat for all ruleset handling cases
2021-11-18 13:13:36 +09:00
Dean Herbert
66c307e0ee
Remove usage of key repeat helper method
2021-11-18 13:13:36 +09:00
Dean Herbert
6944151486
Apply batch fixing of built-in types using var
2021-10-27 13:04:41 +09:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-13 20:17:57 +09:00
Bartłomiej Dach
56eae703fe
Avoid changing frame stable clock direction if time hasn't changed between frames
2021-10-11 21:39:48 +02:00
smoogipoo
bc37cb6f43
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-08 18:41:17 +09:00
Dean Herbert
b339c149d8
Copy BaseDifficulty to Beatmap<T> and move all write operations across
2021-10-06 15:10:45 +09:00
Dean Herbert
32afd3f426
Replace all basic usages
2021-10-02 02:22:23 +09:00
Dean Herbert
46bafb6252
Merge branch 'master' into no-more-difficulty-control-points-info
2021-09-28 13:53:56 +09:00
smoogipoo
f9d5abff8a
Update with keybinding changes
2021-09-16 18:26:12 +09:00
Dean Herbert
464797fecf
Allow ModIcon to be constructed using an IMod
2021-09-10 12:43:12 +09:00
Dean Herbert
3c7a34bdbd
Move mania-specific conversion to converter
2021-09-06 21:06:13 +09:00
Dean Herbert
d587dc6203
Populate new approach rate where required
2021-09-03 17:11:12 +09:00
Dean Herbert
d4e5a612ea
Update IPositionalSnapProvider to take a HitObject as reference, rather than raw time
...
This allows fetching the correct `DifficultyControlPoint` from the
hitobject. Nothing more.
2021-09-03 17:11:12 +09:00
Dean Herbert
15aa0458bc
Use PausableSkinnableSound instead
2021-08-26 17:15:36 +09:00
Dean Herbert
fd78d0440b
Update missed conditional
2021-08-25 17:00:32 +09:00
Dean Herbert
ccfff50c6f
Apply fixes in line with issues found during testing
...
I was trying to be too smart with caching, but if the `Play` method was
not called often enough it would have a recent reference. Unfortunately
this requires a separate query to `Entries`, but is also a special case
(no future hitobjects).
This also removes the time-based checks (result status alone should be
all we care about).
2021-08-25 16:56:44 +09:00
Dean Herbert
ef2b5e1c51
Tidy up variable names and unused resolved properties
2021-08-25 16:56:44 +09:00
Dean Herbert
a1936b141b
Refactor base class to allow correct usage in taiko drum
2021-08-25 16:56:44 +09:00
Dean Herbert
681215e5b5
Rewrite object lookup to use previous entry regardless
...
This changes the fallback logic to always prefer the previous resolved
lifetime entry rather than fallback to the first entry ever. I think
this is more correct in all cases.
Also rewrites the inline comments to hopefully be easier to parse.
2021-08-25 16:56:44 +09:00
Dean Herbert
4a294d4de4
Optimise fallback logic to reduce lookups to bare minimum
2021-08-25 16:56:44 +09:00
Dean Herbert
6aa894e55e
Split out separate component
2021-08-25 16:56:44 +09:00
smoogipoo
2af827f913
Increase TimeRange max value
2021-08-02 19:37:45 +09:00
Dean Herbert
53c901bfa8
Expose DrawableRuleset audio adjustments as non-container
2021-07-31 15:47:54 +09:00
Dean Herbert
0c3f1195e9
Allow audio adjustments to be applied to DrawableRulesets
2021-07-30 17:25:01 +09:00
Dan Balasescu
d2722f1523
Merge branch 'master' into ruleset-shaders
2021-07-07 15:44:30 +09:00
Derrick Timmermans
216e52d6d0
Avoid using single letter variable names
2021-07-04 23:24:17 +02:00
Derrick Timmermans
32b068fbdc
Fix typo causing nested windows to be ignored
2021-07-04 21:50:58 +02:00
Bartłomiej Dach
50c27d2635
Update usages of IHasTooltip in line with framework localisation changes
2021-06-25 19:10:04 +02:00
Salman Ahmed
2b1f461d79
Pass empty resource store for FallbackShaderManager base constructor
2021-06-22 12:36:45 +03:00
Salman Ahmed
67f0344c0c
Add support for loading shaders from ruleset resources
2021-06-20 23:07:44 +03:00
Dean Herbert
c369beeaaa
Merge branch 'master' into realm-key-binding-store
2021-06-18 16:52:35 +09:00
ekrctb
b6a9fa9999
Merge branch 'master' into applicable-to-dho
2021-06-16 22:04:10 +09:00
ekrctb
67d8e0059f
Use singular IApplicableToDrawableHitObject for consumers
2021-06-16 18:47:04 +09:00
Dean Herbert
66efc3c4de
Merge branch 'master' into realm-key-binding-store
2021-06-16 13:23:13 +09:00
ekrctb
bbf0022689
Use natural anchor for TimeAtPosition and PositionAtTime
...
The natural anchor is the end of the scrolling direction (e.g. Bottom for Down scrolling).
2021-06-15 13:15:20 +09:00
Bartłomiej Dach
cb1e2e3d97
Improve xmldoc
2021-06-14 21:54:55 +02:00
ekrctb
660bf50dc7
Clarify multiple coordinate systems
...
- Fix wrong position is set for DHOs for down/right scrolling direction.
2021-06-14 13:13:27 +09:00
ekrctb
09f1cbde7e
Fix TimeAtPosition doc comment
2021-06-14 13:13:27 +09:00
ekrctb
fdb09ef4d7
Simplify flipPositionIfRequired using scrollLength
2021-06-14 13:13:27 +09:00
ekrctb
8cf4454780
Use Direction enum instead of int
...
The property is named `scrollingAxis` to distinguish from `direction`, which is of `ScrollingDirection` type (unfortunate name crash).
2021-06-14 13:13:27 +09:00
ekrctb
af3f253b21
Refactor ScrollingHitObjectContainer and expose more useful methods
2021-06-11 18:28:48 +09:00
Dean Herbert
9044a20120
Merge branch 'master' into realm-key-binding-store
2021-06-10 13:58:08 +09:00
Dan Balasescu
57a38374db
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-04 21:17:40 +09:00
Dan Balasescu
b283c48abb
Merge branch 'master' into factor-out-hoc
2021-06-04 15:31:35 +09:00
Dean Herbert
23096c58bb
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-04 15:06:15 +09:00
Dean Herbert
d444fed46f
Detach gameplay score from replay recorder before importing
...
Closes #13320 .
2021-06-04 02:00:02 +09:00
smoogipoo
e887807ae7
Apply review fixes
2021-06-03 18:32:05 +09:00
smoogipoo
c3280083a2
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-03 17:42:01 +09:00
smoogipoo
420df124b5
Add framestable-bypassing seek for spectator
2021-06-03 17:27:21 +09:00
ekrctb
b321b20e9d
Remove OnAdd/OnRemove of HitObjectContainer
...
Instead, override `AddDrawable`/`RemoveDrawable`.
2021-06-03 15:00:16 +09:00
ekrctb
0ce7baa3f3
Make HitObjectContainer.Clear non-virtual
...
It just call `Remove` for all entries.
2021-06-03 15:00:16 +09:00
ekrctb
2c9e5b6c7e
Replace EntryCrossedBoundary with more useful RemoveRewoundEntry property
...
It can be used for dynamically added entries.
2021-06-03 15:00:16 +09:00
ekrctb
fe2934db1d
Factor out lifetime management logic of HitObjectContainer
2021-06-03 14:57:28 +09:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support
2021-06-03 13:26:00 +09:00
smoogipoo
8ee2b3a2d2
Merge branch 'master' into fix-scrolling-lifetime
2021-06-02 11:08:28 +09:00
Dean Herbert
8a76d97b63
Remove replay logic from DrawableRuleset (and implement in DrawableEditorRulesetWrapper)
2021-06-02 11:06:30 +09:00
Dean Herbert
f14c0eae99
Fix editor no longer creating autoplay frames
2021-06-01 17:28:41 +09:00
ekrctb
ff04942295
Change timing of HitObjectContainer.OnAdd/OnRemove
...
Now, `OnAdd` is always invoked after the DHO is added to the container.
This change is required by `ScrollingHitObjectContainer` to compute origin adjusted lifetime when origin position is relative to the parent drawable size.
2021-05-31 20:56:25 +09:00
ekrctb
948a14a627
Merge branch 'simplify-shoc' into fix-scrolling-lifetime
...
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
2021-05-31 16:50:47 +09:00
ekrctb
86d1225aad
Reset lifetime to initial lifetime when layout is invalidated
2021-05-31 16:47:10 +09:00
ekrctb
6d96846776
Remove scrollLength caching field
...
It was not clear when the field is updated.
2021-05-31 16:28:02 +09:00
ekrctb
742c5b442b
Remove delay of lifetime update
...
The scheduling is no longer necessary because `OnAdd` is changed to not invoked immediately for non-pooled DHOs.
2021-05-31 16:24:13 +09:00
ekrctb
3cedc0824d
Don't add nested hit objects to the sets
...
Only top-level hit objects are checked for layout computation caching.
Also, lifetime of nested hit objects are not managed by the HitObjectContainer.
2021-05-31 16:20:35 +09:00
Dean Herbert
a249bb9e69
Merge branch 'master' into realm-key-binding-store
2021-05-25 17:18:33 +09:00
Dean Herbert
57640810b5
Ignore certain banned InputKeys for gameplay purposes
2021-05-24 18:40:40 +09:00
smoogipoo
6beeb7f7c4
Rename SpectatorStreamingClient -> SpectatorClient
2021-05-20 15:55:07 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry
2021-05-18 20:10:12 +09:00
ekrctb
84a1a86c63
Revert "Use entry to calculate lifetime in ScrollingHOC"
...
This reverts commit 632bb70e
2021-05-18 19:55:31 +09:00
ekrctb
2c65b8fa93
Revert "Fix uninitialized scrollLength value is used"
...
This reverts commit 73dfb04d
2021-05-18 19:55:25 +09:00
ekrctb
913fc8c3bc
Revert the change of not adding non-pooled DHO to HOC until alive
2021-05-04 16:44:48 +09:00
Dean Herbert
a551958eeb
Move caching of IBeatmap to base DrawableRuleset
2021-05-01 21:32:45 +09:00
ekrctb
73dfb04df8
Fix uninitialized scrollLength value is used
2021-04-29 15:17:30 +09:00
ekrctb
632bb70e0f
Use entry to calculate lifetime in ScrollingHOC
...
DHOs cannot be used to calculate lifetime, it is not created before the entry became alive.
2021-04-29 15:04:32 +09:00
ekrctb
c83c804057
Expose lifetime entries from HOC
2021-04-29 14:42:41 +09:00
ekrctb
799d2a3300
Replace failed mania test (pooling not accounted) with a more robust test
...
Also fix null reference in Playfield
2021-04-29 14:38:01 +09:00
ekrctb
d262956146
Always use LifetimeEntry to manage hit objects in HitObjectContainer
...
Previously, non-pooled DHOs were immediately added as children of the HOC when Add is called. Also, non-pooled DHOs were always attached to the HOC as children.
New behavior is that non-pooled DHOs are only added after CheckChildLifetime, and only attached to the HOC while the DHOs are alive.
- LifetimeManagementContainer inheritance of HOC is removed, as it is now all DHOs are "unmanaged" (previously `AddInternal(false)`).
- The signature of `Clear` is changed, and it is now always not disposing the children immediately.
2021-04-29 14:38:01 +09:00
Dan Balasescu
cf55383fff
Merge pull request #12486 from ekrctb/unmanaged-hit-object-entry
...
Associate DrawableHitObject with HitObjectLifetimeEntry rather than HitObject
2021-04-21 17:08:21 +09:00
ekrctb
3fbeadf318
Deprecate old overload of Apply
2021-04-21 14:32:37 +09:00
smoogipoo
d26fa46ef2
Record every 60fps interval
2021-04-16 19:42:44 +09:00
ekrctb
936bde28a3
Remove manual handling of IsActive in RulesetInputManager
...
Now it is supported in framework
2021-04-16 14:13:41 +09:00
Dan Balasescu
ac8e462d32
Merge branch 'master' into refactor-framed-replay-input-hander
2021-04-15 21:48:58 +09:00
ekrctb
d8aa436e81
Remove usage of Lazy<List<...>> in NestedPlayfields
2021-04-15 18:26:01 +09:00
Dean Herbert
ba325de595
Merge conditionals for readability
2021-04-15 14:19:59 +09:00
ekrctb
6d18b3db00
Avoid empty list allocation
2021-04-12 18:49:38 +09:00
ekrctb
d6d8ea5b6b
Throw when getting a frame of an empty replay
2021-04-12 11:17:56 +09:00
Bartłomiej Dach
aec859b4d1
Merge branch 'master' into fix-unsafe-skinnable-sample-play
2021-03-18 19:51:46 +01:00
Dean Herbert
c4ba045df1
Add note about finalizers required for audio store clean-up
2021-03-02 16:07:51 +09:00
Dean Herbert
ec4b770cba
Remove unused using statement
2021-02-23 14:56:03 +09:00
Dean Herbert
672fd3f9d2
When disable mouse buttons during gameplay is selected, disable more globally
...
Until now the disable setting would only apply to left/right buttons,
and only in gameplay. This change will cause any global actions bound to
mouse buttons to also not work during gameplay.
Closes #11879 .
2021-02-23 14:37:46 +09:00
smoogipoo
ee6a94273d
Merge branch 'master' into fix-unsafe-skinnable-sample-play
2021-02-22 18:31:27 +09:00
Dean Herbert
63dd55c92c
Add missing methods from updated audio component interface implementation
2021-02-22 14:18:52 +09:00
Dean Herbert
487a39eea9
Update interface implementations with framework changes
2021-02-18 18:52:34 +09:00
Dean Herbert
143e145670
Update implementation of AdjustableAudioComponents
2021-02-18 15:44:23 +09:00
smoogipoo
d3f0c0730d
Merge branch 'master' into non-concurrent-sample-playback
2021-02-12 17:22:15 +09:00
Dean Herbert
f84ea30637
Expose Mods in DrawableRuleset to avoid using external DI
2021-02-11 17:47:29 +09:00
smoogipoo
f4a31287bf
Add/use IHitObjectContainer interface instead of IEnumerables
2021-02-08 20:11:06 +09:00
Dean Herbert
06a3a72e43
Merge pull request #11670 from smoogipoo/mania-constant-speed-mod
...
Implement mania constant speed mod
2021-02-05 00:26:04 +09:00
smoogipoo
8295fb9081
Implement mania constant speed mod
2021-02-03 16:28:22 +09:00
smoogipoo
921f008217
Fix ModIcon not updating background colour correctly
2021-02-02 21:35:08 +09:00
Dean Herbert
a5f3418e56
Avoid tooltip display
2021-01-26 19:11:19 +09:00
Bartłomiej Dach
1d9aaac2c2
Fix HOC not propagating DHO results applied on kill
...
`DrawableHitObject.OnKilled()` calls `UpdateResult()` to clean up a
hitobject's state definitively with regards to the judgement result
before returning the DHO back to the pool.
As it turns out, if a consumer was relying on this code path (as taiko
was in the case of nested strong hit objects), it would not work
properly with pooling, due to `HitObjectContainer` unsubscribing from
`On{New,Revert}Result` *before* calling the DHO's `OnKilled()`.
This in turn would lead to users potentially getting stuck in gameplay,
due to `ScoreProcessor` not receiving all results via that event path.
To resolve, change the call ordering to allow hit result changes applied
in `OnKilled()` to propagate normally.
2021-01-21 00:05:37 +01:00
smoogipoo
de9d075f94
Initial sample + samplechannel rework
2021-01-19 17:11:40 +09:00
Dean Herbert
ced7a36788
Update namespaces
2021-01-18 21:24:10 +09:00
Dean Herbert
a8569fe15c
Fix a couple of simple cases of incorrect TextureLoaderStore initialisation
2020-12-21 13:35:46 +09:00
Dean Herbert
64a2526678
Add header class and basic flow for propagating data updates
2020-12-14 17:33:23 +09:00
Dean Herbert
1793385e96
Pass a score to the replay recorder to allow reading more general scoring data
2020-12-14 16:52:14 +09:00
Dean Herbert
51e8a05f18
Seal SetRecordTarget method to simplify modification
2020-12-14 16:44:29 +09:00
ekrctb
a548269c34
Fix scrolling hit object displayed in wrong position for one frame
2020-12-07 17:26:12 +09:00
Dean Herbert
5ded4b9faa
Merge branch 'master' into dho-remove-onparentreceived
2020-12-04 11:04:56 +09:00
smoogipoo
0bdf99b97a
Remove OnParentReceived()
2020-12-03 20:08:42 +09:00
smoogipoo
73e99718bc
Change order of OnParentReceived()
2020-12-03 20:06:26 +09:00
Dean Herbert
51741c4791
Merge branch 'master' into hit-sample-pooling
2020-11-30 22:25:28 +09:00
smoogipoo
4bbeb9ebd4
Merge branch 'master' into hit-sample-pooling
2020-11-30 18:31:58 +09:00
smoogipoo
7ac2fba127
More reordering of public vs private methods
2020-11-30 17:44:58 +09:00
Dean Herbert
2745659986
Reword and xmldoc some comments
2020-11-30 15:54:20 +09:00
ekrctb
6e40de58e9
Use new OnAdd and OnRemove to invalidate DHO
2020-11-27 13:36:40 +09:00
ekrctb
05e245d445
Allow non-pooled DHO to be reused
2020-11-26 19:07:09 +09:00
ekrctb
eae33fe74a
Fix format
2020-11-26 14:16:33 +09:00
ekrctb
e43f928588
Use DHO.HitObjectApplied to invalidate computation
2020-11-26 14:07:40 +09:00
ekrctb
f6faf95e33
Revert changes to HitObjectUsageBegan, not use it.
2020-11-26 14:01:46 +09:00
ekrctb
1a6e5bdaba
Merge branch 'master' into pool-scrolling
2020-11-26 13:52:52 +09:00
ekrctb
b8a5cd94f7
Invoke HitObjectUsageFinished before removal
2020-11-24 19:46:57 +09:00
ekrctb
e34a205104
Rewrite hit object management, take three
2020-11-24 18:56:05 +09:00
ekrctb
7f6e4d5b21
Delay lifetime computation until loaded
2020-11-24 18:56:05 +09:00
ekrctb
d5f082e5fb
Comment about lifetime assumption
2020-11-24 18:56:05 +09:00
ekrctb
ce57e8ddfb
Separate Lifetime computation and layout update
2020-11-24 18:56:05 +09:00
ekrctb
cabc8aa63b
Revert "Simplify ScrollingHitObjectContainer logic"
...
This reverts commit b4cc39149c117e6a0e95ee917a67cec8ba723d06.
2020-11-24 18:56:05 +09:00
ekrctb
8f39b54e58
Simplify ScrollingHitObjectContainer logic
2020-11-24 18:56:05 +09:00
ekrctb
5c743adbae
Support hit object pooling scrolling playfield
2020-11-24 18:56:05 +09:00
ekrctb
666112cb5a
Address @bdach's minor suggestions
2020-11-22 18:51:16 +09:00
ekrctb
4345d8dcb6
Event -> virtual method
2020-11-21 15:20:33 +09:00
ekrctb
281ed49332
Add HasInitialized to DHO
...
As it turned out, `IsLoaded` is not a reliable way.
2020-11-21 11:19:52 +09:00
ekrctb
82aefa3868
Rework and rename to OnNewDrawableHitObject.
...
The semantics is changed and hopefully more clear.
2020-11-21 00:27:19 +09:00
ekrctb
772f6df668
Add a remark for DrawableHitObjectAdded
2020-11-20 18:00:00 +09:00
ekrctb
c013cd11c9
Add DrawableHitObjectAdded event
2020-11-20 17:56:47 +09:00
smoogipoo
7180bfe4ba
Unlimit number of samples per pool
2020-11-19 21:21:57 +09:00
smoogipoo
f013928fa3
Set maximum pool size
2020-11-19 20:40:01 +09:00
smoogipoo
8920534a25
Fix pools not being added to hierarchy
2020-11-19 20:24:03 +09:00
smoogipoo
730b14b5bb
Add initial hit sample pooling
2020-11-19 19:51:09 +09:00
smoogipoo
e8dbc190f1
Remove ability to pool DHOs in parent playfields
2020-11-16 23:30:24 +09:00
Bartłomiej Dach
610ed99ae3
Add null checks to unguarded resolved-as-null fields
2020-11-14 14:52:58 +01:00
smoogipoo
21b015d63a
Remove explicit public
2020-11-14 01:06:38 +09:00
smoogipoo
c71b237c4f
Merge all pooling support into Playfield
2020-11-14 00:59:08 +09:00
smoogipoo
36f1833f6e
Move hitobject pooling to Playfield
2020-11-14 00:41:18 +09:00
smoogipoo
d83b479c81
Internalise lifetime extensions and events too
2020-11-13 19:21:45 +09:00
smoogipoo
4a4219fd11
Add region
2020-11-13 19:21:45 +09:00
smoogipoo
92189e35cc
Make playfield KeepAlive methods internal
2020-11-13 19:21:45 +09:00
smoogipoo
688a442fb3
Add missing dictionary
2020-11-13 17:26:46 +09:00
smoogipoo
942ecde0e1
Merge branch 'master' into pooling-editor-support
2020-11-13 17:23:35 +09:00
smoogipoo
4236dd826d
Improve documentation and make abstract again
2020-11-13 14:57:09 +09:00
smoogipoo
a07d4a7915
Remove unnecessary dictionary for now
2020-11-13 14:42:41 +09:00
smoogipoo
8aaa500431
Add lifetime extensions
2020-11-12 18:34:50 +09:00
smoogipoo
243e913e4a
Add hitobject usage events
2020-11-12 18:32:20 +09:00
smoogipoo
fe347c8661
Add playfield support for keeping hitobjects alive
2020-11-12 18:30:32 +09:00
smoogipoo
e44a8b3934
Resort as early as possible
2020-11-12 17:07:20 +09:00
smoogipoo
cf91962865
Fix test failures due to on-the-fly starttime changes
2020-11-12 16:58:40 +09:00
smoogipoo
974390bda7
Make Add() + Remove() virtual
2020-11-12 15:36:02 +09:00
smoogipoo
72a6b75626
Add back removed event
2020-11-12 15:34:51 +09:00
smoogipoo
4e43235955
Fix double bind leading to test failures
2020-11-12 15:33:49 +09:00
smoogipoo
653f5bce67
Reword xmldocs
2020-11-12 15:00:58 +09:00
smoogipoo
16e4e8d032
Fix possible nullref
2020-11-12 14:54:33 +09:00
smoogipoo
1f8d376b85
Replace CreatePool() with non-virtual RegisterPool() overload
2020-11-12 14:17:33 +09:00
smoogipoo
5dbbe11fc6
Remove PoolHitObjects, use return value of CreateDrawableRepresentation() instead
2020-11-12 14:04:16 +09:00
smoogipoo
f652eb9982
Remove GetDrawableRepresentation() override, add null hinting
2020-11-12 13:18:44 +09:00
smoogipoo
d7d77460fb
Small refactorings
2020-11-12 12:55:42 +09:00
smoogipoo
a8929b0764
Revert unnecessary change of casting
2020-11-11 19:27:07 +09:00
smoogipoo
7fdaf69903
Add some more xmldocs
2020-11-11 19:12:12 +09:00
smoogipoo
7d02018134
Remove some unnecessary implementations for now
2020-11-11 18:54:40 +09:00
smoogipoo
d7bee80d4e
Merge branch 'fix-incorrect-framestability-value' into hitobject-pooling-base
2020-11-11 18:52:51 +09:00
smoogipoo
90499329bd
Fix frame stable playback not being set correctly
2020-11-11 18:50:38 +09:00
smoogipoo
99e5450af3
Cache DrawableRuleset
2020-11-11 00:22:36 +09:00
smoogipoo
66213f2ed0
Add pooling support to DrawableRuleset + Playfield
2020-11-10 23:56:32 +09:00
smoogipoo
31e4d71852
Rewrite HitObjectContainer with pooling support
2020-11-10 22:49:02 +09:00
smoogipoo
6f3f6dc28b
Add hitobject lifetime support
2020-11-10 20:16:52 +09:00
smoogipoo
45e9f16f6b
Add initial DrawableRuleset interface
2020-11-10 19:27:08 +09:00
smoogipoo
91c627c22d
Revert HOC changes
2020-11-07 00:57:33 +09:00
smoogipoo
248d342a2f
Initial Apply()/FreeAfterUse() DHO implementation
2020-11-06 23:02:37 +09:00
Bartłomiej Dach
b7696c85ad
Add more xmldocs
2020-11-01 15:23:03 +01:00
Dean Herbert
b4e5311014
Move initial state set inside updateClock
2020-10-30 20:39:25 +09:00
Dean Herbert
1bd461f229
Move clock logic back to inside updateClock method
2020-10-30 20:21:14 +09:00
Dean Herbert
0f997386ae
Fix direction and IsRunning not updating on first frame after becoming valid
...
The parent clock will not unpause until WaitingForFrames becomes false,
so I've moved the set of that before we start to propagate its values
across. Doesn't fix any visible issue but should make propagation one
game loop faster.
2020-10-30 15:26:23 +09:00
Dean Herbert
326fd03525
Fix loop not exiting after first valid frame
2020-10-30 15:25:53 +09:00
Dean Herbert
8e6c803900
Avoid running full updateClock loop when waiting on frames
2020-10-30 12:39:11 +09:00
Dean Herbert
87be7d162b
Merge branch 'master' into spectator-replay-watcher
2020-10-30 00:25:17 +09:00
Dean Herbert
335d150a13
Fix aim time being mutated inside update loop
2020-10-29 18:11:50 +09:00
Dean Herbert
2671d371da
Move clock retrieval to new correct location
2020-10-29 15:28:39 +09:00
Dean Herbert
3ea27e23e8
Update namespace references
2020-10-29 15:20:10 +09:00
Dean Herbert
db2b00068f
Avoid sourcing parent clock when in a paused state
2020-10-29 14:48:56 +09:00
Dean Herbert
d91456dc29
Move initial validity check out of loop for clarity
2020-10-29 14:25:47 +09:00
Dean Herbert
2e5a8b2287
Fix xmldoc to read better in new context
2020-10-29 13:16:31 +09:00
Dean Herbert
09da75b143
Merge branch 'frame-stability-clean-up' into spectator-replay-watcher
2020-10-28 15:34:46 +09:00
Dean Herbert
2b1e79a4e8
Simplify state changes further
2020-10-28 15:32:20 +09:00
Dean Herbert
c9515653b3
Restore previous directionality logic to avoid logic differences
2020-10-28 15:31:57 +09:00
Dean Herbert
77d807d0f5
Merge branch 'frame-stability-clean-up' into spectator-replay-watcher
2020-10-28 15:26:02 +09:00
Dean Herbert
59e9c2639a
Remove try-finally
2020-10-28 15:16:56 +09:00
Dean Herbert
a06516c900
Extract out frame stability state into enum for (hopefully) better clarity
2020-10-28 15:15:15 +09:00
Dean Herbert
8c9bda2ded
Split out replay update method
2020-10-28 15:14:06 +09:00
Dean Herbert
9b9a41596f
Split out frame stability calculation to own method
2020-10-28 15:14:06 +09:00
Dean Herbert
851d45d2eb
Add sane pausing logic
2020-10-27 18:58:37 +09:00
Dean Herbert
9e6b0a42ec
Allow FrameStabilityContainer to handle waiting-for-data state better (and pause outwards)
2020-10-27 18:58:37 +09:00
Dean Herbert
b8beac27ce
Use previous logic for catching-up mode
2020-10-27 17:14:41 +09:00
Dean Herbert
09087faf3b
Fix non-matching filename
2020-10-27 14:23:24 +09:00
Dean Herbert
9cfb81589e
Use bindable flow instead
2020-10-27 14:10:12 +09:00
Dean Herbert
6853da459d
Move sample pausing logic out of FrameStabilityContainer
2020-10-27 13:54:33 +09:00
Bartłomiej Dach
7392876b5f
Fix mania crashing due to spectator client handling frames with unconverted beatmap
2020-10-27 00:35:25 +01:00
Dean Herbert
05697dfe68
Add spectator state object support
2020-10-22 17:48:15 +09:00
Dean Herbert
96049c39c9
Add begin/end session logic
2020-10-22 17:48:15 +09:00
Dean Herbert
175fd512b0
Send frames to streaming client from replay recorder
2020-10-22 17:48:15 +09:00
Dean Herbert
411ae38605
Remove unused using
2020-10-20 15:06:31 +09:00
Dean Herbert
267b399f9f
Add some simple border styles
2020-10-20 13:59:03 +09:00
Bartłomiej Dach
4267d23d59
Move border to more appropriate namespace
2020-10-19 20:56:34 +02:00
Bartłomiej Dach
5b96f01564
Fix key counter actions displaying out of order
2020-10-18 19:21:36 +02:00
Dean Herbert
e3eaba7b2c
Move ISampleDisabler implementation to Player and FrameStabilityContainer
2020-10-14 19:39:48 +09:00
Dean Herbert
0605bb9b8d
Fix incorrect parent state transfer
2020-10-05 16:20:29 +09:00
Dean Herbert
ae8bf8cdd4
Fix StabilityGameClock not being updated
2020-10-05 14:27:51 +09:00
Dean Herbert
e4710f82ec
Fix sample disabled status not being updated correctly from seek state
2020-10-05 14:27:51 +09:00
Dean Herbert
af7d10afe0
Fix FrameStabilityContainer not re-caching its GameplayClock correctly
2020-10-05 14:27:51 +09:00
Dean Herbert
fd58a24183
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-28 17:45:48 +09:00
Dean Herbert
524c2b678c
Forcefully regenerate autoplay on editor changes
2020-09-28 15:48:42 +09:00
Dean Herbert
e8220cf1b6
Allow attaching a replay to a FrameStabilityContainer when FrameStablePlayback is off
2020-09-28 15:47:11 +09:00
Dean Herbert
892d440ed0
Add fallback path for potential null ParentGameplayClock
2020-09-25 13:19:07 +09:00
Dean Herbert
7df8b5bce7
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 13:17:03 +09:00
smoogipoo
62c2dbc310
Nest classes + make private
2020-09-24 14:33:43 +09:00
smoogipoo
600b823a30
Fix game texture store being disposed by rulesets
2020-09-24 14:30:18 +09:00
Dan Balasescu
fbaa6675c2
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-23 12:05:14 +09:00
Dean Herbert
e0a2321822
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
2020-09-22 18:17:04 +09:00
Dean Herbert
3f788da06d
Fix SPM changing incorrectly with playback rate changes
2020-09-21 19:39:54 +09:00
Dean Herbert
dd5b15c64f
Fix HitObjectContainer not correctly unbinding from startTime fast enough
2020-09-21 18:27:15 +09:00
Dean Herbert
c84452cfbf
Update usages
2020-08-06 21:53:20 +09:00
smoogipoo
8f841b47e6
Cancel previous initial state computations
2020-07-24 19:31:08 +09:00
Dean Herbert
fc8c345ad7
Merge branch 'master' into custom-game-storage
2020-07-02 09:55:33 +09:00
Dean Herbert
49aa839872
Update RulesetInputManager to use new method
2020-07-01 18:54:11 +09:00
smoogipoo
85c42456f2
Improve performance of sequential scrolling algorithm
2020-06-30 21:41:27 +09:00
Salman Ahmed
eb64c4752c
Merge remote-tracking branch 'upstream/master' into cache-ruleset-dependencies-for-tests
2020-06-15 11:31:12 +03:00
smoogipoo
f3b5149648
Move some suggestions to warnings, resolve issues
2020-06-03 16:48:44 +09:00
Dean Herbert
cbd563e80b
Rename to IHasDuration
2020-05-27 12:38:39 +09:00
Dean Herbert
417e31d77f
Rename function for consistency
2020-05-26 10:17:56 +09:00
Dean Herbert
d69111c665
Fix spelling of breadth
2020-05-26 10:17:34 +09:00
Dean Herbert
8fc60d12c9
Add back comments
2020-05-25 22:09:09 +09:00
Dean Herbert
2c16619ecd
Move time to position conversion to ScrollingHitObjectContainer
2020-05-25 19:32:39 +09:00
Dean Herbert
f395ef24a4
Merge branch 'master' into editor-position-snap
2020-05-22 16:42:09 +09:00
Bartłomiej Dach
6f388b731e
Fix display start time in sequential scroll algorithm
2020-05-21 21:56:59 +02:00
Dean Herbert
b1fd7da824
Merge branch 'master' into editor-position-snap
2020-05-21 15:47:20 +09:00
Dean Herbert
5ad7842b91
Move ScreenSpacePositionAtTime to inside Column implementation
2020-05-21 13:33:02 +09:00
Dean Herbert
ce223a2bd8
Silence hit sounds while seeking
2020-05-21 11:08:06 +09:00
Dean Herbert
44fdf1e6b0
Reword xmldoc
2020-05-10 20:09:41 +09:00
Dean Herbert
c712e98f2b
Merge branch 'master' into publicly-expose-hud
2020-05-10 20:06:28 +09:00
Dan Balasescu
2f12c4126a
Apply suggestions from code review
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-10 13:49:08 +09:00
smoogipoo
be3b77cf25
Fix potentially skipping hitobject updates
2020-05-08 20:09:59 +09:00
smoogipoo
22dda3fe02
Make ScrollingHitObjectContainer respond to defaults applied events
2020-05-08 18:49:58 +09:00
Lucas A
30dd158c33
Rename property to AllowGameplayOverlays and update XMLDoc accordingly.
2020-05-08 09:37:50 +02:00
Lucas A
83998d5ba5
Trim whitespace.
2020-05-07 09:39:14 +02:00
Lucas A
83be5455d3
Disable the display of HUD through DisplayHud property.
2020-05-07 08:52:36 +02:00
Dean Herbert
064e5004ed
Merge branch 'master' into fix-mania-selection
2020-04-29 17:15:48 +09:00
smoogipoo
1aaab40228
Fix mods affecting mania scroll speed
2020-04-28 19:34:02 +09:00
smoogipoo
da30eafa30
Prevent potential exception
2020-04-28 14:47:45 +09:00
smoogipoo
86ef73aa27
Implement HitObjectContainer.Clear()
2020-04-23 11:16:59 +09:00
Salman Ahmed
97340da2f2
Add null-conditional to acesses in dispose methods
...
Such a terrible mistake, the finalizer may be called while the dependencies have an instance but the local itself doesn't have a value yet.
2020-04-12 02:24:36 +03:00
Salman Ahmed
a314a6119a
Fix CI issues
2020-04-11 05:13:04 +03:00
Salman Ahmed
235d3046c6
Move ruleset dependencies caching to its own container
2020-04-11 04:22:23 +03:00
Dean Herbert
7b2144a1a7
Fix merge mishap
2020-04-03 23:31:46 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed
2020-04-03 23:25:14 +09:00
smoogipoo
d90db5649d
Improve comment slightly
2020-04-03 18:32:07 +09:00
smoogipoo
1ff2cc31d1
Implement more familiar scroll speed options in mania
2020-04-03 18:25:01 +09:00
smoogipoo
b42d1104b7
Fix mania converts scrolling at incorrect speeds
2020-04-03 13:16:01 +09:00
smoogipoo
66486b094c
Remove unnecessary dependency, allow null mods
2020-04-01 13:31:17 +09:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip
2020-03-29 14:35:04 +09:00
Dean Herbert
07462120e4
Split break tracking into its own component
2020-03-26 15:30:23 +09:00
Dean Herbert
2b1245f63a
Improve xmldoc in a couple of places
2020-03-26 12:50:00 +09:00
Dean Herbert
448961b330
Rename incorrect variable
2020-03-24 15:39:01 +09:00
Dean Herbert
388cf5c83a
Fix catch positional data being incorrectly recorded
2020-03-24 15:38:54 +09:00
Dean Herbert
022465f546
Add encoding and import support
2020-03-24 14:51:52 +09:00
Dean Herbert
617149fb27
Implement in player
2020-03-23 20:06:18 +09:00
Dean Herbert
14a85a84bf
Add proper screen space - gamefield mapping
2020-03-23 20:06:18 +09:00
Dean Herbert
6d48068061
Move replay recorder to final location
2020-03-23 20:04:15 +09:00
Dean Herbert
232c255986
Basic test scene setup
2020-03-23 17:33:02 +09:00
Dean Herbert
a6b153673e
Fix icons not updating tooltip text correctly
2020-03-23 14:58:02 +09:00
Dean Herbert
4f9ac7b81e
Merge branch 'master' into show-mod-settings-tooltip
2020-03-23 14:57:54 +09:00
Dean Herbert
d8041a0dcb
Increase sample concurrency to better match stable
2020-03-22 02:16:28 +09:00
Liam DeVoe
18bf7c913b
show mod settings in ModIcon tooltip
2020-03-18 23:43:26 -04:00
smoogipoo
6c28fd21c7
osu-side changes
2020-02-24 20:52:15 +09:00
Bartłomiej Dach
5fde4f2c0c
Fix lifetime calculation in overlapping algorithm
...
Changes to lifetime calculation in scrolling rulesets introduced in
#7367 , which aimed to account for the distance between hit objects'
origin and its edge entering the scrolling area, fixed some issues with
hitobjects appearing abruptly, but also regressed some other scenarios.
Upon investigation, the regression was localised to the overlapping
scroll algorithm. The reason for this was two-fold:
* The previous code used TimeAt() to calculate the time of travel from
the hit object's edge to its origin. For other algorithms, that time
can be accurately reconstructed, because they don't have periods of
time where there are multiple hit objects scrolling at different
velocities.
That invariant does not hold for the overlapping algorithm, therefore
it is possible for different values to be technically correct for
TimeAt(). However, the only value that matters for the adjustment
is the one that's indicated by the control point that applies to the
hit object origin, which can be uniquely identified.
* Additionally, the offset returned (even if correct) was applied
externally to the hit object's start time and passed to
GetDisplayStartTime(). In the overlapping algorithm, the choice of
control point used in GetDisplayStartTime() is important, since
the value of the speed multiplier is read within.
Externally rewinding the hit object's start time meant that in some
cases the speed multiplier of the *previous* control point is applied,
which led to hit objects appearing too late if the scrolling rate
decreased.
Because of the above, modify GetDisplayStartTime() to take the offset
into account in all algorithms, and apply the adjustment correctly
inside of them. The constant and sequential algorithms needed no
adjustment from the previous logic, since:
* the constant algorithm disregarded control points, and
* the sequential algorithm would effectively rewind to time = 0,
calculate the absolute distance from time = 0 to the hit object start,
apply the origin offset *to the absolute distance*, and then convert
back to time, applying all control points in sequence. Due to this
it was impossible for control points to get mixed up while
calculating.
As for the overlapping algorithm, the high-level logic is as follows:
* The distance that the origin has to travel is the length of the scroll
plus the distance from the origin to the object edge.
* The above distance divided by the scroll length gives the relative
scroll lengths that the object has to travel.
* As one relative scroll length takes one time range, the relative
travel length multiplied by the time range gives the absolute travel
time of the object origin.
* Finally, the control point multiplier applicable at origin time is
applied to the whole travel time.
Correctness of the above is demonstrated by visual tests added before
and headless unit tests of the algorithms themselves. The sequential
scroll algorithm was not covered by unit tests, and remains uncovered
due to floating-point inaccuracies that should be addressed separately.
2020-02-06 23:13:28 +01:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
mcendu
e096688ac8
simplify some stuff
2020-01-16 17:58:47 +08:00
mcendu
970653470c
format
2020-01-15 17:49:45 +08:00
mcendu
5d160376c0
nullable-ize Mod.Icon
2020-01-14 21:22:00 +08:00
mcendu
abdebcfddc
switch to changing Mod property
2020-01-14 20:11:32 +08:00
