From 9ecb4826baff0a1a25a1c6ce445b4d1878ce7c7a Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Fri, 3 Mar 2017 18:46:14 +0900 Subject: [PATCH] Replace shader with sprite lines. --- osu.Game.Resources/Shaders/sh_DottedLine.fs | 40 ------------------ .../Textures/Drawings/visualiser-line.png | Bin 0 -> 5616 bytes osu.Game.Resources/osu.Game.Resources.csproj | 4 +- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 osu.Game.Resources/Shaders/sh_DottedLine.fs create mode 100644 osu.Game.Resources/Textures/Drawings/visualiser-line.png diff --git a/osu.Game.Resources/Shaders/sh_DottedLine.fs b/osu.Game.Resources/Shaders/sh_DottedLine.fs deleted file mode 100644 index 099b2d1..0000000 --- a/osu.Game.Resources/Shaders/sh_DottedLine.fs +++ /dev/null @@ -1,40 +0,0 @@ -#ifdef GL_ES - precision mediump float; -#endif - -#include "sh_Utils.h" - -varying vec4 v_Colour; - -uniform vec2 g_Position; -uniform vec2 g_Size; - -uniform float g_Period; -uniform float g_PeriodOffset; - -uniform float g_StrokeWidth; -uniform float g_StrokeHeight; -uniform float g_Separation; - -void main(void) -{ - float xVisible = mod(gl_FragCoord.x, g_StrokeWidth + g_Separation); - - if (xVisible > g_StrokeWidth) - { - gl_FragColor = vec4(0.0); - return; - } - - // Normalized - float normalizedY = gl_FragCoord.y - g_Position.y; - float yVisible = abs(normalizedY - ((g_Size.y / 2.0 - g_StrokeHeight / 2.0) * sin(g_Period / g_Size.x * gl_FragCoord.x + g_PeriodOffset) + g_Size.y / 2.0)); - - if (yVisible > g_StrokeHeight / 2.0) - { - gl_FragColor = vec4(0.0); - return; - } - - gl_FragColor = toSRGB(v_Colour); -} \ No newline at end of file diff --git a/osu.Game.Resources/Textures/Drawings/visualiser-line.png b/osu.Game.Resources/Textures/Drawings/visualiser-line.png new file mode 100644 index 0000000000000000000000000000000000000000..a611df8614b5a87f834b2fb48d7930518f371bfa GIT binary patch literal 5616 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 BQ%?W@ literal 0 HcmV?d00001 diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj index cc416d7..e4dbf54 100644 --- a/osu.Game.Resources/osu.Game.Resources.csproj +++ b/osu.Game.Resources/osu.Game.Resources.csproj @@ -589,10 +589,10 @@ - + - +