h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 03:02:54 +08:00
Code Issues Releases Wiki Activity

dont rotate scale when in selection origin mode

Browse Source
This commit is contained in:
OliBomby 2024-07-14 17:03:17 +02:00
parent 58eb7f6fe1
commit 7a319a6d74
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Osu/Edit/PreciseScalePopover.cs
View File

@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Edit
scaleInfo.BindValueChanged(scale => scaleInfo.BindValueChanged(scale =>
{ {
var newScale = new Vector2(scale.NewValue.Scale, scale.NewValue.Scale); var newScale = new Vector2(scale.NewValue.Scale, scale.NewValue.Scale);
scaleHandler.Update(newScale, getOriginPosition(scale.NewValue), getAdjustAxis(scale.NewValue), gridToolbox.GridLinesRotation.Value); scaleHandler.Update(newScale, getOriginPosition(scale.NewValue), getAdjustAxis(scale.NewValue), getRotation(scale.NewValue));
}); });
} }
@ -164,7 +164,7 @@ namespace osu.Game.Rulesets.Osu.Edit
return; return;
const float max_scale = 10; const float max_scale = 10;
var scale = scaleHandler.ClampScaleToPlayfieldBounds(new Vector2(max_scale), getOriginPosition(scaleInfo.Value), getAdjustAxis(scaleInfo.Value), gridToolbox.GridLinesRotation.Value); var scale = scaleHandler.ClampScaleToPlayfieldBounds(new Vector2(max_scale), getOriginPosition(scaleInfo.Value), getAdjustAxis(scaleInfo.Value), getRotation(scaleInfo.Value));
if (!scaleInfo.Value.XAxis) if (!scaleInfo.Value.XAxis)
scale.X = max_scale; scale.X = max_scale;
@ -185,6 +185,8 @@ namespace osu.Game.Rulesets.Osu.Edit
private Axes getAdjustAxis(PreciseScaleInfo scale) => scale.XAxis ? scale.YAxis ? Axes.Both : Axes.X : Axes.Y; private Axes getAdjustAxis(PreciseScaleInfo scale) => scale.XAxis ? scale.YAxis ? Axes.Both : Axes.X : Axes.Y;
private float getRotation(PreciseScaleInfo scale) => scale.Origin == ScaleOrigin.PlayfieldCentre ? gridToolbox.GridLinesRotation.Value : 0;
private void setAxis(bool x, bool y) private void setAxis(bool x, bool y)
{ {
scaleInfo.Value = scaleInfo.Value with { XAxis = x, YAxis = y }; scaleInfo.Value = scaleInfo.Value with { XAxis = x, YAxis = y };