RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update with more framework changes.

Browse Source
This commit is contained in:
smoogipooo 2017-06-06 15:52:35 +09:00
parent d2ced2ea79
commit e3d10fc4d3
6 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 150c80560480215b1081228b9ef757c21f24a32c
Subproject commit 00e48bcd31b7debda89bbcf62927706c43eba644

4
osu.Desktop.VisualTests/Tests/TestCaseManiaHitObjects.cs
View File

@ -41,7 +41,7 @@ namespace osu.Desktop.VisualTests.Tests
{
Name = "Timing section",
RelativeSizeAxes = Axes.Both,
RelativeCoordinateSpace = new RectangleF(0, 0, 1, 10000),
RelativeChildSize = new Vector2(1, 10000),
Children = new[]
{
new DrawableNote(new Note { StartTime = 5000 }) { AccentColour = Color4.Red },
@ -63,7 +63,7 @@ namespace osu.Desktop.VisualTests.Tests
{
Name = "Timing section",
RelativeSizeAxes = Axes.Both,
RelativeCoordinateSpace = new RectangleF(0, 0, 1, 10000),
RelativeChildSize = new Vector2(1, 10000),
Children = new[]
{
new DrawableHoldNote(new HoldNote

2
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
tickContainer = new Container<DrawableHoldNoteTick>
{
RelativeSizeAxes = Axes.Both,
RelativeCoordinateSpace = new RectangleF(0, 0, 1, (float)HitObject.Duration)
RelativeChildSize = new Vector2(1, (float)HitObject.Duration)
},
head = new DrawableHeadNote(this, key)
{

4
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableGravityTimingChange.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
// The gravity-adjusted start position
float startY = (float)computeGravityTime(TimingChange.Time);
// The gravity-adjusted end position
float endY = (float)computeGravityTime(TimingChange.Time + Content.RelativeCoordinateSpace.Height);
float endY = (float)computeGravityTime(TimingChange.Time + Content.RelativeChildSize.Y);
Content.Y = startY;
Content.Height = endY - startY;
@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
/// <summary>
/// The time spanned by this container.
/// </summary>
private double timeSpan => RelativeCoordinateSpace.Height;
private double timeSpan => RelativeChildSize.Y;
/// <summary>
/// The acceleration due to "gravity" of the content of this container.

2
osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
// This is very naive and can be improved, but is adequate for now
LifetimeStart = TimingChange.Time - parent.TimeSpan.Y;
LifetimeEnd = TimingChange.Time + Content.RelativeCoordinateSpace.Height * 2;
LifetimeEnd = TimingChange.Time + Content.RelativeChildSize.Y * 2;
}
}
}

19
osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Timing.Drawables
{
RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Both,
RelativeCoordinateSpace = new RectangleF((scrollingAxes & Axes.X) > 0 ? (float)TimingChange.Time : 0, (scrollingAxes & Axes.Y) > 0 ? (float)TimingChange.Time : 0, 1, 1)
RelativeChildOffset = new Vector2((scrollingAxes & Axes.X) > 0 ? (float)TimingChange.Time : 0, (scrollingAxes & Axes.Y) > 0 ? (float)TimingChange.Time : 0)
});
}
@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Timing.Drawables
float speedAdjustedSize = (float)(1000 / TimingChange.BeatLength / TimingChange.SpeedMultiplier);
Size = new Vector2((scrollingAxes & Axes.X) > 0 ? speedAdjustedSize : 1, (scrollingAxes & Axes.Y) > 0 ? speedAdjustedSize : 1);
RelativeCoordinateSpace = new RectangleF(0, 0, (scrollingAxes & Axes.X) > 0 ? parent.TimeSpan.X : 1, (scrollingAxes & Axes.Y) > 0 ? parent.TimeSpan.Y : 1);
RelativeChildSize = new Vector2((scrollingAxes & Axes.X) > 0 ? parent.TimeSpan.X : 1, (scrollingAxes & Axes.Y) > 0 ? parent.TimeSpan.Y : 1);
}
/// <summary>
@ -120,20 +120,11 @@ namespace osu.Game.Rulesets.Timing.Drawables
if (!Children.Any())
return;
float width = Children.Select(child => child.X + child.Width).Max() - RelativePositionOffset.X;
float height = Children.Select(child => child.Y + child.Height).Max() - RelativePositionOffset.Y;
float width = Children.Select(child => child.X + child.Width).Max() - RelativeChildOffset.X;
float height = Children.Select(child => child.Y + child.Height).Max() - RelativeChildOffset.Y;
Size = new Vector2((autoSizingAxes & Axes.X) > 0 ? width : Size.X, (autoSizingAxes & Axes.Y) > 0 ? height : Size.Y);
var space = RelativeCoordinateSpace;
if ((autoSizingAxes & Axes.X) > 0)
space.Width = width;
if ((autoSizingAxes & Axes.Y) > 0)
space.Height = height;
RelativeCoordinateSpace = space;
RelativeChildSize = new Vector2((autoSizingAxes & Axes.X) > 0 ? width : 1, (autoSizingAxes & Axes.Y) > 0 ? height : 1);
});
}
}