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

editor MapRenderer block icon scaling (#344)

Browse Source
This commit is contained in:
LQ
2018-11-20 01:33:50 +08:00
committed by Anuken
parent f8d55ba837
commit 00706daae5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/io/anuke/mindustry/editor/MapRenderer.java
View File

@@ -18,6 +18,7 @@ import io.anuke.ucore.util.Bits;
import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Geometry;
import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.content;
import static io.anuke.mindustry.Vars.scaling;
import static io.anuke.mindustry.Vars.tilesize; import static io.anuke.mindustry.Vars.tilesize;
public class MapRenderer implements Disposable{ public class MapRenderer implements Disposable{
@@ -120,12 +121,12 @@ public class MapRenderer implements Disposable{
if(wall.rotate){ if(wall.rotate){
mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region, mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region,
wx * tilesize + wall.offset(), wy * tilesize + wall.offset(), 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{ }else{
mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region, mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize, region,
wx * tilesize + wall.offset() + (tilesize - region.getRegionWidth())/2f, wx * tilesize + wall.offset() + (tilesize - region.getRegionWidth() * scaling)/2f,
wy * tilesize + wall.offset() + (tilesize - region.getRegionHeight())/2f, wy * tilesize + wall.offset() + (tilesize - region.getRegionHeight() * scaling)/2f,
region.getRegionWidth(), region.getRegionHeight()); region.getRegionWidth() * scaling, region.getRegionHeight() * scaling);
} }
}else{ }else{
region = floor.getEditorIcon(); region = floor.getEditorIcon();
@@ -149,7 +150,7 @@ public class MapRenderer implements Disposable{
mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize + chunksize * chunksize, region, mesh.draw((wx % chunksize) + (wy % chunksize) * chunksize + chunksize * chunksize, region,
wx * tilesize - (wall.size/3) * tilesize, wy * tilesize - (wall.size/3) * tilesize, 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); mesh.setColor(Color.WHITE);
} }