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

Rewrite of all static initialization code

Browse Source
This commit is contained in:
Anuken
2018-05-29 15:24:47 -04:00
parent 4655bd5502
commit b434c37f01
60 changed files with 2605 additions and 2545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -70,7 +70,7 @@ public class OverlayRenderer {
Draw.color(0f, 0f, 0f, 0.5f);
Fill.rect(target.drawx(), target.drawy(), v.x, v.y);
Draw.textc(result.toString(), target.drawx(), target.drawy(), v);
Draw.tscl(fontscale);
Draw.tscl(fontScale);
Draw.reset();
}

36
core/src/io/anuke/mindustry/graphics/Shaders.java
View File

@@ -3,7 +3,6 @@ package io.anuke.mindustry.graphics;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.FloatArray;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers;
@@ -14,18 +13,29 @@ import static io.anuke.mindustry.Vars.tilesize;
import static io.anuke.mindustry.Vars.world;
public class Shaders{
public static final Outline outline = new Outline();
public static final BlockBuild blockbuild = new BlockBuild();
public static final BlockPreview blockpreview = new BlockPreview();
public static final Shield shield = new Shield();
public static final SurfaceShader water = new SurfaceShader("water");
public static final SurfaceShader lava = new SurfaceShader("lava");
public static final SurfaceShader oil = new SurfaceShader("oil");
public static final Space space = new Space();
public static final UnitBuild build = new UnitBuild();
public static final Shader hit = new Shader("hit", "default");
public static Outline outline;
public static BlockBuild blockbuild;
public static BlockPreview blockpreview;
public static Shield shield;
public static SurfaceShader water;
public static SurfaceShader lava;
public static SurfaceShader oil;
public static Space space;
public static UnitBuild build;
public static Shader hit;
private static final Vector2 vec = new Vector2();
public static void init(){
outline = new Outline();
blockbuild = new BlockBuild();
blockpreview = new BlockPreview();
shield = new Shield();
water = new SurfaceShader("water");
lava = new SurfaceShader("lava");
oil = new SurfaceShader("oil");
space = new Space();
build = new UnitBuild();
hit = new Shader("hit", "default");
}
public static class Space extends SurfaceShader{
@@ -70,7 +80,7 @@ public class Shaders{
@Override
public void apply(){
shader.setUniformf("u_color", color);
shader.setUniformf("u_texsize", vec.set(region.getTexture().getWidth(), region.getTexture().getHeight()));
shader.setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight());
}
}