From efd645a891f9dce103f5af4bf5529b226865d6f7 Mon Sep 17 00:00:00 2001 From: shosatojp Date: Thu, 8 Apr 2021 11:00:14 +0900 Subject: [PATCH 1/3] ToString --- StreamServerCommonLibrary/MinimumAvatarPacket.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/StreamServerCommonLibrary/MinimumAvatarPacket.cs b/StreamServerCommonLibrary/MinimumAvatarPacket.cs index 654a4f6..c15dbd0 100644 --- a/StreamServerCommonLibrary/MinimumAvatarPacket.cs +++ b/StreamServerCommonLibrary/MinimumAvatarPacket.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace CommonLibrary { @@ -43,7 +43,7 @@ public MinimumAvatarPacket(ulong paketId, Vector3 position, int radY, Vector4 ne this.time = time; } - + /// /// Rangeが決まっているものについてチェックする /// @@ -57,5 +57,10 @@ public bool CheckRange() var neckW = this.NeckRotation.w; return Math.Abs(radY) < 128 && Math.Abs(neckX) < 128 && Math.Abs(neckY) < 128 && Math.Abs(neckZ) < 128 && Math.Abs(neckW) < 128; } + + public override string ToString() + { + return $"{{ Id={PaketId}, Pos={{{Position.x}, {Position.y}, {Position.z}}}, RadY={RadY}, Time={time}, Neck={{{NeckRotation.x}, {NeckRotation.y}, {NeckRotation.z}, {NeckRotation.w}}} }}"; + } } } \ No newline at end of file From 45cd1a1588470fdb9effe48624cb753ee12b7283 Mon Sep 17 00:00:00 2001 From: shosatojp Date: Thu, 8 Apr 2021 11:14:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E3=83=90=E3=82=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StreamServerCommonLibrary/Utility.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/StreamServerCommonLibrary/Utility.cs b/StreamServerCommonLibrary/Utility.cs index e94dad3..30377d5 100644 --- a/StreamServerCommonLibrary/Utility.cs +++ b/StreamServerCommonLibrary/Utility.cs @@ -33,11 +33,11 @@ public static MinimumAvatarPacket BufferToPacket(byte[] buf) var y = BitConverter.ToInt16(buf, offset += sizeof(short)); var z = BitConverter.ToInt16(buf, offset += sizeof(short)); offset += sizeof(short); - var radY = PacketUtil.ConvertInt(buf[offset]); - var qx = PacketUtil.ConvertInt(buf[offset + 1]); - var qy = PacketUtil.ConvertInt(buf[offset + 2]); - var qz = PacketUtil.ConvertInt(buf[offset + 3]); - var qw = PacketUtil.ConvertInt(buf[offset + 4]); + var radY = (sbyte)buf[offset]; + var qx = (sbyte)buf[offset + 1]; + var qy = (sbyte)buf[offset + 2]; + var qz = (sbyte)buf[offset + 3]; + var qw = (sbyte)buf[offset + 4]; var time = BitConverter.ToDouble(buf, offset + 5); MinimumAvatarPacket packet = new MinimumAvatarPacket(userId, new Vector3(x, y, z), radY, @@ -66,11 +66,11 @@ public static List BufferToPackets(byte[] buf) var y = BitConverter.ToInt16(buf, offset += sizeof(short)); var z = BitConverter.ToInt16(buf, offset += sizeof(short)); offset += sizeof(short); - var radY = PacketUtil.ConvertInt(buf[offset]); - var qx = PacketUtil.ConvertInt(buf[offset + 1]); - var qy = PacketUtil.ConvertInt(buf[offset + 2]); - var qz = PacketUtil.ConvertInt(buf[offset + 3]); - var qw = PacketUtil.ConvertInt(buf[offset + 4]); + var radY = (sbyte)buf[offset]; + var qx = (sbyte)buf[offset + 1]; + var qy = (sbyte)buf[offset + 2]; + var qz = (sbyte)buf[offset + 3]; + var qw = (sbyte)buf[offset + 4]; var time = BitConverter.ToDouble(buf, offset + 5); MinimumAvatarPacket packet = new MinimumAvatarPacket(userId, new Vector3(x, y, z), radY, From 26f33871cbbbeca91482b67344ae3fef51372788 Mon Sep 17 00:00:00 2001 From: shosatojp Date: Thu, 8 Apr 2021 11:20:15 +0900 Subject: [PATCH 3/3] disable warnings --- StreamServer/Source/StreamServer/StatusCheckLoop.cs | 1 + .../Exception/MinimumAvatarPacketCreativeException.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/StreamServer/Source/StreamServer/StatusCheckLoop.cs b/StreamServer/Source/StreamServer/StatusCheckLoop.cs index fe0df07..d9281c8 100644 --- a/StreamServer/Source/StreamServer/StatusCheckLoop.cs +++ b/StreamServer/Source/StreamServer/StatusCheckLoop.cs @@ -16,6 +16,7 @@ public StatusCheckLoop(int interval, ulong id, InputLoop inputLoop, OutputLoop o this.outputLoop = outputLoop; } + #pragma warning disable CS1998 protected override async Task Update(int count) { Printer.PrintDbg($"Num clients: {ModelManager.Instance.Users.Count.ToString()}"); diff --git a/StreamServerCommonLibrary/Exception/MinimumAvatarPacketCreativeException.cs b/StreamServerCommonLibrary/Exception/MinimumAvatarPacketCreativeException.cs index b8e7d8a..188c97d 100644 --- a/StreamServerCommonLibrary/Exception/MinimumAvatarPacketCreativeException.cs +++ b/StreamServerCommonLibrary/Exception/MinimumAvatarPacketCreativeException.cs @@ -1,6 +1,7 @@ using System; using System.Runtime.Serialization; +#nullable enable namespace CommonLibrary.Exception { [Serializable]