h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Code Issues Releases Wiki Activity

CI fixes.

Browse Source
This commit is contained in:
smoogipooo 2017-06-02 18:19:21 +09:00
parent 97dd80b874
commit 1d3f5d8649
8 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit f9f962ac735c5fc83e9e6d510d54359b8062ad73
Subproject commit 8ba3f5079e904f72e02b02909b681b5d64c81466

1
osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Testing;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Mania.UI;
using System;
using System.Collections.Generic;
using OpenTK;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects;

15
osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
View File

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.UI;
@ -12,6 +11,7 @@ using osu.Framework.Lists;
using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.MathUtils;
using osu.Game.Graphics;
using osu.Game.Rulesets.Objects;
namespace osu.Game.Rulesets.Mania.Mods
{
@ -30,11 +30,15 @@ namespace osu.Game.Rulesets.Mania.Mods
maniaHitRenderer.HitObjectTimingChanges = new Dictionary<int, List<DrawableTimingChange>>();
maniaHitRenderer.BarlineTimingChanges = new List<DrawableTimingChange>();
foreach (ManiaHitObject obj in maniaHitRenderer.Objects)
foreach (HitObject obj in maniaHitRenderer.Objects)
{
var maniaObject = obj as ManiaHitObject;
if (maniaObject == null)
continue;
List<DrawableTimingChange> timingChanges;
if (!maniaHitRenderer.HitObjectTimingChanges.TryGetValue(obj.Column, out timingChanges))
maniaHitRenderer.HitObjectTimingChanges[obj.Column] = timingChanges = new List<DrawableTimingChange>();
if (!maniaHitRenderer.HitObjectTimingChanges.TryGetValue(maniaObject.Column, out timingChanges))
maniaHitRenderer.HitObjectTimingChanges[maniaObject.Column] = timingChanges = new List<DrawableTimingChange>();
timingChanges.Add(new DrawableGravityTimingChange(new TimingChange
{
@ -53,8 +57,7 @@ namespace osu.Game.Rulesets.Mania.Mods
// Stop on the beat before the next timing point, or if there is no next timing point stop slightly past the last object
double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time - point.BeatLength : lastObjectTime + point.BeatLength * (int)point.TimeSignature;
int index = 0;
for (double t = timingPoints[i].Time; Precision.DefinitelyBigger(endTime, t); t += point.BeatLength, index++)
for (double t = timingPoints[i].Time; Precision.DefinitelyBigger(endTime, t); t += point.BeatLength)
{
maniaHitRenderer.BarlineTimingChanges.Add(new DrawableGravityTimingChange(new TimingChange
{

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

@ -1,9 +1,3 @@
using System;
using osu.Framework.Graphics;
using osu.Framework.MathUtils;
using osu.Framework.Physics;
using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Mania.Timing.Drawables
{
public class DrawableGravityTimingChange : DrawableTimingChange

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

@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
protected override Container<DrawableHitObject> Content => content;
private readonly Container<DrawableHitObject> content;
public DrawableTimingChange(TimingChange timingChange)
protected DrawableTimingChange(TimingChange timingChange)
{
TimingChange = timingChange;

3
osu.Game.Rulesets.Mania/Timing/TimingChangeContainer.cs
View File

@ -6,9 +6,6 @@ using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using OpenTK;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Mania.Timing.Drawables;

3
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -12,10 +12,7 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Timing;
using System.Collections.Generic;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Judgements;
using System;
using osu.Framework.Configuration;
using osu.Game.Rulesets.Mania.Timing.Drawables;

7
osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
View File

@ -32,7 +32,12 @@ namespace osu.Game.Rulesets.Mania.UI
public class ManiaHitRenderer : HitRenderer<ManiaHitObject, ManiaJudgement>
{
private int? columns;
public int Columns => columns ?? (int)Math.Round(Beatmap.BeatmapInfo.Difficulty.CircleSize);
public int Columns
{
get { return columns ?? (int)Math.Round(Beatmap.BeatmapInfo.Difficulty.CircleSize); }
set { columns = value; }
}
public Dictionary<int, List<DrawableTimingChange>> HitObjectTimingChanges;
public List<DrawableTimingChange> BarlineTimingChanges;