Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logo update

Browse Source
This commit is contained in:
Anuken
2018-11-28 22:38:01 -05:00
parent 9ac8a4211e
commit 8c7716428d
9 changed files with 1009 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/button-down.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 294 B

BIN
core/assets-raw/sprites/ui/button-over.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 321 B

BIN
core/assets-raw/sprites/ui/button.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 320 B

BIN
core/assets-raw/sprites/ui/logotext.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 4.6 KiB

1985
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 KiB

After

Width:  |  Height:  |  Size: 327 KiB

1
core/assets/ui/uiskin.json
View File

@@ -24,7 +24,6 @@ ButtonStyle: {
},
TextButtonStyle: {
default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: gray, down: button-down, up: button},
left: {over: button-left-over, font: default-font, fontColor: white, disabledFontColor: gray, down: button-left-down, up: button-left},
right: {over: button-right-over, font: default-font, fontColor: white, disabledFontColor: gray, down: button-right-down, up: button-right},
wave: {font: default-font, fontColor: white, disabledFontColor: gray, up: button-edge-4},
clear: {over: flat-over, font: default-font, fontColor: white, disabledFontColor: gray, down: pane, up: flat},

8
core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
View File

@@ -29,13 +29,13 @@ public class BackgroundFragment extends Fragment{
Draw.color();
boolean portrait = Gdx.graphics.getWidth() < Gdx.graphics.getHeight();
float logoscl = (int) Unit.dp.scl(7) * (portrait ? 5f / 7f : 1f);
TextureRegion logo = Core.skin.getRegion("logotext");
float logow = logo.getRegionWidth() * logoscl;
float logoh = logo.getRegionHeight() * logoscl;
float ratio = (float)logo.getRegionWidth() / logo.getRegionHeight();
float logow = 810f;
float logoh = logow / ratio;
Draw.color();
Core.batch.draw(logo, (int) (w / 2 - logow / 2), (int) (h - logoh + 15 - Unit.dp.scl(portrait ? 30f : 0)), logow, logoh);
Core.batch.draw(logo, (int) (w / 2 - logow / 2), (int) (h - logoh - Unit.dp.scl(portrait ? 30f : 20)), logow, logoh);
}).visible(() -> state.is(State.menu)).grow();
}
}