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

LZ4 compression

Browse Source
This commit is contained in:
Anuken
2018-09-08 17:07:25 -04:00
parent 8dbdbe6d6c
commit 46a8edb781
10 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -190,7 +190,7 @@ public class NetClient extends Module{
}
@Remote(variants = Variant.one, priority = PacketPriority.low, unreliable = true)
public static void onSnapshot(byte[] chunk, int snapshotID, short chunkID, int totalLength){
public static void onSnapshot(byte[] chunk, int snapshotID, short chunkID, int totalLength, int uncompressedLength){
int totalChunks = Mathf.ceil((float) totalLength / NetServer.maxSnapshotSize);
if(NetServer.debugSnapshots)
@@ -234,8 +234,8 @@ public class NetClient extends Module{
if(NetServer.debugSnapshots)
Log.info("Finished recieving snapshot ID {0} length {1}", snapshotID, chunk.length);
byte[] result = snapshot;
int length = snapshot.length;
byte[] result = Net.decompressSnapshot(snapshot, uncompressedLength);
int length = result.length;
netClient.lastSnapshotBaseID = snapshotID;

10
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -228,9 +228,9 @@ public class NetServer extends Module{
}
/** Sends a raw byte[] snapshot to a client, splitting up into chunks when needed.*/
private static void sendSplitSnapshot(int userid, byte[] bytes, int snapshotID){
private static void sendSplitSnapshot(int userid, byte[] bytes, int snapshotID, int uncompressedLength){
if(bytes.length < maxSnapshotSize){
scheduleSnapshot(() -> Call.onSnapshot(userid, bytes, snapshotID, (short) 0, bytes.length));
scheduleSnapshot(() -> Call.onSnapshot(userid, bytes, snapshotID, (short) 0, bytes.length, uncompressedLength));
}else{
int remaining = bytes.length;
int offset = 0;
@@ -247,7 +247,7 @@ public class NetServer extends Module{
}
short fchunk = (short)chunkid;
scheduleSnapshot(() -> Call.onSnapshot(userid, toSend, snapshotID, fchunk, bytes.length));
scheduleSnapshot(() -> Call.onSnapshot(userid, toSend, snapshotID, fchunk, bytes.length, uncompressedLength));
remaining -= used;
offset += used;
@@ -608,10 +608,12 @@ public class NetServer extends Module{
dataStream.close();
byte[] bytes = syncStream.toByteArray();
int uncompressed = bytes.length;
bytes = Net.compressSnapshot(bytes);
int snapid = connection.lastSentSnapshotID ++;
if(debugSnapshots) Log.info("Sent snapshot: {0} bytes.", bytes.length);
sendSplitSnapshot(connection.id, bytes, snapid);
sendSplitSnapshot(connection.id, bytes, snapid, uncompressed);
}
}catch(IOException e){

86
core/src/io/anuke/mindustry/net/Net.java
View File

@@ -119,6 +119,14 @@ public class Net{
active = false;
}
public static byte[] compressSnapshot(byte[] input){
return serverProvider.compressSnapshot(input);
}
public static byte[] decompressSnapshot(byte[] input, int size){
return clientProvider.decompressSnapshot(input, size);
}
/**
* Starts discovering servers on a different thread. Does not work with GWT.
* Callback is run on the main libGDX thread.
@@ -337,99 +345,69 @@ public class Net{
tcp, udp
}
/**
* Client implementation.
*/
/**Client implementation.*/
public interface ClientProvider{
/**
* Connect to a server.
*/
/**Connect to a server.*/
void connect(String ip, int port) throws IOException;
/**
* Send an object to the server.
*/
/**Send an object to the server.*/
void send(Object object, SendMode mode);
/**
* Update the ping. Should be done every second or so.
*/
/**Update the ping. Should be done every second or so.*/
void updatePing();
/**
* Get ping in milliseconds. Will only be valid after a call to updatePing.
*/
/**Get ping in milliseconds. Will only be valid after a call to updatePing.*/
int getPing();
/**
* Disconnect from the server.
*/
/**Disconnect from the server.*/
void disconnect();
/**Decompress an input snapshot byte array.*/
byte[] decompressSnapshot(byte[] input, int size);
/**
* Discover servers. This should run the callback regardless of whether any servers are found. Should not block.
* Callback should be run on libGDX main thread.
*/
void discover(Consumer<Array<Host>> callback);
/**
* Ping a host. If an error occured, failed() should be called with the exception.
*/
/**Ping a host. If an error occured, failed() should be called with the exception.*/
void pingHost(String address, int port, Consumer<Host> valid, Consumer<Exception> failed);
/**
* Close all connections.
*/
/**Close all connections.*/
void dispose();
}
/**
* Server implementation.
*/
/**Server implementation.*/
public interface ServerProvider{
/**
* Host a server at specified port.
*/
/**Host a server at specified port.*/
void host(int port) throws IOException;
/**
* Sends a large stream of data to a specific client.
*/
/**Sends a large stream of data to a specific client.*/
void sendStream(int id, Streamable stream);
/**
* Send an object to everyone connected.
*/
/**Send an object to everyone connected.*/
void send(Object object, SendMode mode);
/**
* Send an object to a specific client ID.
*/
/**Send an object to a specific client ID.*/
void sendTo(int id, Object object, SendMode mode);
/**
* Send an object to everyone <i>except</i> a client ID.
*/
/**Send an object to everyone <i>except</i> a client ID.*/
void sendExcept(int id, Object object, SendMode mode);
/**
* Close the server connection.
*/
/**Close the server connection.*/
void close();
/**
* Return all connected users.
*/
/**Compress an input snapshot byte array.*/
byte[] compressSnapshot(byte[] input);
/**Return all connected users.*/
Array<? extends NetConnection> getConnections();
/**
* Returns a connection by ID.
*/
/**Returns a connection by ID.*/
NetConnection getByID(int id);
/**
* Close all connections.
*/
/**Close all connections.*/
void dispose();
}
}

3
core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
View File

@@ -5,7 +5,6 @@ import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.consumers.ConsumeItem;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw;
public class Fracker extends SolidPump{
@@ -70,7 +69,7 @@ public class Fracker extends SolidPump{
if(entity.cons.valid() && entity.accumulator < itemUseTime){
super.update(tile);
entity.accumulator += Timers.delta();
entity.accumulator += entity.delta();
}else{
tryDumpLiquid(tile, result);
}

2
core/src/io/anuke/mindustry/world/blocks/production/PowerCrafter.java
View File

@@ -64,7 +64,7 @@ public class PowerCrafter extends Block{
GenericCrafterEntity entity = tile.entity();
if(entity.cons.valid()){
entity.progress += 1f / craftTime;
entity.progress += 1f / craftTime * entity.delta();
entity.totalProgress += entity.delta();
}

4
core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
View File

@@ -101,7 +101,7 @@ public class PowerSmelter extends PowerBlock{
//heat it up if there's enough power
if(entity.cons.valid()){
entity.heat += 1f / heatUpTime * entity.delta();
if(Mathf.chance(Timers.delta() * burnEffectChance))
if(Mathf.chance(entity.delta() * burnEffectChance))
Effects.effect(burnEffect, entity.x + Mathf.range(size * 4f), entity.y + Mathf.range(size * 4));
}else{
entity.heat -= 1f / heatUpTime * Timers.delta();
@@ -122,6 +122,8 @@ public class PowerSmelter extends PowerBlock{
}
}
entity.craftTime += entity.delta();
if(entity.items.get(result) >= itemCapacity //output full
|| entity.heat <= minHeat //not burning
|| entity.craftTime < craftTime*baseSmeltSpeed){ //not yet time

4
core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
View File

@@ -80,13 +80,13 @@ public class SolidPump extends Pump{
float maxPump = Math.min(liquidCapacity - typeLiquid(tile), pumpAmount * entity.delta() * fraction);
tile.entity.liquids.add(result, maxPump);
entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f);
if(Mathf.chance(Timers.delta() * updateEffectChance))
if(Mathf.chance(entity.delta() * updateEffectChance))
Effects.effect(updateEffect, entity.x + Mathf.range(size * 2f), entity.y + Mathf.range(size * 2f));
}else{
entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.02f);
}
entity.pumpTime += entity.warmup * Timers.delta();
entity.pumpTime += entity.warmup * entity.delta();
tryDumpLiquid(tile, result);
}