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

Use British-English

Browse Source
This commit is contained in:
Dan Balasescu 2022-09-20 20:39:12 +09:00
parent 5d3c6efcc5
commit 9f23210e7e
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay)); fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
} }
protected override Color4 PointColor(SmokePoint point) protected override Color4 PointColour(SmokePoint point)
{ {
var color = Color4.White; var color = Color4.White;
color.A = alpha; color.A = alpha;

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

@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
finalFadeOutTime = final_fade_out_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed); finalFadeOutTime = final_fade_out_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
} }
protected override Color4 PointColor(SmokePoint point) protected override Color4 PointColour(SmokePoint point)
{ {
var color = Color4.White; var color = Color4.White;

17
osu.Game.Rulesets.Osu/Skinning/Smoke.cs
View File

@ -315,7 +315,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
protected new Smoke Source => (Smoke)base.Source; protected new Smoke Source => (Smoke)base.Source;
protected IVertexBatch<TexturedVertex2D>? QuadBatch; protected IVertexBatch<TexturedVertex2D>? QuadBatch;
protected readonly List<SmokePoint> Points = new List<SmokePoint>(); protected readonly List<SmokePoint> Points = new List<SmokePoint>();
protected float Radius; protected float Radius;
@ -378,11 +377,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
renderer.PopLocalMatrix(); renderer.PopLocalMatrix();
} }
protected Color4 ColorAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour protected Color4 ColourAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
? ((SRGBColour)DrawColourInfo.Colour).Linear ? ((SRGBColour)DrawColourInfo.Colour).Linear
: DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear; : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear;
protected abstract Color4 PointColor(SmokePoint point); protected abstract Color4 PointColour(SmokePoint point);
protected abstract float PointScale(SmokePoint point); protected abstract float PointScale(SmokePoint point);
@ -407,12 +406,12 @@ namespace osu.Game.Rulesets.Osu.Skinning
{ {
Debug.Assert(QuadBatch != null); Debug.Assert(QuadBatch != null);
var color = PointColor(point); var colour = PointColour(point);
float scale = PointScale(point); float scale = PointScale(point);
var dir = PointDirection(point); var dir = PointDirection(point);
var ortho = dir.PerpendicularLeft; var ortho = dir.PerpendicularLeft;
if (color.A == 0 || scale == 0) if (colour.A == 0 || scale == 0)
return; return;
var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset; var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset;
@ -424,25 +423,25 @@ namespace osu.Game.Rulesets.Osu.Skinning
{ {
Position = localTopLeft, Position = localTopLeft,
TexturePosition = TextureRect.TopLeft, TexturePosition = TextureRect.TopLeft,
Colour = Color4Extensions.Multiply(ColorAtPosition(localTopLeft), color), Colour = Color4Extensions.Multiply(ColourAtPosition(localTopLeft), colour),
}); });
QuadBatch.Add(new TexturedVertex2D QuadBatch.Add(new TexturedVertex2D
{ {
Position = localTopRight, Position = localTopRight,
TexturePosition = TextureRect.TopRight, TexturePosition = TextureRect.TopRight,
Colour = Color4Extensions.Multiply(ColorAtPosition(localTopRight), color), Colour = Color4Extensions.Multiply(ColourAtPosition(localTopRight), colour),
}); });
QuadBatch.Add(new TexturedVertex2D QuadBatch.Add(new TexturedVertex2D
{ {
Position = localBotRight, Position = localBotRight,
TexturePosition = TextureRect.BottomRight, TexturePosition = TextureRect.BottomRight,
Colour = Color4Extensions.Multiply(ColorAtPosition(localBotRight), color), Colour = Color4Extensions.Multiply(ColourAtPosition(localBotRight), colour),
}); });
QuadBatch.Add(new TexturedVertex2D QuadBatch.Add(new TexturedVertex2D
{ {
Position = localBotLeft, Position = localBotLeft,
TexturePosition = TextureRect.BottomLeft, TexturePosition = TextureRect.BottomLeft,
Colour = Color4Extensions.Multiply(ColorAtPosition(localBotLeft), color), Colour = Color4Extensions.Multiply(ColourAtPosition(localBotLeft), colour),
}); });
} }