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

Use sprite visualiser lines instead of shader.

Browse Source
This commit is contained in:
smoogipooo 2017-03-03 18:47:22 +09:00
parent 54993b874f
commit 890066dae4
2 changed files with 44 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-resources

@ -1 +1 @@
Subproject commit 3e6d254790e9150f2eae63140587742b7a8770eb Subproject commit 9ecb4826baff0a1a25a1c6ce445b4d1878ce7c7a

154
osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
View File

@ -9,6 +9,8 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.OpenGL; using osu.Framework.Graphics.OpenGL;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Shaders; using osu.Framework.Graphics.Shaders;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Transforms; using osu.Framework.Graphics.Transforms;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Framework.Timing; using osu.Framework.Timing;
@ -48,15 +50,14 @@ namespace osu.Game.Screens.Tournament.Components
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
PeriodOffset = offset, Offset = offset,
Period = 2 * (float)Math.PI, CycleTime = RNG.Next(10000, 12000),
CycleTime = RNG.Next(10000, 12000)
}; };
allLines.Add(newLine); allLines.Add(newLine);
Add(newLine); Add(newLine);
offset += (float)Math.PI / 6f; offset += RNG.Next(100, 5000);
} }
private void removeLine() private void removeLine()
@ -68,140 +69,65 @@ namespace osu.Game.Screens.Tournament.Components
allLines.Remove(allLines.First()); allLines.Remove(allLines.First());
} }
class VisualiserLine : Drawable class VisualiserLine : Container
{ {
/// <summary> /// <summary>
/// Width of the line strokes. /// Time offset.
/// </summary> /// </summary>
public float StrokeWidth = 1f; public float Offset;
/// <summary>
/// Height of the line strokes.
/// </summary>
public float StrokeHeight = 1f;
/// <summary>
/// Separation between strokes in the line.
/// </summary>
public float Separation = 0;
/// <summary>
/// Period offset of the line.
/// </summary>
public float PeriodOffset;
/// <summary>
/// Period of the line.
/// </summary>
public float Period;
/// <summary>
/// The time to cycle one period of the line in milliseconds.
/// </summary>
public double CycleTime; public double CycleTime;
private Shader shader; private float leftPos => -(float)((Time.Current + Offset) / CycleTime) + expiredCount;
private VisualiserLineDrawNodeSharedData visualiserLineDrawNodeSharedData => new VisualiserLineDrawNodeSharedData(); private Texture texture;
private float runningPeriodOffset; private int expiredCount = 0;
protected override void Update()
{
base.Update();
if (CycleTime != 0)
{
runningPeriodOffset += (float)(Time.Elapsed / CycleTime) * Period;
Invalidate(Invalidation.DrawNode, shallPropagate: false);
}
}
protected override DrawNode CreateDrawNode() => new VisualiserLineDrawNode();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ShaderManager shaders) private void load(TextureStore textures)
{ {
shader = shaders?.Load(VertexShaderDescriptor.Colour, @"DottedLine"); texture = textures.Get("Drawings/visualiser-line");
} }
protected override void ApplyDrawNode(DrawNode node) protected override void UpdateAfterChildren()
{ {
base.ApplyDrawNode(node); base.UpdateAfterChildren();
VisualiserLineDrawNode vNode = node as VisualiserLineDrawNode; while (Children.Count() < 3)
vNode.Shader = shader; addLine();
vNode.Shared = visualiserLineDrawNodeSharedData;
vNode.ScreenSpaceDrawQuad = ScreenSpaceDrawQuad;
vNode.Period = Period; float pos = leftPos;
vNode.PeriodOffset = PeriodOffset + runningPeriodOffset;
vNode.StrokeWidth = StrokeWidth; foreach (var c in Children)
vNode.StrokeHeight = StrokeHeight; {
vNode.Separation = Separation; if (c.Position.X < -1)
{
c.ClearTransforms();
c.Expire();
expiredCount++;
}
else
c.MoveToX(pos, 100);
pos += 1;
}
} }
class VisualiserLineDrawNodeSharedData private void addLine()
{ {
public QuadBatch<Vertex2D> QuadBatch = new QuadBatch<Vertex2D>(1, 1); Add(new Sprite()
}
class VisualiserLineDrawNode : DrawNode
{ {
public Shader Shader; Anchor = Anchor.CentreLeft,
public VisualiserLineDrawNodeSharedData Shared; Origin = Anchor.CentreLeft,
public Quad ScreenSpaceDrawQuad; RelativePositionAxes = Axes.Both,
RelativeSizeAxes = Axes.Both,
public float Period; Texture = texture,
public float PeriodOffset;
public float StrokeWidth; X = leftPos + 1
public float StrokeHeight;
public float Separation;
public override void Draw(Action<TexturedVertex2D> vertexAction)
{
base.Draw(vertexAction);
Shader.Bind();
Shader.GetUniform<Vector2>(@"g_Position").Value = ScreenSpaceDrawQuad.TopLeft;
Shader.GetUniform<Vector2>(@"g_Size").Value = ScreenSpaceDrawQuad.Size;
Shader.GetUniform<float>(@"g_Period").Value = Period;
Shader.GetUniform<float>(@"g_PeriodOffset").Value = PeriodOffset;
Shader.GetUniform<float>(@"g_StrokeWidth").Value = StrokeWidth;
Shader.GetUniform<float>(@"g_StrokeHeight").Value = StrokeHeight;
Shader.GetUniform<float>(@"g_Separation").Value = Separation;
Shared.QuadBatch.Add(new Vertex2D()
{
Position = ScreenSpaceDrawQuad.BottomLeft,
Colour = DrawInfo.Colour.BottomLeft.Linear
}); });
Shared.QuadBatch.Add(new Vertex2D()
{
Position = ScreenSpaceDrawQuad.BottomRight,
Colour = DrawInfo.Colour.BottomRight.Linear
});
Shared.QuadBatch.Add(new Vertex2D()
{
Position = ScreenSpaceDrawQuad.TopRight,
Colour = DrawInfo.Colour.TopRight.Linear
});
Shared.QuadBatch.Add(new Vertex2D()
{
Position = ScreenSpaceDrawQuad.TopLeft,
Colour = DrawInfo.Colour.TopLeft.Linear
});
Shader.Unbind();
}
} }
} }
} }