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

split shader, remove unnecessary clutter and fix some bugs

Browse Source
This commit is contained in:
jorolf
2018-11-15 00:33:13 +01:00
parent 023924396d
commit 7d2958b7b0
6 changed files with 70 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
osu.Game/Rulesets/Mods/ModFlashlight.cs
View File

@ -55,7 +55,6 @@ namespace osu.Game.Rulesets.Mods
{
internal BindableInt Combo;
private Shader shader;
protected readonly FlashlightUniformWrapper MousePosWrapper = new FlashlightUniformWrapper();
protected override DrawNode CreateDrawNode() => new FlashlightDrawNode();
@ -71,13 +70,14 @@ namespace osu.Game.Rulesets.Mods
flashNode.Shader = shader;
flashNode.ScreenSpaceDrawQuad = ScreenSpaceDrawQuad;
flashNode.MousePosWrapper = MousePosWrapper;
flashNode.MousePosWrapper.FlashlightPosition = Vector2Extensions.Transform(FlashlightPosition, DrawInfo.Matrix);
flashNode.MousePosWrapper.FlashlightSize = Vector2Extensions.Transform(FlashlightSize, DrawInfo.Matrix);
}
[BackgroundDependencyLoader]
private void load(ShaderManager shaderManager)
{
shader = shaderManager.Load("PositionAndColour", "Flashlight");
shader = shaderManager.Load("PositionAndColour", FragmentShader);
}
protected override void LoadComplete()
@ -90,27 +90,48 @@ namespace osu.Game.Rulesets.Mods
foreach (var breakPeriod in Breaks)
{
if (breakPeriod.Duration < FLASHLIGHT_FADE_DURATION * 2) continue;
this.Delay(breakPeriod.StartTime + FLASHLIGHT_FADE_DURATION).FadeOutFromOne(FLASHLIGHT_FADE_DURATION);
this.Delay(breakPeriod.EndTime - FLASHLIGHT_FADE_DURATION).FadeInFromZero(FLASHLIGHT_FADE_DURATION);
}
}
protected abstract void OnComboChange(int newCombo);
protected abstract string FragmentShader { get; }
private Vector2 flashlightPosition;
protected Vector2 FlashlightPosition
{
get => flashlightPosition;
set
{
if (flashlightPosition == value) return;
flashlightPosition = value;
Invalidate(Invalidation.DrawNode);
}
}
private Vector2 flashlightSize;
protected Vector2 FlashlightSize
{
get => flashlightSize;
set
{
if (flashlightSize == value) return;
flashlightSize = value;
Invalidate(Invalidation.DrawNode);
}
}
}
public class FlashlightUniformWrapper
public struct FlashlightUniformWrapper
{
public bool Rectangular;
public bool RectangularChanged = true;
public Vector2 FlashlightPosition;
public bool FlashlightPositionChanged = true;
public float CircularFlashlightSize;
public bool CircularFlashlightSizeChanged = true;
public Vector2 RectangularFlashlightSize;
public bool RectangularFlashlightSizeChanged = true;
public Vector2 FlashlightSize;
}
private class FlashlightDrawNode : DrawNode
@ -125,29 +146,8 @@ namespace osu.Game.Rulesets.Mods
Shader.Bind();
if (MousePosWrapper.RectangularChanged)
{
Shader.GetUniform<bool>("rectangular").UpdateValue(ref MousePosWrapper.Rectangular);
MousePosWrapper.RectangularChanged = false;
}
if (MousePosWrapper.FlashlightPositionChanged)
{
Shader.GetUniform<Vector2>("flashlightPos").UpdateValue(ref MousePosWrapper.FlashlightPosition);
MousePosWrapper.FlashlightPositionChanged = false;
}
if (MousePosWrapper.CircularFlashlightSizeChanged)
{
Shader.GetUniform<float>("circularFlashlightSize").UpdateValue(ref MousePosWrapper.CircularFlashlightSize);
MousePosWrapper.CircularFlashlightSizeChanged = false;
}
if (MousePosWrapper.RectangularFlashlightSizeChanged)
{
Shader.GetUniform<Vector2>("rectangularFlashlightSize").UpdateValue(ref MousePosWrapper.RectangularFlashlightSize);
MousePosWrapper.RectangularFlashlightSizeChanged = false;
}
Shader.GetUniform<Vector2>("flashlightPos").UpdateValue(ref MousePosWrapper.FlashlightPosition);
Shader.GetUniform<Vector2>("flashlightSize").UpdateValue(ref MousePosWrapper.FlashlightSize);
Texture.WhitePixel.DrawQuad(ScreenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: vertexAction);