From 67a96c830cf9a8fd2049c10da7fd98a8dbef77a4 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 5 Mar 2018 19:38:47 +0900 Subject: [PATCH 1/3] Add time attribute to CursorTrail shader Allows for applying DrawInfo alpha values --- osu.Game.Resources/Shaders/sh_CursorTrail.vs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Game.Resources/Shaders/sh_CursorTrail.vs b/osu.Game.Resources/Shaders/sh_CursorTrail.vs index d89ee55..7a5129a 100644 --- a/osu.Game.Resources/Shaders/sh_CursorTrail.vs +++ b/osu.Game.Resources/Shaders/sh_CursorTrail.vs @@ -1,6 +1,7 @@ attribute vec2 m_Position; attribute vec4 m_Colour; attribute vec2 m_TexCoord; +attribute float m_Time; varying vec2 v_DrawingPosition; varying vec2 v_MaskingPosition; @@ -23,7 +24,7 @@ void main(void) vec3 drawingPos = g_ToDrawingSpace * vec3(m_Position, 1.0); v_DrawingPosition = drawingPos.xy / drawingPos.z; - v_Colour = vec4(m_Colour.rgb, clamp(m_Colour.a - g_FadeClock, 0.0, 1.0)); + v_Colour = vec4(m_Colour.rgb, m_Colour.a * clamp(m_Time - g_FadeClock, 0.0, 1.0)); v_TexCoord = m_TexCoord; gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0); } \ No newline at end of file From b498af3fdbbc17c6284d69e2c30b885d4d3a6637 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 13 Mar 2018 13:08:17 +0900 Subject: [PATCH 2/3] Adjust cursor trail easing --- osu.Game.Resources/Shaders/sh_CursorTrail.vs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Game.Resources/Shaders/sh_CursorTrail.vs b/osu.Game.Resources/Shaders/sh_CursorTrail.vs index 7a5129a..51144f8 100644 --- a/osu.Game.Resources/Shaders/sh_CursorTrail.vs +++ b/osu.Game.Resources/Shaders/sh_CursorTrail.vs @@ -24,7 +24,8 @@ void main(void) vec3 drawingPos = g_ToDrawingSpace * vec3(m_Position, 1.0); v_DrawingPosition = drawingPos.xy / drawingPos.z; - v_Colour = vec4(m_Colour.rgb, m_Colour.a * clamp(m_Time - g_FadeClock, 0.0, 1.0)); + v_Colour = vec4(m_Colour.rgb, m_Colour.a * pow(clamp(m_Time - g_FadeClock, 0.0, 1.0), 1.7)); + v_TexCoord = m_TexCoord; gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0); } \ No newline at end of file From 4d298803f90484ec98648e0a490eec4e0a81e2de Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 16 Mar 2018 14:41:18 +0900 Subject: [PATCH 3/3] Tabs -> spaces --- osu.Game.Resources/Shaders/sh_CursorTrail.vs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game.Resources/Shaders/sh_CursorTrail.vs b/osu.Game.Resources/Shaders/sh_CursorTrail.vs index 51144f8..f23839a 100644 --- a/osu.Game.Resources/Shaders/sh_CursorTrail.vs +++ b/osu.Game.Resources/Shaders/sh_CursorTrail.vs @@ -16,16 +16,16 @@ uniform float g_FadeClock; void main(void) { - // Transform to position to masking space. - vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0); - v_MaskingPosition = maskingPos.xy / maskingPos.z; + // Transform to position to masking space. + vec3 maskingPos = g_ToMaskingSpace * vec3(m_Position, 1.0); + v_MaskingPosition = maskingPos.xy / maskingPos.z; - // Transform to position to masking space. - vec3 drawingPos = g_ToDrawingSpace * vec3(m_Position, 1.0); - v_DrawingPosition = drawingPos.xy / drawingPos.z; + // Transform to position to masking space. + vec3 drawingPos = g_ToDrawingSpace * vec3(m_Position, 1.0); + v_DrawingPosition = drawingPos.xy / drawingPos.z; v_Colour = vec4(m_Colour.rgb, m_Colour.a * pow(clamp(m_Time - g_FadeClock, 0.0, 1.0), 1.7)); - v_TexCoord = m_TexCoord; - gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0); + v_TexCoord = m_TexCoord; + gl_Position = g_ProjMatrix * vec4(m_Position, 1.0, 1.0); } \ No newline at end of file