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

Cleanup of new graphical options

Browse Source
This commit is contained in:
Anuken
2019-04-02 17:18:55 -04:00
parent d9692004cc
commit 3f6aeac33d
23 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,9 +163,8 @@ public class Renderer implements ApplicationListener{
graphics.clear(clearColor);
if(!graphics.isHidden() && (shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight())){
if(!graphics.isHidden() && (Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")) && shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight()){
shieldBuffer.resize(graphics.getWidth(), graphics.getHeight());
pixelator.rebind();
}
Draw.proj(camera.projection());
@@ -212,7 +211,7 @@ public class Renderer implements ApplicationListener{
drawAndInterpolate(playerGroup, p -> true, Player::drawBuildRequests);
if(EntityDraw.countInBounds(shieldGroup) > 0){
if(settings.getBool("animatedshields") && !pixelator.enabled()){
if(settings.getBool("animatedshields")){
Draw.flush();
shieldBuffer.begin();
graphics.clear(Color.CLEAR);

4
core/src/io/anuke/mindustry/graphics/CacheLayer.java
View File

@@ -43,7 +43,7 @@ public enum CacheLayer{
}
void beginShader(){
if(!Core.settings.getBool("animatedwater") || renderer.pixelator.enabled()) return;
if(!Core.settings.getBool("animatedwater")) return;
renderer.blocks.floor.endc();
renderer.shieldBuffer.begin();
@@ -52,7 +52,7 @@ public enum CacheLayer{
}
void endShader(Shader shader){
if(!Core.settings.getBool("animatedwater") || renderer.pixelator.enabled()) return;
if(!Core.settings.getBool("animatedwater")) return;
renderer.blocks.floor.endc();
renderer.shieldBuffer.end();

6
core/src/io/anuke/mindustry/graphics/Pixelator.java
View File

@@ -14,6 +14,10 @@ public class Pixelator implements Disposable{
private FrameBuffer buffer = new FrameBuffer(2, 2);
public void drawPixelate(){
boolean hadShields = Core.settings.getBool("animatedshields");
boolean hadWater = Core.settings.getBool("animatedwater");
Core.settings.put("animatedwater", false);
Core.settings.put("animatedshields", false);
graphics.clear(0f, 0f, 0f, 1f);
float px = Core.camera.position.x, py = Core.camera.position.y;
@@ -38,6 +42,8 @@ public class Pixelator implements Disposable{
Draw.blend();
Core.camera.position.set(px, py);
Core.settings.put("animatedwater", hadWater);
Core.settings.put("animatedshields", hadShields);
}
public void rebind(){

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -213,7 +213,7 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("fps", false);
graphics.checkPref("indicators", true);
graphics.checkPref("animatedwater", false);
graphics.checkPref("animatedshields", false);
graphics.checkPref("animatedshields", !mobile);
graphics.checkPref("lasers", true);
graphics.checkPref("pixelate", false);
}

3
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -277,11 +277,12 @@ public class ForceProjector extends Block {
float rad = realRadius(entity);
Draw.color(Pal.accent);
Lines.stroke(1.5f);
Draw.alpha(0.09f + 0.08f * entity.hit);
Fill.poly(x, y, 6, rad);
Draw.alpha(1f);
Lines.poly(x, y, 6, rad);
Draw.color();
Draw.reset();
}
@Override