RoboidControl/RoboidControl-csharp
RoboidControl/RoboidControl-csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add networkId to msg constructors

Browse Source
This commit is contained in:
Pascal Serrarens 2024-12-09 17:13:38 +01:00
parent 71ca0eb1f8
commit 6e5b923f97
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Messages.cs
View File

@ -196,7 +196,7 @@ namespace Passer.Control {
public byte thingType; public byte thingType;
public byte parentId; public byte parentId;
public ThingMsg(byte thingId, byte thingType, byte parentId) { public ThingMsg(byte networkId, byte thingId, byte thingType, byte parentId) {
this.thingId = thingId; this.thingId = thingId;
this.thingType = thingType; this.thingType = thingType;
this.parentId = parentId; this.parentId = parentId;
@ -222,7 +222,7 @@ namespace Passer.Control {
} }
public static bool Send(Client client, byte thingId, byte thingType, byte parentId) { public static bool Send(Client client, byte thingId, byte thingType, byte parentId) {
ThingMsg msg = new(thingId, thingType, parentId); ThingMsg msg = new(client.networkId, thingId, thingType, parentId);
return SendMsg(client, msg); return SendMsg(client, msg);
} }
public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) { public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) {
@ -249,7 +249,8 @@ namespace Passer.Control {
public byte len; public byte len;
public string name; public string name;
public NameMsg(byte thingId, string name) { public NameMsg(byte networkId, byte thingId, string name) {
this.networkId = networkId;
this.thingId = thingId; this.thingId = thingId;
this.name = name; this.name = name;
} }
@ -274,7 +275,7 @@ namespace Passer.Control {
} }
public static bool Send(Client client, byte thingId, string name) { public static bool Send(Client client, byte thingId, string name) {
NameMsg msg = new(thingId, name); NameMsg msg = new(client.networkId, thingId, name);
return SendMsg(client, msg); return SendMsg(client, msg);
} }
public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) { public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) {
@ -298,7 +299,8 @@ namespace Passer.Control {
public float scale; public float scale;
public string url; public string url;
public ModelUrlMsg(byte thingId, string url, float scale = 1) { public ModelUrlMsg(byte networkId, byte thingId, string url, float scale = 1) {
this.networkId = networkId;
this.thingId = thingId; this.thingId = thingId;
this.url = url; this.url = url;
this.scale = scale; this.scale = scale;
@ -329,7 +331,7 @@ namespace Passer.Control {
} }
public static bool Send(Client client, byte thingId, string modelUrl) { public static bool Send(Client client, byte thingId, string modelUrl) {
ModelUrlMsg msg = new(thingId, modelUrl); ModelUrlMsg msg = new(client.networkId, thingId, modelUrl);
return SendMsg(client, msg); return SendMsg(client, msg);
} }
public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) { public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) {
@ -357,7 +359,8 @@ namespace Passer.Control {
public Spherical position; public Spherical position;
public Quat32 orientation; public Quat32 orientation;
public PoseMsg(byte thingId, Spherical position, Quat32 orientation) { public PoseMsg(byte networkId, byte thingId, Spherical position, Quat32 orientation) {
this.networkId = networkId;
this.thingId = thingId; this.thingId = thingId;
this.position = position; this.position = position;
this.orientation = orientation; this.orientation = orientation;
@ -381,24 +384,24 @@ namespace Passer.Control {
buffer[ix++] = this.thingId; buffer[ix++] = this.thingId;
buffer[ix++] = this.poseType; buffer[ix++] = this.poseType;
LowLevelMessages.SendSpherical(buffer, ref ix, position); LowLevelMessages.SendSpherical(buffer, ref ix, this.position);
LowLevelMessages.SendQuat32(buffer, ref ix, orientation); LowLevelMessages.SendQuat32(buffer, ref ix, this.orientation);
return buffer; return buffer;
} }
public override void Deserialize(byte[] buffer) { public override void Deserialize(byte[] buffer) {
byte ix = 0; byte ix = 0;
thingId = buffer[ix++]; this.networkId = buffer[ix++];
thingId = buffer[ix++]; this.thingId = buffer[ix++];
poseType = buffer[ix++]; this.poseType = buffer[ix++];
//if ((poseType & Pose_Position) != 0) //if ((poseType & Pose_Position) != 0)
position = LowLevelMessages.ReceiveSpherical(buffer, ref ix); this.position = LowLevelMessages.ReceiveSpherical(buffer, ref ix);
//if ((poseType & Pose_Orientation) != 0) { //if ((poseType & Pose_Orientation) != 0) {
orientation = LowLevelMessages.ReceiveQuat32(buffer, ref ix); this.orientation = LowLevelMessages.ReceiveQuat32(buffer, ref ix);
} }
public static bool Send(Client client, byte thingId, Spherical position, Quat32 orientation) { public static bool Send(Client client, byte thingId, Spherical position, Quat32 orientation) {
PoseMsg msg = new(thingId, position, orientation); PoseMsg msg = new(client.networkId, thingId, position, orientation);
return SendMsg(client, msg); return SendMsg(client, msg);
} }
public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) { public static async Task<bool> Receive(Stream dataStream, Client client, byte packetSize) {