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

Add ScalingContainer back

Browse Source 
Don't want to set DHO.Scale or DHO.Rotation because because DHO may be transformed by mods.
DHO.Size is also assigned for drawable visualizer
This commit is contained in:
ekrctb
2020-12-10 19:42:01 +09:00
parent a8e2f35b62
commit e097b6e61c
6 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
View File

@ -5,6 +5,7 @@ using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osuTK;
using osuTK.Graphics;
@ -30,11 +31,27 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
/// <summary>
/// The container internal transforms (such as scaling based on the circle size) are applied to.
/// </summary>
protected readonly Container ScalingContainer;
float IHasCatchObjectState.Scale => HitObject.Scale * ScaleFactor;
float IHasCatchObjectState.Rotation => ScalingContainer.Rotation;
protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
: base(h)
{
Origin = Anchor.Centre;
Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
AddInternal(ScalingContainer = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2)
});
}
[BackgroundDependencyLoader]
@ -47,7 +64,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
ScaleBindable.BindValueChanged(scale =>
{
Scale = new Vector2(scale.NewValue * ScaleFactor);
ScalingContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
Size = ScalingContainer.Size * ScalingContainer.Scale;
}, true);
IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());