RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Centralise and fix scaling

This commit is contained in:
Dean Herbert 2020-02-19 14:31:14 +09:00
parent ce1a57550f
commit 3eeb60f60f
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
View File

@ -2,11 +2,11 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using osuTK;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Scoring;
using osuTK;
namespace osu.Game.Rulesets.Catch.Objects.Drawable
{
@ -18,7 +18,9 @@ public abstract class PalpableCatchHitObject<TObject> : DrawableCatchHitObject<T
protected PalpableCatchHitObject(TObject hitObject)
: base(hitObject)
{
Scale = new Vector2(HitObject.Scale);
Origin = Anchor.Centre;
Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
Masking = false;
}
}

9
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
View File

@ -18,19 +18,16 @@ public class DrawableDroplet : PalpableCatchHitObject<Droplet>
public DrawableDroplet(Droplet h)
: base(h)
{
Origin = Anchor.Centre;
Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2) / 4;
Masking = false;
}
private Container scaleContainer;
protected Container ScaleContainer;
[BackgroundDependencyLoader]
private void load()
{
AddRangeInternal(new Framework.Graphics.Drawable[]
{
scaleContainer = new Container
ScaleContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Origin = Anchor.Centre,
@ -47,7 +44,7 @@ private void load()
}
});
scaleContainer.Scale = new Vector2(HitObject.Scale);
ScaleContainer.Scale = new Vector2(HitObject.Scale);
}
}
}

6
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
View File

@ -18,12 +18,6 @@ public class DrawableFruit : PalpableCatchHitObject<Fruit>
public DrawableFruit(Fruit h)
: base(h)
{
Origin = Anchor.Centre;
Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
Masking = false;
Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
}

9
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osuTK;
using osu.Framework.Allocation;
namespace osu.Game.Rulesets.Catch.Objects.Drawable
{
@ -10,7 +10,12 @@ public class DrawableTinyDroplet : DrawableDroplet
public DrawableTinyDroplet(TinyDroplet h)
: base(h)
{
Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2) / 8;
}
[BackgroundDependencyLoader]
private void load()
{
Scale /= 2;
}
}
}