Rename Masking to ClampToDrawable

ppy · Jan 21, 2024 · 1393f52 · 1393f52
1 parent e003ecb
commit 1393f52
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/TrianglesPiece.cs
@@ -15,7 +15,7 @@ public TrianglesPiece(int? seed = null)
         {
             TriangleScale = 1.2f;
             HideAlphaDiscrepancies = false;
-            Masking = false;
+            ClampToDrawable = false;
         }
 
         protected override void Update()

diff --git a/osu.Game.Tests/Visual/Background/TestSceneTrianglesBackground.cs b/osu.Game.Tests/Visual/Background/TestSceneTrianglesBackground.cs
@@ -40,7 +40,7 @@ protected override void LoadComplete()
 
             AddSliderStep("Triangle scale", 0f, 10f, 1f, s => triangles.TriangleScale = s);
             AddSliderStep("Seed", 0, 1000, 0, s => triangles.Reset(s));
-            AddToggleStep("Masking", m => triangles.Masking = m);
+            AddToggleStep("ClampToDrawable", c => triangles.ClampToDrawable = c);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Background/TestSceneTrianglesV2Background.cs b/osu.Game.Tests/Visual/Background/TestSceneTrianglesV2Background.cs
@@ -128,7 +128,7 @@ protected override void LoadComplete()
             AddStep("White colour", () => box.Colour = triangles.Colour = maskedTriangles.Colour = Color4.White);
             AddStep("Vertical gradient", () => box.Colour = triangles.Colour = maskedTriangles.Colour = ColourInfo.GradientVertical(Color4.White, Color4.Red));
             AddStep("Horizontal gradient", () => box.Colour = triangles.Colour = maskedTriangles.Colour = ColourInfo.GradientHorizontal(Color4.White, Color4.Red));
-            AddToggleStep("Masking", m => maskedTriangles.Masking = m);
+            AddToggleStep("ClampToDrawable", c => maskedTriangles.ClampToDrawable = c);
         }
     }
 }
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -80,7 +80,7 @@ public float TriangleScale
         /// If enabled, only the portion of triangles that falls within this <see cref="Drawable"/>'s
         /// shape is drawn to the screen. Default is true.
         /// </summary>
-        public bool Masking { get; set; } = true;
+        public bool ClampToDrawable { get; set; } = true;
 
         /// <summary>
         /// Whether we should drop-off alpha values of triangles more quickly to improve
@@ -257,7 +257,7 @@ private class TrianglesDrawNode : DrawNode
 
             private IShader shader;
             private Texture texture;
-            private bool masking;
+            private bool clamp;
 
             private readonly List<TriangleParticle> parts = new List<TriangleParticle>();
             private readonly Vector2 triangleSize = new Vector2(1f, equilateral_triangle_ratio) * triangle_size;
@@ -276,7 +276,7 @@ public override void ApplyState()
                 shader = Source.shader;
                 texture = Source.texture;
                 size = Source.DrawSize;
-                masking = Source.Masking;
+                clamp = Source.ClampToDrawable;
 
                 parts.Clear();
                 parts.AddRange(Source.parts);
@@ -306,7 +306,7 @@ protected override void Draw(IRenderer renderer)
 
                     Vector2 topLeft = particle.Position - new Vector2(relativeSize.X * 0.5f, 0f);
 
-                    Quad triangleQuad = masking ? clampToDrawable(topLeft, relativeSize) : new Quad(topLeft.X, topLeft.Y, relativeSize.X, relativeSize.Y);
+                    Quad triangleQuad = clamp ? clampToDrawable(topLeft, relativeSize) : new Quad(topLeft.X, topLeft.Y, relativeSize.X, relativeSize.Y);
 
                     var drawQuad = new Quad(
                         Vector2Extensions.Transform(triangleQuad.TopLeft * size, DrawInfo.Matrix),

diff --git a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs
@@ -36,7 +36,7 @@ public partial class TrianglesV2 : Drawable
         /// If enabled, only the portion of triangles that falls within this <see cref="Drawable"/>'s
         /// shape is drawn to the screen. Default is true.
         /// </summary>
-        public bool Masking { get; set; } = true;
+        public bool ClampToDrawable { get; set; } = true;
 
         private readonly BindableFloat spawnRatio = new BindableFloat(1f);
 
@@ -193,7 +193,7 @@ private class TrianglesDrawNode : DrawNode
             private Vector2 size;
             private float thickness;
             private float texelSize;
-            private bool masking;
+            private bool clamp;
 
             public TrianglesDrawNode(TrianglesV2 source)
                 : base(source)
@@ -208,7 +208,7 @@ public override void ApplyState()
                 texture = Source.texture;
                 size = Source.DrawSize;
                 thickness = Source.Thickness;
-                masking = Source.Masking;
+                clamp = Source.ClampToDrawable;
 
                 Quad triangleQuad = new Quad(
                     Vector2Extensions.Transform(Vector2.Zero, DrawInfo.Matrix),
@@ -248,7 +248,7 @@ protected override void Draw(IRenderer renderer)
                 {
                     Vector2 topLeft = particle.Position - new Vector2(relativeSize.X * 0.5f, 0f);
 
-                    Quad triangleQuad = masking ? clampToDrawable(topLeft, relativeSize) : new Quad(topLeft.X, topLeft.Y, relativeSize.X, relativeSize.Y);
+                    Quad triangleQuad = clamp ? clampToDrawable(topLeft, relativeSize) : new Quad(topLeft.X, topLeft.Y, relativeSize.X, relativeSize.Y);
 
                     var drawQuad = new Quad(
                         Vector2Extensions.Transform(triangleQuad.TopLeft * size, DrawInfo.Matrix),

diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -150,7 +150,7 @@ public DialogButton(HoverSampleSet sampleSet = HoverSampleSet.Button)
                                             TriangleScale = 4,
                                             ColourDark = OsuColour.Gray(0.88f),
                                             Shear = new Vector2(-0.2f, 0),
-                                            Masking = false
+                                            ClampToDrawable = false
                                         },
                                     },
                                 },

diff --git a/osu.Game/Overlays/Mods/ModSelectColumn.cs b/osu.Game/Overlays/Mods/ModSelectColumn.cs
@@ -95,7 +95,7 @@ protected ModSelectColumn()
                                     Height = header_height,
                                     Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0),
                                     Velocity = 0.7f,
-                                    Masking = false
+                                    ClampToDrawable = false
                                 },
                                 headerText = new OsuTextFlowContainer(t =>
                                 {

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -109,7 +109,7 @@ private void load(BeatmapManager? manager, SongSelect? songSelect)
                     TriangleScale = 2,
                     RelativeSizeAxes = Axes.Both,
                     ColourLight = Color4Extensions.FromHex(@"3a7285"),
-                    ColourDark = Color4Extensions.FromHex(@"123744"),
+                    ColourDark = Color4Extensions.FromHex(@"123744")
                 },
                 new FillFlowContainer
                 {