From 00706daae571ec0136a2a854f7fa5a88f840963d Mon Sep 17 00:00:00 2001 From: LQ Date: Tue, 20 Nov 2018 01:33:50 +0800 Subject: [PATCH] editor MapRenderer block icon scaling (#344) --- core/src/io/anuke/mindustry/editor/MapRenderer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index b08789e092..5735e47ed8 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -18,6 +18,7 @@ import io.anuke.ucore.util.Bits; import io.anuke.ucore.util.Geometry; import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.scaling; import static io.anuke.mindustry.Vars.tilesize; public class MapRenderer implements Disposable{ @@ -120,12 +121,12 @@ public class MapRenderer implements Disposable{ if(wall.rotate){ mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region, wx * tilesize + wall.offset(), wy * tilesize + wall.offset(), - region.getRegionWidth(), region.getRegionHeight(), rotation * 90 - 90); + region.getRegionWidth() * scaling, region.getRegionHeight() * scaling, rotation * 90 - 90); }else{ mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region, - wx * tilesize + wall.offset() + (tilesize - region.getRegionWidth())/2f, - wy * tilesize + wall.offset() + (tilesize - region.getRegionHeight())/2f, - region.getRegionWidth(), region.getRegionHeight()); + wx * tilesize + wall.offset() + (tilesize - region.getRegionWidth() * scaling)/2f, + wy * tilesize + wall.offset() + (tilesize - region.getRegionHeight() * scaling)/2f, + region.getRegionWidth() * scaling, region.getRegionHeight() * scaling); } }else{ region = floor.getEditorIcon(); @@ -149,7 +150,7 @@ public class MapRenderer implements Disposable{ mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize + chunksize * chunksize, region, wx * tilesize - (wall.size/3) * tilesize, wy * tilesize - (wall.size/3) * tilesize, - region.getRegionWidth(), region.getRegionHeight()); + region.getRegionWidth() * scaling, region.getRegionHeight() * scaling); mesh.setColor(Color.WHITE); }