From 58b31bd799be54c54465244f2a12eeb37c919f18 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 13 Feb 2020 10:04:45 -0500 Subject: [PATCH] Added support for animations w/ pixelation + map screenshots --- core/src/mindustry/core/Renderer.java | 12 ++---------- core/src/mindustry/graphics/BlockRenderer.java | 1 - core/src/mindustry/graphics/Pixelator.java | 12 ------------ fastlane/metadata/android/en-US/changelogs/104.2.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/104.3.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29612.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29616.txt | 6 ++++++ gradle.properties | 2 +- 8 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/104.2.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/104.3.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29612.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29616.txt diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index bf0e7bc5f6..79c7c4f9a3 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -270,7 +270,7 @@ public class Renderer implements ApplicationListener{ drawAllTeams(true); Draw.flush(); - if(bloom != null && !pixelator.enabled()){ + if(bloom != null){ bloom.capture(); } @@ -278,7 +278,7 @@ public class Renderer implements ApplicationListener{ effectGroup.draw(); Draw.flush(); - if(bloom != null && !pixelator.enabled()){ + if(bloom != null){ bloom.render(); } @@ -417,11 +417,6 @@ public class Renderer implements ApplicationListener{ return; } - boolean hadShields = Core.settings.getBool("animatedshields"); - boolean hadWater = Core.settings.getBool("animatedwater"); - Core.settings.put("animatedwater", false); - Core.settings.put("animatedshields", false); - FrameBuffer buffer = new FrameBuffer(w, h); float vpW = camera.width, vpH = camera.height, px = camera.position.x, py = camera.position.y; @@ -453,9 +448,6 @@ public class Renderer implements ApplicationListener{ ui.showInfoFade(Core.bundle.format("screenshot", file.toString())); buffer.dispose(); - - Core.settings.put("animatedwater", hadWater); - Core.settings.put("animatedshields", hadShields); } } diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index 41274e0349..a6455a03d6 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -168,7 +168,6 @@ public class BlockRenderer implements Disposable{ shadowEvents.clear(); Draw.proj(camera.projection()); - renderer.pixelator.rebind(); } float ww = world.width() * tilesize, wh = world.height() * tilesize; diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index f746ca69e3..8b8fce9786 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -28,10 +28,6 @@ public class Pixelator implements Disposable{ camera.width = (int)camera.width; camera.height = (int)camera.height; - 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; @@ -58,17 +54,9 @@ public class Pixelator implements Disposable{ playerGroup.draw(p -> !p.isDead(), Player::drawName); Core.camera.position.set(px, py); - Core.settings.put("animatedwater", hadWater); - Core.settings.put("animatedshields", hadShields); renderer.setScale(pre); } - public void rebind(){ - if(enabled()){ - buffer.begin(); - } - } - public boolean enabled(){ return Core.settings.getBool("pixelate"); } diff --git a/fastlane/metadata/android/en-US/changelogs/104.2.txt b/fastlane/metadata/android/en-US/changelogs/104.2.txt new file mode 100644 index 0000000000..6f3e27fb4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/104.2.txt @@ -0,0 +1,6 @@ +- Optimized and cleaned up conveyors +- Made unloaders take items from blocks in equal amounts +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Added color gradient for battery status (Contributed by @Arkanic (eventually)) +- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them diff --git a/fastlane/metadata/android/en-US/changelogs/104.3.txt b/fastlane/metadata/android/en-US/changelogs/104.3.txt new file mode 100644 index 0000000000..6f3e27fb4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/104.3.txt @@ -0,0 +1,6 @@ +- Optimized and cleaned up conveyors +- Made unloaders take items from blocks in equal amounts +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Added color gradient for battery status (Contributed by @Arkanic (eventually)) +- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them diff --git a/fastlane/metadata/android/en-US/changelogs/29612.txt b/fastlane/metadata/android/en-US/changelogs/29612.txt new file mode 100644 index 0000000000..6f3e27fb4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29612.txt @@ -0,0 +1,6 @@ +- Optimized and cleaned up conveyors +- Made unloaders take items from blocks in equal amounts +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Added color gradient for battery status (Contributed by @Arkanic (eventually)) +- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them diff --git a/fastlane/metadata/android/en-US/changelogs/29616.txt b/fastlane/metadata/android/en-US/changelogs/29616.txt new file mode 100644 index 0000000000..6f3e27fb4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29616.txt @@ -0,0 +1,6 @@ +- Optimized and cleaned up conveyors +- Made unloaders take items from blocks in equal amounts +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Added color gradient for battery status (Contributed by @Arkanic (eventually)) +- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them diff --git a/gradle.properties b/gradle.properties index f78f2f7bf5..3e2c6dc8ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=ff1818a232375891ffea0347130588c0e2ca68cc +archash=f6d424949851352a8237041151f76cd31e3d10dc