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

Optimize draw portion of cursor trail.

Browse Source
This commit is contained in:
Thomas Müller
2016-11-26 14:08:43 +01:00
parent be0cc7badc
commit 23d0e52d4f
2 changed files with 72 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

Submodule osu-framework updated: 3dbd4a3109...c0157172ef

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

@ -12,6 +12,13 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using OpenTK; using OpenTK;
using System;
using osu.Framework.Graphics.OpenGL;
using osu.Framework.Graphics.OpenGL.Buffers;
using System.Collections.Concurrent;
using OpenTK.Graphics.ES30;
using System.Collections.Generic;
using System.Diagnostics;
namespace osu.Game.Graphics.Cursor namespace osu.Game.Graphics.Cursor
{ {
@ -24,14 +31,19 @@ namespace osu.Game.Graphics.Cursor
Origin = Anchor.Centre; Origin = Anchor.Centre;
} }
protected override DrawNode CreateDrawNode() => new TrailSpriteDrawNode();
protected override void ApplyDrawNode(DrawNode node) protected override void ApplyDrawNode(DrawNode node)
{ {
base.ApplyDrawNode(node); base.ApplyDrawNode(node);
SpriteDrawNode sNode = node as SpriteDrawNode; TrailSpriteDrawNode sNode = node as TrailSpriteDrawNode;
sNode.RoundedTextureShader = sNode.TextureShader = shader; sNode.RoundedTextureShader = sNode.TextureShader = shader;
sNode.NeedsUpdate = true;
} }
public override bool IsVisible => true;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ShaderManager shaders, TextureStore textures) private void load(ShaderManager shaders, TextureStore textures)
{ {
@ -40,6 +52,11 @@ namespace osu.Game.Graphics.Cursor
} }
} }
class TrailSpriteDrawNode : SpriteDrawNode
{
public bool NeedsUpdate;
}
class CursorTrail : Container<TrailSprite> class CursorTrail : Container<TrailSprite>
{ {
public override bool Contains(Vector2 screenSpacePos) => true; public override bool Contains(Vector2 screenSpacePos) => true;
@ -53,7 +70,8 @@ namespace osu.Game.Graphics.Cursor
private double timeOffset; private double timeOffset;
private float time; private float time;
TrailDrawNodeSharedData trailDrawNodeSharedData = new TrailDrawNodeSharedData();
const int MAX_SPRITES = 2048; const int MAX_SPRITES = 2048;
Vector2? lastPosition; Vector2? lastPosition;
@ -67,6 +85,7 @@ namespace osu.Game.Graphics.Cursor
TrailDrawNode tNode = node as TrailDrawNode; TrailDrawNode tNode = node as TrailDrawNode;
tNode.Shader = shader; tNode.Shader = shader;
tNode.Time = time; tNode.Time = time;
tNode.Shared = trailDrawNodeSharedData;
} }
public CursorTrail() public CursorTrail()
@ -87,7 +106,7 @@ namespace osu.Game.Graphics.Cursor
{ {
base.Update(); base.Update();
Invalidate(Invalidation.DrawNode); Invalidate(Invalidation.DrawNode, shallPropagate: false);
int fadeClockResetThreshold = 1000000; int fadeClockResetThreshold = 1000000;
@ -140,15 +159,62 @@ namespace osu.Game.Graphics.Cursor
currentIndex = (currentIndex + 1) % MAX_SPRITES; currentIndex = (currentIndex + 1) % MAX_SPRITES;
} }
public class TrailDrawNodeSharedData
{
public VertexBuffer<TexturedVertex2D> VertexBuffer;
}
class TrailDrawNode : ContainerDrawNode class TrailDrawNode : ContainerDrawNode
{ {
public new Shader Shader; public new Shader Shader;
public float Time; public float Time;
public TrailDrawNodeSharedData Shared;
public override void Draw(IVertexBatch vertexBatch) public override void Draw(Action<TexturedVertex2D> vertexAction)
{ {
if (Shared.VertexBuffer == null)
Shared.VertexBuffer = new QuadVertexBuffer<TexturedVertex2D>(MAX_SPRITES, BufferUsageHint.DynamicDraw);
Shader.GetUniform<float>("g_FadeClock").Value = Time; Shader.GetUniform<float>("g_FadeClock").Value = Time;
base.Draw(vertexBatch);
int updateStart = -1, updateEnd = 0;
int test = 0;
for (int i = 0; i < Children.Count; ++i)
{
TrailSpriteDrawNode tNode = Children[i] as TrailSpriteDrawNode;
if (tNode.NeedsUpdate)
{
if (updateStart == -1)
updateStart = i;
updateEnd = i + 1;
int start = i * 4;
int end = start;
tNode.Draw(delegate (TexturedVertex2D v)
{
Shared.VertexBuffer.Vertices[end++] = v;
});
tNode.NeedsUpdate = false;
}
else if (updateStart != -1)
{
Shared.VertexBuffer.UpdateRange(updateStart * 4, updateEnd * 4);
updateStart = -1;
}
}
// Update all remaining vertices that have been changed.
if (updateStart != -1)
Shared.VertexBuffer.UpdateRange(updateStart * 4, updateEnd * 4);
SpriteDrawNode sNode = Children[0] as SpriteDrawNode;
sNode.Texture.TextureGL.Bind();
sNode.TextureShader.Bind();
Shared.VertexBuffer.Draw();
sNode.TextureShader.Unbind();
} }
} }
} }