Dean Herbert
42eafe318c
Remove various simple obsoletions
2022-10-28 13:20:58 +09:00
OliBomby
86d5fcc26d
Added tests
2022-10-26 19:30:42 +02:00
OliBomby
77dcd0fae2
Create BezierConverter.cs
2022-10-26 17:21:20 +02:00
Dean Herbert
da93849b80
Rename some pieces and better document SampleBankInfo
2022-10-25 14:55:33 +09:00
Dan Balasescu
8a88339e78
Allow combo colour normalisation to be disabled
2022-10-14 14:37:24 +09:00
Dan Balasescu
15db65c037
Extract to struct, add dictionary term
2022-10-14 14:12:53 +09:00
Dan Balasescu
4149235e63
Limit minimum brightness of combo colours
2022-10-13 14:05:33 +09:00
Dean Herbert
f060e6a780
Implement hold "sliding" samples in osu!mania
2022-10-11 16:31:37 +09:00
sw1tchbl4d3
5a4196fd51
Make currentEffectPoint non-nullable
2022-10-10 15:34:29 +02:00
sw1tchbl4d3
d389808427
Make effect point search more efficient
2022-10-10 14:00:26 +02:00
sw1tchbl4d3
eae32ca483
Switch DefinitelyBigger to AlmostBigger to account for fp errors
2022-10-10 09:39:40 +02:00
sw1tchbl4d3
63ffaa6929
Respect OmitFirstBarLine effect
2022-10-07 20:38:32 +02:00
sw1tchbl4d3
903c8612c8
Move endTime to next timing point
2022-10-07 20:34:31 +02:00
sw1tchbl4d3
0cffbb7562
Clamp LifetimeStart of HitObject's to their judgement windows
2022-09-27 16:54:24 +02:00
Dean Herbert
78625fda7d
Improve exception when attempting to call DrawableHitObject.ClearInternal
2022-09-22 14:44:03 +09:00
Dan Balasescu
e56ea58e71
Fix up xmldoc
2022-09-15 16:06:21 +09:00
Dan Balasescu
c847cc521e
Add some inline comments
2022-09-15 16:00:35 +09:00
Dan Balasescu
68e4d22898
Precondition against entryMap intead of parentMap
2022-09-15 15:43:15 +09:00
Dan Balasescu
31bc067dd1
Don't store nulls to parentMap
2022-09-15 15:38:44 +09:00
Dean Herbert
5dc0d32e42
Apply NRT to hitobject lifetime related classes
2022-09-14 15:24:20 +09:00
ekrctb
c59aa57450
Remove createLifetimeEntry from HitObjectEntryManager
2022-09-14 15:19:33 +09:00
ekrctb
47539e2129
Add doc comments to HitObjectEntryManager
2022-09-14 15:19:05 +09:00
ekrctb
bde390828b
Manage entries of nested hit objects in HitObjectEntryManager
...
- Fix nested hit objects are leaked when parent hit object is edited or deleted
2022-09-14 15:19:05 +09:00
ekrctb
a9eba27129
Factor out pooling logic from Playfield
2022-09-14 15:19:05 +09:00
Dean Herbert
105aa01e7d
Update usages of RemoveInternal
2022-08-29 15:57:40 +09:00
Salman Ahmed
8f80a22ef9
Fix osu! and catch hitobjects no longer scaled to 1 by default
2022-07-19 07:00:13 +03:00
Salman Ahmed
5ddb5a3d74
Introduce HitObjectProperty<T>
2022-07-19 05:39:10 +03:00
Dean Herbert
f71f6302fd
Remove unnecessary null casts
2022-06-24 14:50:11 +09:00
Dan Balasescu
e0c82d11ab
Convert == usages to ReferenceEquals
2022-06-20 16:56:19 +09:00
Dan Balasescu
fd9902e816
Manual #nullable processing
2022-06-17 16:38:35 +09:00
Dan Balasescu
f8830c6850
Automated #nullable processing
2022-06-17 16:37:17 +09:00
Dan Balasescu
9259aa94f1
Fix Catmull slider parsing with duplicate initial point
2022-05-24 11:47:42 +09:00
Dan Balasescu
731f0960ec
Don't merge adjacent legacy Catmull segments
2022-05-18 17:16:24 +09:00
Dean Herbert
10e41d018a
Fix toggling hit animations on the editor not applying immediately
2022-05-12 17:36:35 +09:00
Dean Herbert
977e6d8a80
Add xmldoc for IDistanceSnapProvider and related properties
2022-05-05 16:25:45 +09:00
Salman Ahmed
59cf3ff50f
Move distancing methods from IPositionSnapProvider to IDistanceSnapProvider
2022-04-28 05:48:45 +03:00
Dean Herbert
c079a9cd32
Add comment regarding equality check importance in LegacyHitSampleInfo
2022-03-23 20:18:44 +09:00
Dean Herbert
997c091a8d
Revert "Remove IsLayered from LegacyHitSampleInfo comparison"
...
This reverts commit 4523393208
2022-03-23 20:15:17 +09:00
Dean Herbert
2ea9e5245c
Revert "Remove IsLayered from GetHasCode implementation"
...
This reverts commit 16ee6b5fc7
2022-03-23 20:15:13 +09:00
Dean Herbert
16ee6b5fc7
Remove IsLayered from GetHasCode implementation
2022-03-14 18:12:04 +09:00
Dean Herbert
4523393208
Remove IsLayered from LegacyHitSampleInfo comparison
...
The equality of samples is generally used to compare the sample
equality, not its full properties. For instance, we don't compare
`Volume` in the base implementation.
Having `IsLayered` here breaks actual usages of equality, ie. for
pooling purposes.
2022-03-14 17:19:48 +09:00
Dean Herbert
8676a2587c
Add the ability for HitObjects to specify auxiliary samples
2022-03-14 17:19:48 +09:00
Bartłomiej Dach
735414bc49
Replace TimeSignatures enum with struct for storage of arbitrary meter
2022-01-22 20:50:31 +01:00
Dean Herbert
eb5f15a77e
Merge pull request #16420 from bdach/slider-paste-parsing-failures-2
...
Fix pasted sliders having sample points with time at infinity
2022-01-13 23:28:49 +09:00
Joseph Madamba
5185f6010e
Fix missed identifier typos
2022-01-12 15:46:20 -08:00
Bartłomiej Dach
afce976f08
Fix oversubscription to StartTimeBindable.ValueChanged
2022-01-12 19:29:49 +01:00
Bartłomiej Dach
07fc772c24
Merge branch 'master' into slider-paste-parsing-failures-2
2022-01-12 19:06:36 +01:00
Bartłomiej Dach
80ccff9068
Remove no longer necessary guards against default control points
...
The subscription in which the guards were present was moved from
constructor to `ApplyDefaults()`, and at that point neither the sample
control point or the difficulty point can be the default point, because
there are explicit paths that overwrite those with blank points in the
same methods, prior to the subscription's registration.
The only worry would be that someone would set the default point on the
object themselves, but at that point that is most likely programmer
error anyhow.
2022-01-11 22:14:47 +01:00
Bartłomiej Dach
7a25fe79b7
Fix sample control point time being calculated before defaults applied
...
In editor contexts, the `StartTimeBindable` subscription in `HitObject`
was firing before defaults were applied, which in the case of sliders
manifested in an infinite end time. `ApplyDefaults()` also did not
always set the time of the control point to the correct value, which
matters when the beatmap is encoded.
Ensure that the control points receive the correct time values during
default application, and only register the `StartTimeBindable` change
callback after defaults have been successfully applied.
2022-01-11 21:38:59 +01:00
Bartłomiej Dach
c09f6ee052
Use slider snapping more liberally to match user expectations
...
Previously the slider path length would be snapped using the current
beat snap setting on *every* change of the slider path. As it turns out
this is unexpected behaviour in some situations (e.g. when reversing a
path, which is expected to preserve the previous duration, even though
the slider may be technically "unsnapped" at that point in time due to a
different beat snap setting being selected afterwards).
2022-01-07 16:02:04 +01:00
Dean Herbert
bb54f438aa
Merge branch 'master' into positional-sounds-strength-adjustment
2022-01-03 12:40:56 +09:00
Joseph Madamba
7de43e3aba
Fix most open compound words in identifiers being closed
2021-12-27 20:26:28 -08:00
mk-56
fd5af1fbe7
Code refactor and name changes
...
cleaned code up with Jetbrains i hope it suffices
2021-12-17 13:16:06 +01:00
mk-56
cd095b5f7d
Merge remote-tracking branch 'origin/positional-sounds-strength-adjustment' into positional-sounds-strength-adjustment
2021-11-28 14:21:26 +01:00
mk-56
9c42cc0c05
Fix
2021-11-28 14:12:39 +01:00
mk-56
9065179c52
Fix
2021-11-28 14:09:30 +01:00
mk-56
c3fb793762
Fixed the problems that were brought up and deleted the old bind logic
2021-11-28 14:06:53 +01:00
mk-56
e83115ad5e
Binding logic fix, nullification of unnecessary path
2021-11-28 03:25:11 +01:00
mk-56
eaa464e548
Initial implementation of adjustable positional hitobject audio strength
2021-11-28 02:58:08 +01:00
Dean Herbert
5c7623e68e
Merge pull request #15255 from goodtrailer/node-samples-ilist
...
Change IHasRepeats.NodeSamples to IList from List
2021-10-28 14:24:26 +09:00
Dean Herbert
add39fbd4f
Merge branch 'master' into fix-skin-layout-editor-crash
2021-10-28 06:24:24 +09:00
Dean Herbert
6944151486
Apply batch fixing of built-in types using var
2021-10-27 13:04:41 +09:00
Dean Herbert
d5b4c68d3a
Merge branch 'master' into fix-slider-path-extension-incorrectness
2021-10-26 17:36:50 +09:00
Dan Balasescu
6a6d3a5e8a
Merge pull request #15304 from peppy/fix-editor-new-beatmap-sample-change-crash
...
Fix editor crash when attempting to change sample/velocity from timeline on new beatmap
2021-10-26 17:13:56 +09:00
Dean Herbert
dae7cdc4c5
Ensure HitObject-local control points are non-default after ApplyDefaults
...
We will probably want to make this whole flow more efficient in the
future, but this should suffice for now.
2021-10-26 16:06:03 +09:00
Dean Herbert
81fee02c2b
Fix slider paths being extended even when the last two points are equal
2021-10-26 15:47:59 +09:00
Jason Won
a582976851
reversing slider maintains shape
2021-10-26 00:05:46 -04:00
goodtrailer
0affe7b79d
Remove unnecessary using
2021-10-23 02:25:20 -07:00
goodtrailer
4440b9ca11
Change IHasRepeats.NodeSamples to IList from List
2021-10-23 01:59:07 -07:00
Dean Herbert
93482414d6
Remove SkinConfiguration subclasses and allow configuration parsing for all skin types
2021-10-22 14:42:23 +09:00
smoogipoo
bc37cb6f43
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-08 18:41:17 +09:00
Dean Herbert
a92d499d7a
Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo
2021-10-01 16:55:50 +09:00
Dean Herbert
46bafb6252
Merge branch 'master' into no-more-difficulty-control-points-info
2021-09-28 13:53:56 +09:00
Dean Herbert
16e60eed56
Reduce NestedHitObject enumerator overhead
...
This was especially bad due to it allocating on any and every start time
change, even the first (see usage in `HitObject.ctor`).
2021-09-20 15:09:27 +09:00
Dean Herbert
a7ae3cc03e
Change SampleControlPoint time to use leniency in bindable changed event too
2021-09-14 16:24:55 +09:00
Dean Herbert
cd227213e6
Ensure time of HitObject related ControlPoints are kept in sync with the hitobject
2021-09-10 15:59:30 +09:00
Dean Herbert
714f55b6bc
Clone control points when copying to HitObjects
2021-09-10 14:36:39 +09:00
Dean Herbert
6894ed3426
Fix new ordering of retrieval meaning EndTime is not available in time
2021-09-03 17:11:12 +09:00
Dean Herbert
74f385bad8
Assign default control points earlier in HitObject construction
2021-09-03 17:11:12 +09:00
Dean Herbert
1aff4c2238
Ensure all hitobject level control points are populated before calling virtual defaults application
2021-09-03 17:11:12 +09:00
Dean Herbert
a3d9ab1e2e
Move approach rate to EffectControlPoint
2021-09-03 16:58:16 +09:00
Dean Herbert
b41b1e2394
Write out DifficultyControlPoints into HitObjects
2021-09-03 16:58:16 +09:00
Dean Herbert
d988aa1680
Actually serialise SampleControlPoints along with HitObjects
2021-08-31 15:14:03 +09:00
Dean Herbert
4da2dca339
Apply the default SampleControlPoint if not externally provided
...
This is mostly to handle tests for now, as generally this should be
provided by an external source in all other cases.
2021-08-30 17:21:07 +09:00
Dean Herbert
ccacf56dd8
Move to legacy namespace
2021-08-30 17:14:53 +09:00
Dean Herbert
7257aae7f2
Move samples to LegacyControlPointInfo
2021-08-30 17:14:53 +09:00
Dean Herbert
6dcd9427ac
Remove bindable usage in PathControlPoint
...
This is quite a breaking change, but I think it is beneficial due to the large amount of usage of this class.
I originally intended just to remove the allocations of the two delegates handling the `Changed` flow internally, but as nothing was really using the bindables for anything more than a general "point has changed" case, this felt like a better direction.
2021-08-26 12:33:53 +09:00
ekrctb
c63dfa21e1
Always initialize DHO transforms on LoadComplete
...
With the previous commit, the transform application is skipped when the state is already changed. But it turns out the previous commit breaks slider animation in the standard editor. This is probably due to the transforms are applied before nested hit objects are added.
2021-08-10 16:34:38 +09:00
ekrctb
f262f288fc
Fix DHO state is overwritten to Idle on LoadComplete
...
The state may already be changed before `LoadComplete` is called because DHO is already added to the draw hierarchy.
2021-08-06 19:58:46 +09:00
Dean Herbert
50a2abbe7f
Merge pull request #12683 from frenzibyte/legacy-beatmap-combo-offset
...
Apply combo offsets "colour hax" only on beatmap skins
2021-07-23 14:30:18 +09:00
Salman Ahmed
0b3b9e35ba
Also update colours once on DrawableHitObject
2021-07-23 07:32:56 +03:00
Salman Ahmed
8600a3bf5b
Replace "offset" term in combo index documentations with "index" instead
2021-07-23 07:31:03 +03:00
Salman Ahmed
523c154f15
Add ComboIndexWithOffsetsBindable and bind similar to ComboIndexBindable
2021-07-22 16:40:33 +03:00
ekrctb
cc01b9e639
Extract SliderPath reverse logic to be used in other rulesets
2021-07-22 16:14:43 +09:00
Dean Herbert
399c3b0be8
Rename property, reword xmldoc and improve readability of update code
2021-07-21 17:32:56 +09:00
Salman Ahmed
9d92b795fa
Revert making ComboOffsets legacy and define BeatmapSkinComboIndex instead
2021-07-20 14:15:43 +03:00
Salman Ahmed
554652b033
Merge branch 'refactor-combo-colour-retrieval' into legacy-beatmap-combo-offset
2021-07-20 10:11:52 +03:00
Salman Ahmed
1af230c48c
Merge branch 'master' into refactor-combo-colour-retrieval
2021-07-20 10:08:25 +03:00
ekrctb
7f432665e5
Preserve Y position of hit objects in osu!catch
2021-07-14 14:38:38 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments
2021-07-05 23:52:39 +08:00
smoogipoo
42c5a962fb
Add xmldoc remark
2021-06-18 19:27:10 +09:00
smoogipoo
36d51d5117
Don't set entry immediately
2021-06-18 19:23:37 +09:00
smoogipoo
36d2199a02
Add exception on Apply() while loading
2021-06-18 19:20:57 +09:00
ekrctb
e7954ecb60
Use property instead of backing field consistently
2021-06-17 10:31:20 +09:00
ekrctb
117e94bc94
Allow setting Entry of PoolableDrawableWithLifetime
...
It is more convenient than using the constructor because the only limited kind of expression is allowed in a base constructor call.
Also, the object initializer syntax can be used.
2021-06-16 16:00:08 +09:00
Bartłomiej Dach
296761ade5
Add missing CurrentSkin null check in DHO disposal
2021-06-11 09:18:58 +02:00
Dean Herbert
562cfe8703
Fix filename not matching type rename
2021-06-11 14:34:18 +09:00
Dean Herbert
bc3b7233ab
Show osu!taiko centre/rim colouring in editor timeline
...
Closes #13443 .
2021-06-11 14:17:30 +09:00
Dean Herbert
b8df3fff9e
Fix incorrect method referenced in xmldco
...
Co-authored-by: ekrctb <32995012+ekrctb@users.noreply.github.com>
2021-06-09 14:20:01 +09:00
Dean Herbert
62199a38a8
Add one missing obsoletion removal date
2021-06-09 14:11:50 +09:00
Dean Herbert
f41e34ae2c
Remove more obsoleted members
2021-06-09 14:10:48 +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
smoogipoo
d3d8941ec8
Make method internal
2021-06-02 11:11:41 +09:00
smoogipoo
8ee2b3a2d2
Merge branch 'master' into fix-scrolling-lifetime
2021-06-02 11:08:28 +09:00
Dan Balasescu
ac83450791
Merge pull request #13256 from ekrctb/update-lifetime-2
...
Update DHO lifetime on entry lifetime change
2021-06-02 11:07:54 +09:00
ekrctb
40949f6c1b
Simplify lifetime setter
...
Setting entry lifetime will cause `LifetimeChanged` event and `base.LifetimeStart`/`End` will be modified in the callback.
2021-06-01 14:46:43 +09:00
ekrctb
0f381f7758
Fix wrong code
2021-06-01 14:38:02 +09:00
ekrctb
86020adf64
Revert invalid code transformation
2021-06-01 14:28:23 +09:00
ekrctb
d5714e63b9
Apply code styling suggestions
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-01 13:17:30 +09:00
ekrctb
86d1ba7ef2
Remove unused IScrollingHitObject interface
2021-05-31 23:17:26 +09:00
ekrctb
56a0a24cba
Make SetInitialLifetime public
2021-05-31 15:33:28 +09:00
ekrctb
e25cca6fbe
Update drawable lifetime on entry lifetime change
2021-05-31 14:45:29 +09:00
Dan Balasescu
8c6277f0d8
Merge pull request #13235 from ekrctb/update-lifetime-1
...
Update hit object lifetime on `HitObject.DefaultsApplied`
2021-05-31 14:44:40 +09:00
ekrctb
0c101d2859
Apply comment rewording suggestion
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-05-31 13:41:49 +09:00
ekrctb
abb77b95b4
Fix comment grammar
2021-05-30 13:06:28 +09:00
ekrctb
265dfe5416
Add test case of DHO setting LifetimeStart in OnApply
2021-05-28 21:51:48 +09:00
ekrctb
43bf734816
Reset lifetime on HitObject.DefaultsApplied
2021-05-28 21:35:26 +09:00
ekrctb
1d5e8f4a91
Fix wrong/misleading comment of InitialLifetimeOffset
2021-05-28 17:19:36 +09:00
Dean Herbert
122bb05aa8
Add a mention that OnApply/OnFree is performed after ApplyDefaults
2021-05-27 15:20:35 +09:00
smoogipoo
7494ddeef4
Fix DHOs not receiving initial skin changed events
2021-05-24 14:07:40 +09:00
ekrctb
0489ae719d
Don't couple PoolableDrawableWithLifetime lifetime with its entry
...
It turns out the incompatibility with `LifetimeManagementContainer` causes more issues than anticipated.
2021-05-20 14:56:15 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry
2021-05-18 20:10:12 +09:00
Salman Ahmed
cd6d070b4a
Consider "combo offsets" as legacy logic and separate from combo information
2021-05-05 07:43:08 +03:00
Salman Ahmed
eeeb001d62
Refactor combo colour retrieval logic to request skin lookups instead
2021-05-05 07:17:27 +03:00
ekrctb
aa42cf2fc0
Fix setting lifetime during KeepAlive is ignored
2021-05-04 16:56:48 +09:00
ekrctb
36438175a0
Throw an exception if try to modify lifetime of PoolableDrawableWithLifetime without lifetime
2021-05-04 16:04:58 +09:00
Dan Balasescu
e6eea73b8b
Merge branch 'master' into basic-compose-checks
2021-04-30 23:41:46 +09:00
ekrctb
5aa522b1c2
Completely delegate DHO lifetime to Entry lifetime
...
A downside is lifetime update is not caught by LifetimeManagementContainer if used.
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
5fc731967b
Merge pull request #12592 from ekrctb/fix-entry-lifetime
...
Fix Setting DHO's lifetime doesn't update its entry lifetime
2021-04-28 01:38:19 +09:00
ekrctb
b87446a577
Simplify HitObjectLifetimeEntry logic a bit
2021-04-27 19:37:01 +09:00
Derrick Timmermans
3ea55314f2
Update osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-04-27 11:29:16 +02:00
ekrctb
3899e500d3
Adopt framework change of LifetimeEntry
...
Override SetLifetimeStart/SetLifetimeEnd separately to track individual assignment. It is necessary to ensure real lifetime is not lost when lifetime is partially updated.
2021-04-27 17:54:18 +09:00
ekrctb
c9e6ca5378
Use now-public Entry.SetLifetime method
2021-04-27 15:25:05 +09:00
ekrctb
a2c0951d94
Use overriding instead of hiding in HitObjectLifetimeEntry
...
Hidden properties are used when the type is the base class. It caused issues when `DrawableHitObject` logic is factored out to `PoolableDrawableWithLifetime` because it is using the base `LifetimeEntry`, not `HitObjectLifetimeEntry`.
2021-04-27 15:23:33 +09:00
Naxess
a3570e18dd
Add concurrent objects check
...
Here we use `IHasColumn` to support rulesets with columns, and so I moved that interface out into `osu.Game` from `osu.Game.Rulesets.Mania`.
We also use the same threshold as the unsnap check to ensure that no problems slip through. Specifically where an object is simultaneously not concurrent and not unsnapped but still on the same tick.
2021-04-26 20:17:18 +02:00
Derrick Timmermans
08a232f7fa
Add method to safely refresh DrawableHitObject transforms
2021-04-26 20:08:40 +02:00
ekrctb
6561a7c7d6
Rename DrawableObject -> PoolableDrawableWithLifetime
2021-04-26 12:06:21 +09:00
