From 4a216056d02ba76dbd6c90cbf2310445739bbd08 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Feb 2022 11:33:06 -0500 Subject: [PATCH] I waste several hours --- .../blocks/turrets/disperse/disperse.png | Bin 2024 -> 2028 bytes core/assets/shaders/fog.frag | 12 ++ core/src/mindustry/core/Renderer.java | 2 + core/src/mindustry/game/Rules.java | 2 + core/src/mindustry/graphics/FogRenderer.java | 173 ++++++++++++++++++ core/src/mindustry/graphics/Layer.java | 3 + .../mindustry/graphics/MinimapRenderer.java | 18 ++ core/src/mindustry/graphics/Shaders.java | 8 + core/src/mindustry/io/SaveFileReader.java | 65 +++++-- core/src/mindustry/io/SaveIO.java | 2 +- core/src/mindustry/io/SaveVersion.java | 42 ++++- core/src/mindustry/io/versions/Save6.java | 21 +++ core/src/mindustry/io/versions/Save7.java | 10 + gradle.properties | 2 +- 14 files changed, 335 insertions(+), 25 deletions(-) create mode 100644 core/assets/shaders/fog.frag create mode 100644 core/src/mindustry/graphics/FogRenderer.java create mode 100644 core/src/mindustry/io/versions/Save7.java diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png index bf7bbc092ccdeabd745b310f7abc3a9c9ac50c75..b474041e8ff01dc81adb3cb10fc170e8827171fc 100644 GIT binary patch delta 1975 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 researched = new ObjectSet<>(); /** Block containing these items as requirements are hidden. */ public ObjectSet hiddenBuildItems = new ObjectSet<>(); + /** HIGHLY UNSTABLE/EXPERIMENTAL. DO NOT USE THIS. */ + public boolean fog = false; /** Whether ambient lighting is enabled. */ public boolean lighting = false; /** Whether enemy lighting is visible. diff --git a/core/src/mindustry/graphics/FogRenderer.java b/core/src/mindustry/graphics/FogRenderer.java new file mode 100644 index 0000000000..582fb99b8a --- /dev/null +++ b/core/src/mindustry/graphics/FogRenderer.java @@ -0,0 +1,173 @@ +package mindustry.graphics; + +import arc.*; +import arc.graphics.*; +import arc.graphics.Texture.*; +import arc.graphics.g2d.*; +import arc.graphics.gl.*; +import arc.math.geom.*; +import arc.struct.*; +import arc.util.*; +import mindustry.game.EventType.*; +import mindustry.gen.*; +import mindustry.io.*; +import mindustry.io.SaveFileReader.*; + +import java.io.*; +import java.nio.*; + +import static mindustry.Vars.*; + +/** Highly experimental fog-of-war renderer. */ +public class FogRenderer implements CustomChunk{ + private static final float fogSpeed = 1f; + private FrameBuffer buffer = new FrameBuffer(); + private Seq events = new Seq<>(); + private boolean read = false; + private Rect rect = new Rect(); + + public FogRenderer(){ + SaveVersion.addCustomChunk("fog", this); + + Events.on(WorldLoadEvent.class, event -> { + if(state.rules.fog){ + buffer.resize(world.width(), world.height()); + + events.clear(); + Groups.build.copy(events); + + //clear + if(!read){ + buffer.begin(Color.black); + buffer.end(); + } + + read = false; + } + }); + + //draw fog when tile is placed. + Events.on(TileChangeEvent.class, event -> { + if(state.rules.fog && event.tile.build != null && event.tile.isCenter()){ + events.add(event.tile.build); + } + }); + } + + public Texture getTexture(){ + return buffer.getTexture(); + } + + public void drawFog(){ + //resize if world size changes + buffer.resize(world.width(), world.height()); + + //set projection to whole map + Draw.proj(0, 0, buffer.getWidth() * tilesize, buffer.getHeight() * tilesize); + buffer.begin(); + Gl.blendEquationSeparate(Gl.max, Gl.max); + ScissorStack.push(rect.set(1, 1, buffer.getWidth() - 2, buffer.getHeight() - 2)); + + Draw.color(Color.white); + + for(var build : events){ + if(build.team == player.team()){ + Fill.circle(build.x, build.y, 40f); + } + } + events.clear(); + + Draw.alpha(fogSpeed * Math.max(Time.delta, 1f)); + + //TODO slow and terrible + Groups.unit.each(u -> { + if(u.team == player.team()){ + Fill.circle(u.x, u.y, u.type.lightRadius); + } + }); + + buffer.end(); + buffer.getTexture().setFilter(TextureFilter.linear); + Gl.blendEquationSeparate(Gl.funcAdd, Gl.funcAdd); + ScissorStack.pop(); + + Draw.proj(Core.camera); + + Draw.shader(Shaders.fog); + Draw.fbo(buffer.getTexture(), world.width(), world.height(), tilesize); + Draw.shader(); + } + + @Override + public void write(DataOutput stream) throws IOException{ + ByteBuffer bytes = Buffers.newUnsafeByteBuffer(buffer.getWidth() * buffer.getHeight() * 4); + try{ + bytes.position(0); + buffer.begin(); + Gl.readPixels(0, 0, buffer.getWidth(), buffer.getHeight(), Gl.rgba, Gl.unsignedByte, bytes); + buffer.end(); + bytes.position(0); + stream.writeShort(buffer.getWidth()); + stream.writeShort(buffer.getHeight()); + + //TODO flip? + + int pos = 0, size = bytes.capacity() / 4; + while(pos < size){ + int consecutives = 0; + boolean cur = bytes.get(pos * 4) != 0; + while(consecutives < 127 && pos < size){ + boolean next = bytes.get(pos * 4) != 0; + if(cur != next){ + break; + } + + consecutives ++; + pos ++; + } + int mask = (cur ? 0b1000_0000 : 0); + stream.write(mask | (consecutives)); + } + }finally{ + Buffers.disposeUnsafeByteBuffer(bytes); + } + } + + @Override + public void read(DataInput stream) throws IOException{ + short w = stream.readShort(), h = stream.readShort(); + int pos = 0; + int len = w * h; + buffer.resize(w, h); + buffer.begin(Color.black); + Draw.proj(0, 0, buffer.getWidth(), buffer.getHeight()); + Draw.color(); + + while(pos < len){ + int data = stream.readByte() & 0xff; + boolean sign = (data & 0b1000_0000) != 0; + int consec = data & 0b0111_1111; + + if(sign){ + for(int i = 0; i < consec; i++){ + int x = pos % w, y = pos / w; + //TODO this is slow + Fill.rect(x + 0.5f, y + 0.5f, 1f, 1f); + + pos ++; + } + }else{ + pos += consec; + } + } + + buffer.end(); + Draw.proj(Core.camera); + read = true; + } + + @Override + public boolean shouldWrite(){ + return state.rules.fog && buffer.getTexture() != null && buffer.getWidth() > 0; + } +} diff --git a/core/src/mindustry/graphics/Layer.java b/core/src/mindustry/graphics/Layer.java index 109bc2799d..d87ef9f185 100644 --- a/core/src/mindustry/graphics/Layer.java +++ b/core/src/mindustry/graphics/Layer.java @@ -92,6 +92,9 @@ public class Layer{ //names of players in the game playerName = 150, + //fog of war effect, if applicable + fogOfWar = 155, + //space effects, currently only the land and launch effects space = 160, diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 165baab656..bebc9ef035 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -2,6 +2,7 @@ package mindustry.graphics; import arc.*; import arc.graphics.*; +import arc.graphics.Texture.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; @@ -134,6 +135,23 @@ public class MinimapRenderer{ Draw.reset(); + if(state.rules.fog){ + if(withLabels){ + float z = zoom; + //max zoom out fixes everything, somehow? + setZoom(99999f); + getRegion(); + zoom = z; + } + Draw.shader(Shaders.fog); + renderer.fog.getTexture().setFilter(TextureFilter.nearest); + //crisp pixels + Tmp.tr1.set(renderer.fog.getTexture()); + Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2); + Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h); + Draw.shader(); + } + //TODO might be useful in the standard minimap too if(withLabels){ drawSpawns(x, y, w, h, scaling); diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index b74c70fdaf..e9b316977c 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -21,6 +21,7 @@ public class Shaders{ public static UnitBuildShader build; public static UnitArmorShader armor; public static DarknessShader darkness; + public static FogShader fog; public static LightShader light; public static SurfaceShader water, mud, tar, slag, cryofluid, space, caustics, arkycite; public static PlanetShader planet; @@ -41,6 +42,7 @@ public class Shaders{ shield = null; t.printStackTrace(); } + fog = new FogShader(); buildBeam = new BuildBeamShader(); build = new UnitBuildShader(); armor = new UnitArmorShader(); @@ -178,6 +180,12 @@ public class Shaders{ } } + public static class FogShader extends LoadShader{ + public FogShader(){ + super("fog", "default"); + } + } + /** @deprecated transition class for mods; use UnitBuildShader instead. */ @Deprecated public static class UnitBuild extends UnitBuildShader{} diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java index a39142caca..1cde38be1b 100644 --- a/core/src/mindustry/io/SaveFileReader.java +++ b/core/src/mindustry/io/SaveFileReader.java @@ -72,10 +72,11 @@ public abstract class SaveFileReader{ "slag", "molten-slag" ); - protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream(); - protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput); + protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream(), byteOutput2 = new ReusableByteOutStream(); + protected final DataOutputStream dataBytes = new DataOutputStream(byteOutput), dataBytes2 = new DataOutputStream(byteOutput2); protected final ReusableByteOutStream byteOutputSmall = new ReusableByteOutStream(); protected final DataOutputStream dataBytesSmall = new DataOutputStream(byteOutputSmall); + protected boolean chunkNested = false; protected int lastRegionLength; protected @Nullable CounterInputStream currCounter; @@ -112,23 +113,41 @@ public abstract class SaveFileReader{ } /** Write a chunk of input to the stream. An integer of some length is written first, followed by the data. */ - public void writeChunk(DataOutput output, boolean isByte, IORunner runner) throws IOException{ - ReusableByteOutStream dout = isByte ? byteOutputSmall : byteOutput; - //reset output position - dout.reset(); - //write the needed info - runner.accept(isByte ? dataBytesSmall : dataBytes); - int length = dout.size(); - //write length (either int or byte) followed by the output bytes - if(!isByte){ - output.writeInt(length); - }else{ - if(length > 65535){ - throw new IOException("Byte write length exceeded: " + length + " > 65535"); - } - output.writeShort(length); + public void writeChunk(DataOutput output, boolean isShort, IORunner runner) throws IOException{ + + //TODO awful + boolean wasNested = chunkNested; + if(!isShort){ + chunkNested = true; + } + ReusableByteOutStream dout = + isShort ? byteOutputSmall : + wasNested ? byteOutput2 : + byteOutput; + try{ + //reset output position + dout.reset(); + //write the needed info + runner.accept( + isShort ? dataBytesSmall : + wasNested ? dataBytes2 : + dataBytes + ); + + int length = dout.size(); + //write length (either int or byte) followed by the output bytes + if(!isShort){ + output.writeInt(length); + }else{ + if(length > 65535){ + throw new IOException("Byte write length exceeded: " + length + " > 65535"); + } + output.writeShort(length); + } + output.write(dout.getBytes(), 0, length); + }finally{ + chunkNested = wasNested; } - output.write(dout.getBytes(), 0, length); } public int readChunk(DataInput input, IORunner runner) throws IOException{ @@ -148,8 +167,8 @@ public abstract class SaveFileReader{ } /** Skip a chunk completely, discarding the bytes. */ - public void skipChunk(DataInput input, boolean isByte) throws IOException{ - int length = readChunk(input, isByte, t -> {}); + public void skipChunk(DataInput input, boolean isShort) throws IOException{ + int length = readChunk(input, isShort, t -> {}); int skipped = input.skipBytes(length); if(length != skipped){ throw new IOException("Could not skip bytes. Expected length: " + length + "; Actual length: " + skipped); @@ -180,4 +199,10 @@ public abstract class SaveFileReader{ public interface IORunner{ void accept(T stream) throws IOException; } + + public interface CustomChunk{ + void write(DataOutput stream) throws IOException; + void read(DataInput stream) throws IOException; + boolean shouldWrite(); + } } diff --git a/core/src/mindustry/io/SaveIO.java b/core/src/mindustry/io/SaveIO.java index c62abfe30b..d23f360c37 100644 --- a/core/src/mindustry/io/SaveIO.java +++ b/core/src/mindustry/io/SaveIO.java @@ -20,7 +20,7 @@ public class SaveIO{ /** Save format header. */ public static final byte[] header = {'M', 'S', 'A', 'V'}; public static final IntMap versions = new IntMap<>(); - public static final Seq versionArray = Seq.with(new Save1(), new Save2(), new Save3(), new Save4(), new Save5(), new Save6()); + public static final Seq versionArray = Seq.with(new Save1(), new Save2(), new Save3(), new Save4(), new Save5(), new Save6(), new Save7()); static{ for(SaveVersion version : versionArray){ diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java index 14f41fff7d..38fe61ef33 100644 --- a/core/src/mindustry/io/SaveVersion.java +++ b/core/src/mindustry/io/SaveVersion.java @@ -23,7 +23,9 @@ import java.util.*; import static mindustry.Vars.*; public abstract class SaveVersion extends SaveFileReader{ - public int version; + protected static OrderedMap customChunks = new OrderedMap<>(); + + public final int version; //HACK stores the last read build of the save file, valid after read meta call protected int lastReadBuild; @@ -31,6 +33,14 @@ public abstract class SaveVersion extends SaveFileReader{ //if null, fall back to EntityMapping's values protected @Nullable Prov[] entityMapping; + /** + * Registers a custom save chunk reader/writer by name. This is mostly used for mods that need to save extra data. + * @param name a mod-specific, unique name for identifying this chunk. Prefixing is recommended. + * */ + public static void addCustomChunk(String name, CustomChunk chunk){ + customChunks.put(name, chunk); + } + public SaveVersion(int version){ this.version = version; } @@ -56,23 +66,49 @@ public abstract class SaveVersion extends SaveFileReader{ } @Override - public final void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{ + public void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{ region("meta", stream, counter, this::readMeta); region("content", stream, counter, this::readContentHeader); try{ region("map", stream, counter, in -> readMap(in, context)); region("entities", stream, counter, this::readEntities); + region("custom", stream, counter, this::readCustomChunks); }finally{ content.setTemporaryMapper(null); } } - public final void write(DataOutputStream stream, StringMap extraTags) throws IOException{ + public void write(DataOutputStream stream, StringMap extraTags) throws IOException{ region("meta", stream, out -> writeMeta(out, extraTags)); region("content", stream, this::writeContentHeader); region("map", stream, this::writeMap); region("entities", stream, this::writeEntities); + region("custom", stream, this::writeCustomChunks); + } + + public void writeCustomChunks(DataOutput stream) throws IOException{ + var chunks = customChunks.orderedKeys().select(s -> customChunks.get(s).shouldWrite()); + stream.writeInt(chunks.size); + for(var chunkName : chunks){ + var chunk = customChunks.get(chunkName); + stream.writeUTF(chunkName); + + writeChunk(stream, false, chunk::write); + } + } + + public void readCustomChunks(DataInput stream) throws IOException{ + int amount = stream.readInt(); + for(int i = 0; i < amount; i++){ + String name = stream.readUTF(); + var chunk = customChunks.get(name); + if(chunk != null){ + readChunk(stream, false, chunk::read); + }else{ + skipChunk(stream); + } + } } public void writeMeta(DataOutput stream, StringMap tags) throws IOException{ diff --git a/core/src/mindustry/io/versions/Save6.java b/core/src/mindustry/io/versions/Save6.java index 7e0a5aff77..8e9af9fd23 100644 --- a/core/src/mindustry/io/versions/Save6.java +++ b/core/src/mindustry/io/versions/Save6.java @@ -1,10 +1,31 @@ package mindustry.io.versions; +import arc.util.io.*; import mindustry.io.*; +import mindustry.world.*; +import java.io.*; + +import static mindustry.Vars.*; + +/** This version does not read custom chunk data. */ public class Save6 extends SaveVersion{ public Save6(){ super(6); } + + @Override + public void read(DataInputStream stream, CounterInputStream counter, WorldContext context) throws IOException{ + region("meta", stream, counter, this::readMeta); + region("content", stream, counter, this::readContentHeader); + + try{ + region("map", stream, counter, in -> readMap(in, context)); + region("entities", stream, counter, this::readEntities); + }finally{ + content.setTemporaryMapper(null); + + } + } } diff --git a/core/src/mindustry/io/versions/Save7.java b/core/src/mindustry/io/versions/Save7.java new file mode 100644 index 0000000000..dde5dc8b8c --- /dev/null +++ b/core/src/mindustry/io/versions/Save7.java @@ -0,0 +1,10 @@ +package mindustry.io.versions; + +import mindustry.io.*; + +public class Save7 extends SaveVersion{ + + public Save7(){ + super(7); + } +} diff --git a/gradle.properties b/gradle.properties index 522dec1f29..120d869fe2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=243eb136dc +archash=502eb9934e