mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-07 14:01:51 +07:00
Added support for animations w/ pixelation + map screenshots
This commit is contained in:
parent
c067be2add
commit
58b31bd799
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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");
|
||||
}
|
||||
|
6
fastlane/metadata/android/en-US/changelogs/104.2.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/104.2.txt
Normal file
@ -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
|
6
fastlane/metadata/android/en-US/changelogs/104.3.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/104.3.txt
Normal file
@ -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
|
6
fastlane/metadata/android/en-US/changelogs/29612.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/29612.txt
Normal file
@ -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
|
6
fastlane/metadata/android/en-US/changelogs/29616.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/29616.txt
Normal file
@ -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
|
@ -1,3 +1,3 @@
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
||||
archash=ff1818a232375891ffea0347130588c0e2ca68cc
|
||||
archash=f6d424949851352a8237041151f76cd31e3d10dc
|
||||
|
Loading…
Reference in New Issue
Block a user