h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 21:25:36 +08:00
Code Issues Releases Wiki Activity

Remove all @2x references, updates resource and framework.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-06 22:17:29 +09:00
parent 86205c35a4
commit 9b9ed32245
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
17 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit efea7a17d84bc284629bcca9140d07c02223371c Subproject commit d1d13137283691df0c00ace712cbe212545e0041

2
osu-resources

@ -1 +1 @@
Subproject commit 7c42cf0a565ca125edcf335fabcb2ba3961d202d Subproject commit c03414fd4e9ffd99ab5641ac9a15ee21f3976b55

4
osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -105,7 +105,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
//sane defaults //sane defaults
ring.Alpha = circle.Alpha = number.Alpha = glow.Alpha = 1; ring.Alpha = circle.Alpha = number.Alpha = glow.Alpha = 1;
ApproachCircle.Alpha = 0; ApproachCircle.Alpha = 0;
ApproachCircle.Scale = new Vector2(2); ApproachCircle.Scale = new Vector2(4);
explode.Alpha = 0; explode.Alpha = 0;
} }
@ -114,7 +114,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
base.UpdatePreemptState(); base.UpdatePreemptState();
ApproachCircle.FadeIn(Math.Min(TIME_FADEIN * 2, TIME_PREEMPT)); ApproachCircle.FadeIn(Math.Min(TIME_FADEIN * 2, TIME_PREEMPT));
ApproachCircle.ScaleTo(0.6f, TIME_PREEMPT); ApproachCircle.ScaleTo(1.1f, TIME_PREEMPT);
} }
protected override void UpdateState(ArmedState state) protected override void UpdateState(ArmedState state)

2
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
body = new SliderBody(s) body = new SliderBody(s)
{ {
Position = s.Position, Position = s.Position,
PathWidth = s.Scale * 72, PathWidth = s.Scale * 64,
}, },
bouncer1 = new SliderBouncer(s, false) bouncer1 = new SliderBouncer(s, false)
{ {

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
approachCircle.Texture = textures.Get(@"Play/osu/approachcircle@2x"); approachCircle.Texture = textures.Get(@"Play/osu/approachcircle");
} }
} }
} }

6
osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs
View File

@ -22,9 +22,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
public CirclePiece() public CirclePiece()
{ {
Size = new Vector2(144); Size = new Vector2(128);
Masking = true; Masking = true;
CornerRadius = DrawSize.X / 2; CornerRadius = Size.X / 2;
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
@ -47,7 +47,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
disc.Texture = textures.Get(@"Play/osu/disc@2x"); disc.Texture = textures.Get(@"Play/osu/disc");
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
{ {
public ExplodePiece() public ExplodePiece()
{ {
Size = new Vector2(144); Size = new Vector2(128);
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
{ {
public FlashPiece() public FlashPiece()
{ {
Size = new Vector2(144); Size = new Vector2(128);
Masking = true; Masking = true;
CornerRadius = Size.X / 2; CornerRadius = Size.X / 2;

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
layer.Texture = textures.Get(@"Play/osu/ring-glow@2x"); layer.Texture = textures.Get(@"Play/osu/ring-glow");
} }
} }
} }

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
number.Texture = textures.Get(@"Play/osu/number@2x"); number.Texture = textures.Get(@"Play/osu/number");
} }
} }
} }

25
osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs
View File

@ -6,32 +6,35 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
{ {
public class RingPiece : Container public class RingPiece : Container
{ {
private Sprite ring;
public RingPiece() public RingPiece()
{ {
Size = new Vector2(128);
Masking = true;
CornerRadius = Size.X / 2;
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
BorderThickness = 10;
BorderColour = Color4.White;
Children = new Drawable[] Children = new Drawable[]
{ {
ring = new Sprite new Box
{ {
Anchor = Anchor.Centre, AlwaysPresent = true,
Origin = Anchor.Centre Alpha = 0,
RelativeSizeAxes = Axes.Both
} }
}; };
} }
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
ring.Texture = textures.Get(@"Play/osu/ring@2x");
}
} }
} }

4
osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
private readonly Slider slider; private readonly Slider slider;
private Box follow; private Box follow;
const float width = 140; const float width = 128;
public SliderBall(Slider slider) public SliderBall(Slider slider)
{ {
@ -45,7 +45,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
BorderThickness = 14, BorderThickness = 10,
BorderColour = Color4.White, BorderColour = Color4.White,
Alpha = 1, Alpha = 1,
CornerRadius = width / 2, CornerRadius = width / 2,

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs
View File

@ -89,7 +89,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
var bytes = upload.Data; var bytes = upload.Data;
const float aa_portion = 0.02f; const float aa_portion = 0.02f;
const float border_portion = 0.18f; const float border_portion = 0.128f;
const float gradient_portion = 1 - border_portion; const float gradient_portion = 1 - border_portion;
const float opacity_at_centre = 0.3f; const float opacity_at_centre = 0.3f;

1
osu.Game/Graphics/Cursor/CursorTrail.cs
View File

@ -74,6 +74,7 @@ namespace osu.Game.Graphics.Cursor
{ {
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);
} }
protected override void Update() protected override void Update()

2
osu.Game/OsuGameBase.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game
Dependencies.Cache(new OsuColour()); Dependencies.Cache(new OsuColour());
//this completely overrides the framework default. will need to change once we make a proper FontStore. //this completely overrides the framework default. will need to change once we make a proper FontStore.
Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f }, true); Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true);
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));

2
osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar
{ {
this.game = game; this.game = game;
guestTexture = textures.Get(@"Online/avatar-guest@2x"); guestTexture = textures.Get(@"Online/avatar-guest");
} }
public int UserId public int UserId

6
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -132,7 +132,6 @@ namespace osu.Game.Screens.Menu
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(0.5f),
}, },
} }
}, },
@ -147,7 +146,6 @@ namespace osu.Game.Screens.Menu
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
BlendingMode = BlendingMode.Additive, BlendingMode = BlendingMode.Additive,
Scale = new Vector2(0.5f),
Alpha = 0.15f Alpha = 0.15f
} }
} }
@ -170,8 +168,8 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
logo.Texture = textures.Get(@"Menu/logo@2x"); logo.Texture = textures.Get(@"Menu/logo");
ripple.Texture = textures.Get(@"Menu/logo@2x"); ripple.Texture = textures.Get(@"Menu/logo");
} }
protected override void LoadComplete() protected override void LoadComplete()