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

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(){