sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-19 20:47:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust with shader changes

Browse Source
This commit is contained in:
smoogipoo 2019-03-07 18:30:18 +09:00
parent e430b8a640
commit 04d756524d
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
{ {
private int currentIndex; private int currentIndex;
private Shader shader; private IShader shader;
private Texture texture; private Texture texture;
private Vector2 size => texture.Size * Scale; private Vector2 size => texture.Size * Scale;
@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ShaderManager shaders, TextureStore textures) private void load(ShaderManager shaders, TextureStore textures)
{ {
shader = shaders?.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE); shader = shaders.Load(@"CursorTrail", FragmentShaderDescriptor.TEXTURE);
texture = textures.Get(@"Cursor/cursortrail"); texture = textures.Get(@"Cursor/cursortrail");
Scale = new Vector2(1 / texture.ScaleAdjust); Scale = new Vector2(1 / texture.ScaleAdjust);
} }
@ -167,7 +167,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
private class TrailDrawNode : DrawNode private class TrailDrawNode : DrawNode
{ {
public Shader Shader; public IShader Shader;
public Texture Texture; public Texture Texture;
public float Time; public float Time;

6
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Graphics.Backgrounds
private readonly SortedList<TriangleParticle> parts = new SortedList<TriangleParticle>(Comparer<TriangleParticle>.Default); private readonly SortedList<TriangleParticle> parts = new SortedList<TriangleParticle>(Comparer<TriangleParticle>.Default);
private Shader shader; private IShader shader;
private readonly Texture texture; private readonly Texture texture;
public Triangles() public Triangles()
@ -75,7 +75,7 @@ namespace osu.Game.Graphics.Backgrounds
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ShaderManager shaders) private void load(ShaderManager shaders)
{ {
shader = shaders?.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED); shader = shaders.Load(VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED);
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -196,7 +196,7 @@ namespace osu.Game.Graphics.Backgrounds
private class TrianglesDrawNode : DrawNode private class TrianglesDrawNode : DrawNode
{ {
public Shader Shader; public IShader Shader;
public Texture Texture; public Texture Texture;
public readonly List<TriangleParticle> Parts = new List<TriangleParticle>(); public readonly List<TriangleParticle> Parts = new List<TriangleParticle>();

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

@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Mods
public abstract class Flashlight : Drawable public abstract class Flashlight : Drawable
{ {
internal BindableInt Combo; internal BindableInt Combo;
private Shader shader; private IShader shader;
protected override DrawNode CreateDrawNode() => new FlashlightDrawNode(); protected override DrawNode CreateDrawNode() => new FlashlightDrawNode();
@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Mods
private class FlashlightDrawNode : DrawNode private class FlashlightDrawNode : DrawNode
{ {
public Shader Shader; public IShader Shader;
public Quad ScreenSpaceDrawQuad; public Quad ScreenSpaceDrawQuad;
public Vector2 FlashlightPosition; public Vector2 FlashlightPosition;
public Vector2 FlashlightSize; public Vector2 FlashlightSize;

4
osu.Game/Screens/Loader.cs
View File

@ -89,7 +89,7 @@ namespace osu.Game.Screens
/// </summary> /// </summary>
public class ShaderPrecompiler : Drawable public class ShaderPrecompiler : Drawable
{ {
private readonly List<Shader> loadTargets = new List<Shader>(); private readonly List<IShader> loadTargets = new List<IShader>();
public bool FinishedCompiling { get; private set; } public bool FinishedCompiling { get; private set; }
@ -106,7 +106,7 @@ namespace osu.Game.Screens
loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE)); loadTargets.Add(manager.Load(VertexShaderDescriptor.TEXTURE_3, FragmentShaderDescriptor.TEXTURE));
} }
protected virtual bool AllLoaded => loadTargets.All(s => s.Loaded); protected virtual bool AllLoaded => loadTargets.All(s => s.IsLoaded);
protected override void Update() protected override void Update()
{ {

4
osu.Game/Screens/Menu/LogoVisualisation.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Screens.Menu
private readonly float[] frequencyAmplitudes = new float[256]; private readonly float[] frequencyAmplitudes = new float[256];
private Shader shader; private IShader shader;
private readonly Texture texture; private readonly Texture texture;
public LogoVisualisation() public LogoVisualisation()
@ -146,7 +146,7 @@ namespace osu.Game.Screens.Menu
private class VisualisationDrawNode : DrawNode private class VisualisationDrawNode : DrawNode
{ {
public Shader Shader; public IShader Shader;
public Texture Texture; public Texture Texture;
//Asuming the logo is a circle, we don't need a second dimension. //Asuming the logo is a circle, we don't need a second dimension.