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

Fixed edge scale

Browse Source
This commit is contained in:
Anuken
2018-11-13 09:30:21 -05:00
parent 7baf42b138
commit 4cb78f55d1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -27,7 +27,10 @@ import io.anuke.ucore.core.*;
import io.anuke.ucore.entities.EntityQuery;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.modules.Module;
import io.anuke.ucore.util.*;
import io.anuke.ucore.util.Atlas;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Strings;
import io.anuke.ucore.util.Timer;
import java.io.IOException;
@@ -66,11 +69,10 @@ public class Control extends Module{
content.initialize(Content::init);
Core.atlas = new Atlas("sprites.atlas");
scaling = 1f / Draw.region("blank").getRegionWidth();
Core.atlas.setErrorRegion("error");
content.initialize(Content::load);
scaling = 1f / Draw.region("blank").getRegionWidth();
unlocks.load();
Sounds.setFalloff(9000f);

2
core/src/io/anuke/mindustry/world/blocks/Floor.java
View File

@@ -87,7 +87,7 @@ public class Floor extends Block{
TextureRegion result = new TextureRegion();
int padSize = (int)(tilesize/2/scaling);
int padSize = (int)(tilesize/scaling/2);
int texSize = (int)(tilesize/scaling);
int totSize = padSize + texSize;