Branch created

This commit is contained in:
Anuken
2019-06-19 22:20:17 -04:00
parent 8e95be0ac2
commit 1fe30bc466
13 changed files with 8213 additions and 8214 deletions

View File

@@ -5,7 +5,6 @@ import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.scene.Group;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.graphics.Shaders;
import static io.anuke.mindustry.Vars.state;
@@ -16,9 +15,9 @@ public class BackgroundFragment extends Fragment{
Core.scene.table().addRect((a, b, w, h) -> {
Draw.colorl(0.1f);
Fill.crect(0, 0, w, h);
Draw.shader(Shaders.menu);
Fill.crect(0, 0, w, h);
Draw.shader();
//Draw.shader(Shaders.menu);
// Fill.crect(0, 0, w, h);
//Draw.shader();
boolean portrait = Core.graphics.getWidth() < Core.graphics.getHeight();
float logoscl = (int)Unit.dp.scl(1);
@@ -27,7 +26,7 @@ public class BackgroundFragment extends Fragment{
float logoh = logo.getHeight() * logoscl;
Draw.color();
Draw.rect(logo, (int)(w / 2), (int)(h - 10 - logoh - Unit.dp.scl(portrait ? 30f : 0)) + logoh / 2, logow, logoh);
//Draw.rect(logo, (int)(w / 2), (int)(h - 10 - logoh - Unit.dp.scl(portrait ? 30f : 0)) + logoh / 2, logow, logoh);
}).visible(() -> state.is(State.menu)).grow();
}
}