sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move combo colouring to test case

Browse Source
This commit is contained in:
Dean Herbert
2018-01-03 20:52:01 +09:00
parent 4ee845fea8
commit 9bde8d3da1
2 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.MathUtils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -16,36 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects
public float X { get; set; } public float X { get; set; }
public Color4 ComboColour public Color4 ComboColour { get; set; }
{
get
{
switch (VisualRepresentation)
{
default:
case FruitVisualRepresentation.Triforce:
return new Color4(17, 136, 170, 255);
case FruitVisualRepresentation.Grape:
return new Color4(204, 102, 0, 255);
case FruitVisualRepresentation.DPad:
return new Color4(121, 9, 13, 255);
case FruitVisualRepresentation.Pineapple:
return new Color4(102, 136, 0, 255);
case FruitVisualRepresentation.Banana:
switch (RNG.Next(0, 3))
{
default:
return new Color4(255, 240, 0, 255);
case 1:
return new Color4(255, 192, 0, 255);
case 2:
return new Color4(214, 221, 28, 255);
}
}
}
set { }
}
public int IndexInBeatmap { get; set; } public int IndexInBeatmap { get; set; }

59
osu.Game.Rulesets.Catch/Tests/TestCaseFruitObjects.cs
View File

@ -5,11 +5,13 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.MathUtils;
using osu.Game.Rulesets.Catch.Objects; using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.Objects.Drawable; using osu.Game.Rulesets.Catch.Objects.Drawable;
using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces; using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
using osu.Game.Tests.Visual; using osu.Game.Tests.Visual;
using OpenTK; using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Catch.Tests namespace osu.Game.Rulesets.Catch.Tests
{ {
@ -49,19 +51,52 @@ namespace osu.Game.Rulesets.Catch.Tests
}); });
} }
private DrawableFruit createDrawable(int index) => new DrawableFruit(new Fruit private DrawableFruit createDrawable(int index)
{ {
StartTime = 1000000000000, var fruit = new Fruit
IndexInBeatmap = index, {
Scale = 1.5f, StartTime = 1000000000000,
}) IndexInBeatmap = index,
Scale = 1.5f,
};
fruit.ComboColour = colourForRrepesentation(fruit.VisualRepresentation);
return new DrawableFruit(fruit)
{
Anchor = Anchor.Centre,
RelativePositionAxes = Axes.Both,
Position = Vector2.Zero,
Alpha = 1,
LifetimeStart = double.NegativeInfinity,
LifetimeEnd = double.PositiveInfinity,
};
}
private Color4 colourForRrepesentation(FruitVisualRepresentation representation)
{ {
Anchor = Anchor.Centre, switch (representation)
RelativePositionAxes = Axes.Both, {
Position = Vector2.Zero, default:
Alpha = 1, case FruitVisualRepresentation.Triforce:
LifetimeStart = double.NegativeInfinity, return new Color4(17, 136, 170, 255);
LifetimeEnd = double.PositiveInfinity, case FruitVisualRepresentation.Grape:
}; return new Color4(204, 102, 0, 255);
case FruitVisualRepresentation.DPad:
return new Color4(121, 9, 13, 255);
case FruitVisualRepresentation.Pineapple:
return new Color4(102, 136, 0, 255);
case FruitVisualRepresentation.Banana:
switch (RNG.Next(0, 3))
{
default:
return new Color4(255, 240, 0, 255);
case 1:
return new Color4(255, 192, 0, 255);
case 2:
return new Color4(214, 221, 28, 255);
}
}
}
} }
} }