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

Rename classes to better emphasise that Smoke is a single trail segment

Browse Source
This commit is contained in:
Dean Herbert 2022-10-05 18:27:51 +09:00
parent 04abb2ce8f
commit 1e5ff2679b
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/OsuSkinComponents.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu
SliderBall, SliderBall,
SliderBody, SliderBody,
SpinnerBody, SpinnerBody,
Smoke, SmokeTrail,
ApproachCircle, ApproachCircle,
} }
} }

2
osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs → osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmokeSegment.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.Textures;
namespace osu.Game.Rulesets.Osu.Skinning.Default namespace osu.Game.Rulesets.Osu.Skinning.Default
{ {
public class DefaultSmoke : Smoke public class DefaultSmokeSegment : SmokeSegment
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)

2
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs → osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmokeSegment.cs
View File

@ -6,7 +6,7 @@ using osu.Game.Skinning;
namespace osu.Game.Rulesets.Osu.Skinning.Legacy namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{ {
public class LegacySmoke : Smoke public class LegacySmokeSegment : SmokeSegment
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ISkinSource skin) private void load(ISkinSource skin)

4
osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
View File

@ -106,9 +106,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
return null; return null;
case OsuSkinComponents.Smoke: case OsuSkinComponents.SmokeTrail:
if (GetTexture("cursor-smoke") != null) if (GetTexture("cursor-smoke") != null)
return new LegacySmoke(); return new LegacySmokeSegment();
return null; return null;

4
osu.Game.Rulesets.Osu/Skinning/Smoke.cs → osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
View File

@ -20,7 +20,7 @@ using osuTK.Graphics;
namespace osu.Game.Rulesets.Osu.Skinning namespace osu.Game.Rulesets.Osu.Skinning
{ {
public abstract class Smoke : Drawable, ITexturedShaderDrawable public abstract class SmokeSegment : Drawable, ITexturedShaderDrawable
{ {
public IShader? TextureShader { get; private set; } public IShader? TextureShader { get; private set; }
public IShader? RoundedTextureShader { get; private set; } public IShader? RoundedTextureShader { get; private set; }
@ -214,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
protected class SmokeDrawNode : TexturedShaderDrawNode protected class SmokeDrawNode : TexturedShaderDrawNode
{ {
protected new Smoke Source => (Smoke)base.Source; protected new SmokeSegment Source => (SmokeSegment)base.Source;
protected double SmokeStartTime { get; private set; } protected double SmokeStartTime { get; private set; }
protected double SmokeEndTime { get; private set; } protected double SmokeEndTime { get; private set; }

5
osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
View File

@ -14,6 +14,9 @@ using osuTK;
namespace osu.Game.Rulesets.Osu.UI namespace osu.Game.Rulesets.Osu.UI
{ {
/// <summary>
/// Manages smoke trails generated from user input.
/// </summary>
[Cached] [Cached]
public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction> public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKeyBindingHandler<OsuAction>
{ {
@ -31,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.UI
if (e.Action == OsuAction.Smoke) if (e.Action == OsuAction.Smoke)
{ {
isSmoking = true; isSmoking = true;
AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.Smoke), _ => new DefaultSmoke())); AddInternal(new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SmokeTrail), _ => new DefaultSmokeSegment()));
return true; return true;
} }