From 052620c0f02aad8c203cfe686d9b999fd7b965f9 Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Mon, 28 Apr 2025 18:14:32 +0200 Subject: [PATCH] Unit test fixes --- src/Participants/ParticipantUDP.cs | 12 +++++++----- src/Participants/SiteServer.cs | 4 ++-- src/Thing.cs | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/Participants/ParticipantUDP.cs b/src/Participants/ParticipantUDP.cs index 440d552..2dced60 100644 --- a/src/Participants/ParticipantUDP.cs +++ b/src/Participants/ParticipantUDP.cs @@ -365,7 +365,7 @@ namespace RoboidControl { Console.WriteLine($"Participant: Process NameMsg [{msg.networkId}/{msg.thingId}] {msg.nameLength} {msg.name}"); #endif - Thing thing = sender.Get(msg.networkId, msg.thingId); + Thing thing = sender.Get(msg.thingId); if (thing != null) thing.name = msg.name; } @@ -375,7 +375,7 @@ namespace RoboidControl { Console.WriteLine($"Participant: Process ModelUrlMsg [{msg.networkId}/{msg.thingId}] {msg.urlLength} {msg.url}"); #endif - Thing thing = sender.Get(msg.networkId, msg.thingId); + Thing thing = sender.Get(msg.thingId); if (thing != null) thing.modelUrl = msg.url; } @@ -384,7 +384,7 @@ namespace RoboidControl { #if DEBUG Console.WriteLine($"Participant: Process PoseMsg [{msg.networkId}/{msg.thingId}] {msg.poseType}"); #endif - Thing thing = sender.Get(msg.networkId, msg.thingId); + Thing thing = sender.Get(msg.thingId); if (thing != null) { if ((msg.poseType & PoseMsg.Pose_Position) != 0) thing.position = msg.position; @@ -405,7 +405,7 @@ namespace RoboidControl { #if DEBUG Console.WriteLine($"Participant: Process BinaryMsg [{msg.networkId}/{msg.thingId}] {msg.dataLength}"); #endif - Thing thing = sender.Get(msg.networkId, msg.thingId); + Thing thing = sender.Get(msg.thingId); thing?.ProcessBinary(msg.data); } @@ -420,10 +420,12 @@ namespace RoboidControl { #if DEBUG Console.WriteLine($"Participant: Process Destroy Msg [{msg.networkId}/{msg.thingId}]"); #endif - Thing thing = sender.Get(msg.networkId, msg.thingId); + Thing thing = sender.Get(msg.thingId); if (thing != null) this.Remove(thing); +#if UNITY_5_3_OR_NEWER thing.component.core = null; +#endif } private void ForwardMessage(IMessage msg) { diff --git a/src/Participants/SiteServer.cs b/src/Participants/SiteServer.cs index 22b78d1..6dce552 100644 --- a/src/Participants/SiteServer.cs +++ b/src/Participants/SiteServer.cs @@ -105,7 +105,7 @@ namespace RoboidControl { protected override void Process(Participant sender, ThingMsg msg) { Console.WriteLine($"SiteServer: Process thing [{msg.networkId}/{msg.thingId}] {msg.thingType} {msg.parentId} "); - Thing thing = sender.Get(msg.networkId, msg.thingId); + Thing thing = sender.Get(msg.thingId); if (thing == null) { switch (msg.thingType) { case (byte)Thing.Type.TouchSensor: @@ -118,7 +118,7 @@ namespace RoboidControl { thing = new Thing(sender, msg.networkId, msg.thingId, msg.thingType); if (msg.parentId != 0) { - thing.parent = sender.Get(msg.networkId, msg.parentId); + thing.parent = sender.Get(msg.parentId); if (thing.parent == null) Console.WriteLine($"Could not find parent [{msg.networkId}/{msg.parentId}]"); } diff --git a/src/Thing.cs b/src/Thing.cs index 9ebd00f..1a90ebb 100644 --- a/src/Thing.cs +++ b/src/Thing.cs @@ -357,6 +357,8 @@ namespace RoboidControl { public static ulong GetTimeMs() { #if UNITY_5_3_OR_NEWER return (ulong)(UnityEngine.Time.time * 1000); +#else + return TimeManager.GetCurrentTimeMilliseconds(); #endif } @@ -365,7 +367,7 @@ namespace RoboidControl { /// /// When true, this will Update the descendants recursively public void Update(bool recursively = false) { - Update(TimeManager.GetCurrentTimeMilliseconds(), recursively); + Update(GetTimeMs(), recursively); } // #endif ///