h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #200 from Tom94/fix-triangles

Browse Source 
Fix incorrect BeatmapPanel border caused by triangles.
This commit is contained in:
Dean Herbert 2016-11-28 10:52:52 +09:00 committed by GitHub
commit 4ef0b8ca47
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
View File

@ -57,6 +57,10 @@ namespace osu.Game.Beatmaps.Drawables
},
new Triangles
{
// The border is drawn in the shader of the children. Being additive, triangles would over-emphasize
// the border wherever they cross it, and thus they get their own masking container without a border.
Masking = true,
CornerRadius = Content.CornerRadius,
RelativeSizeAxes = Axes.Both,
BlendingMode = BlendingMode.Additive,
Colour = deselectedColour,

14
osu.Game/Graphics/Cursor/CursorTrail.cs
View File

@ -22,23 +22,23 @@ namespace osu.Game.Graphics.Cursor
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool HandleInput => true;
int currentIndex;
private int currentIndex;
Shader shader;
Texture texture;
private Shader shader;
private Texture texture;
Vector2 size => texture.Size * Scale;
private Vector2 size => texture.Size * Scale;
private double timeOffset;
private float time;
TrailDrawNodeSharedData trailDrawNodeSharedData = new TrailDrawNodeSharedData();
const int MAX_SPRITES = 2048;
private TrailDrawNodeSharedData trailDrawNodeSharedData = new TrailDrawNodeSharedData();
private const int MAX_SPRITES = 2048;
private TrailPart[] parts = new TrailPart[MAX_SPRITES];
Vector2? lastPosition;
private Vector2? lastPosition;
protected override DrawNode CreateDrawNode() => new TrailDrawNode();