mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-03 13:30:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added option to not pixelate the screen

Browse Source
This commit is contained in:
Anuken 2017-11-20 13:58:50 -05:00
parent 89805773c7
commit aedf46257a
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/io/anuke/mindustry/Renderer.java
View File

@ -45,10 +45,19 @@ public class Renderer extends RendererModule{
public Renderer() {
Core.cameraScale = baseCameraScale;
pixelate();
Graphics.addSurface("shadow", Core.cameraScale);
Graphics.addSurface("shield", Core.cameraScale);
Graphics.addSurface("pixel", Core.cameraScale);
}
@Override
public void init(){
pixelate = Settings.getBool("pixelate");
Graphics.addSurface("shadow", Settings.getBool("pixelate") ? Core.cameraScale : 1);
Graphics.addSurface("shield", Settings.getBool("pixelate") ? Core.cameraScale : 1);
}
public void setPixelate(boolean pixelate){
this.pixelate = pixelate;
}
@Override
@ -85,7 +94,8 @@ public class Renderer extends RendererModule{
smoothCamera(World.core.worldx(), World.core.worldy(), 0.4f);
}
limitCamera(4f, player.x, player.y);
if(Settings.getBool("pixelate"))
limitCamera(4f, player.x, player.y);
float prex = camera.position.x, prey = camera.position.y;
@ -102,7 +112,7 @@ public class Renderer extends RendererModule{
float lastx = camera.position.x, lasty = camera.position.y;
if(Vars.snapCamera && smoothcam){
if(Vars.snapCamera && smoothcam && Settings.getBool("pixelate")){
camera.position.set((int) camera.position.x, (int) camera.position.y, 0);
}
@ -423,7 +433,7 @@ public class Renderer extends RendererModule{
if(entity instanceof DestructibleEntity && !(entity instanceof TileEntity)){
DestructibleEntity dest = ((DestructibleEntity) entity);
if(dest instanceof Player && Vars.snapCamera && smoothcam){
if(dest instanceof Player && Vars.snapCamera && smoothcam && Settings.getBool("pixelate")){
drawHealth((int)dest.x, (int)dest.y - 7f, dest.health, dest.maxhealth);
}else{
drawHealth(dest.x, dest.y - 7f, dest.health, dest.maxhealth);
@ -460,9 +470,11 @@ public class Renderer extends RendererModule{
public void setCameraScale(int amount){
targetscale = amount;
clampScale();
Graphics.getSurface("pixel").setScale(targetscale);
Graphics.getSurface("shadow").setScale(targetscale);
Graphics.getSurface("shield").setScale(targetscale);
if(Settings.getBool("pixelate")){
Graphics.getSurface("pixel").setScale(targetscale);
Graphics.getSurface("shadow").setScale(targetscale);
Graphics.getSurface("shield").setScale(targetscale);
}
}
public void scaleCamera(int amount){

13
core/src/io/anuke/mindustry/UI.java
View File

@ -85,6 +85,8 @@ public class UI extends SceneModule{
});
});
Settings.defaults("pixelate", true);
Dialog.closePadR = -1;
Dialog.closePadT = 5;
@ -173,6 +175,17 @@ public class UI extends SceneModule{
prefs.checkPref("noshadows", "Disable shadows", false);
prefs.checkPref("smoothcam", "Smooth Camera", true);
prefs.checkPref("indicators", "Enemy Indicators", true);
prefs.checkPref("pixelate", "Pixelate Screen", true, b->{
if(b){
Graphics.getSurface("pixel").setScale(Core.cameraScale);
Graphics.getSurface("shadow").setScale(Core.cameraScale);
Graphics.getSurface("shield").setScale(Core.cameraScale);
}else{
Graphics.getSurface("shadow").setScale(1);
Graphics.getSurface("shield").setScale(1);
}
renderer.setPixelate(b);
});
prefs.hidden(()->{
if(!GameState.is(State.menu)){

2
core/src/io/anuke/mindustry/entities/Player.java
View File

@ -46,7 +46,7 @@ public class Player extends DestructibleEntity{
@Override
public void draw(){
if(Vars.snapCamera && Settings.getBool("smoothcam")){
if(Vars.snapCamera && Settings.getBool("smoothcam") && Settings.getBool("pixelate")){
Draw.rect("player", (int)x, (int)y, direction.angle()-90);
}else{
Draw.rect("player", x, y, direction.angle()-90);