h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-07 22:22:59 +08:00
Code Issues Releases Wiki Activity

Restore previous NewCombo state when adding objects

Browse Source
This commit is contained in:
Marvin Schürz 2024-10-11 23:41:57 +02:00
parent f76a2d02f6
commit 767ded4326
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osu.Game.Rulesets.Osu/Edit/PolygonGenerationPopover.cs
View File

@ -150,24 +150,40 @@ namespace osu.Game.Rulesets.Osu.Edit
insertedCircles.RemoveRange(totalPoints, insertedCircles.Count - totalPoints); insertedCircles.RemoveRange(totalPoints, insertedCircles.Count - totalPoints);
} }
bool first = true;
var newlyAdded = new List<HitCircle>(); var newlyAdded = new List<HitCircle>();
for (int i = 0; i < totalPoints; ++i) for (int i = 0; i < totalPoints; ++i)
{ {
float angle = float.DegreesToRadians(offsetAngleInput.Current.Value) + (i + 1) * (2 * float.Pi / pointInput.Current.Value); float angle = float.DegreesToRadians(offsetAngleInput.Current.Value) + (i + 1) * (2 * float.Pi / pointInput.Current.Value);
var position = OsuPlayfield.BASE_SIZE / 2 + new Vector2(polygonRadius * float.Cos(angle), polygonRadius * float.Sin(angle)); var position = OsuPlayfield.BASE_SIZE / 2 + new Vector2(polygonRadius * float.Cos(angle), polygonRadius * float.Sin(angle));
bool newCombo = i == 0 && newComboState.Value == TernaryState.True;
bool alreadyAdded = i < insertedCircles.Count; HitCircle circle;
var circle = alreadyAdded if (i < insertedCircles.Count)
? insertedCircles[i] {
: new HitCircle(); circle = insertedCircles[i];
circle.Position = position; circle.Position = position;
circle.StartTime = startTime; circle.StartTime = startTime;
circle.NewCombo = first && newComboState.Value == TernaryState.True; circle.NewCombo = newCombo;
editorBeatmap.Update(circle);
}
else
{
circle = new HitCircle
{
Position = position,
StartTime = startTime,
NewCombo = newCombo,
};
newlyAdded.Add(circle);
// TODO: probably ensure samples also follow current ternary status (not trivial)
circle.Samples.Add(circle.CreateHitSampleInfo());
}
if (position.X < 0 || position.Y < 0 || position.X > OsuPlayfield.BASE_SIZE.X || position.Y > OsuPlayfield.BASE_SIZE.Y) if (position.X < 0 || position.Y < 0 || position.X > OsuPlayfield.BASE_SIZE.X || position.Y > OsuPlayfield.BASE_SIZE.Y)
{ {
@ -177,26 +193,18 @@ namespace osu.Game.Rulesets.Osu.Edit
return; return;
} }
if (!alreadyAdded)
{
newlyAdded.Add(circle);
// TODO: probably ensure samples also follow current ternary status (not trivial)
circle.Samples.Add(circle.CreateHitSampleInfo());
}
else
{
editorBeatmap.Update(circle);
}
startTime = beatSnapProvider.SnapTime(startTime + timeSpacing); startTime = beatSnapProvider.SnapTime(startTime + timeSpacing);
first = false;
} }
var previousNewComboState = newComboState.Value;
insertedCircles.AddRange(newlyAdded); insertedCircles.AddRange(newlyAdded);
editorBeatmap.AddRange(newlyAdded); editorBeatmap.AddRange(newlyAdded);
// When adding new hitObjects, newCombo state will get reset to false when no objects are selected.
// Since this is the case when this popover is showing, we need to restore the previous newCombo state
newComboState.Value = previousNewComboState;
commitButton.Enabled.Value = true; commitButton.Enabled.Value = true;
} }