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

First client/server snapshot implementation

Browse Source
This commit is contained in:
Anuken
2018-06-08 12:22:07 -04:00
parent 0bd0602655
commit 8e00bdcf30
7 changed files with 132 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/net/NetConnection.java
View File

@@ -7,9 +7,12 @@ public abstract class NetConnection {
public final String address;
/**ID of last snapshot this connection is guaranteed to have recieved.*/
public int lastSnapshotID;
/**Byte array of last sent snapshot data that is confirmed to be recieved..*/
public int lastSnapshotID = -1;
/**Byte array of last sent snapshot data that is confirmed to be recieved.*/
public byte[] lastSnapshot;
/**ID of last sent snapshot.*/
public int lastSentSnapshotID = -1;
/**Byte array of last sent snapshot.*/
public byte[] lastSentSnapshot;

12
core/src/io/anuke/mindustry/net/NetEvents.java
View File

@@ -1,17 +1,5 @@
package io.anuke.mindustry.net;
import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.entities.Player;
public class NetEvents {
@Remote(one = true, all = false, unreliable = true)
public static void onSnapshot(byte[] snapshot, int snapshotID){
}
@Remote(unreliable = true, server = false)
public static void onRecievedSnapshot(Player player, int snapshotID){
Net.getConnection(player.clientid).lastSnapshotID = snapshotID;
}
}

3
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -100,11 +100,13 @@ public class Packets {
public static class ClientSnapshotPacket implements Packet{
public Player player;
public int lastSnapshot;
@Override
public void write(ByteBuffer buffer) {
ByteBufferOutput out = new ByteBufferOutput(buffer);
buffer.putInt(lastSnapshot);
buffer.putInt(player.id);
buffer.putLong(TimeUtils.millis());
player.write(out);
@@ -114,6 +116,7 @@ public class Packets {
public void read(ByteBuffer buffer) {
ByteBufferInput in = new ByteBufferInput(buffer);
lastSnapshot = buffer.getInt();
int id = buffer.getInt();
long time = buffer.getLong();
player = Vars.playerGroup.getByID(id);