From 88483373ee9af9192d06cb6815f0477c7f2e06c5 Mon Sep 17 00:00:00 2001 From: Oliver Booth Date: Wed, 30 Nov 2022 18:25:05 +0000 Subject: [PATCH] Fix spacing --- VpSharp.Commands/CommandsExtension.cs | 1 - VpSharp/src/Entities/VirtualParadiseObject.cs | 6 +++--- ...ualParadiseParticleEmitterObjectBuilder.cs | 7 +++++-- VpSharp/src/Entities/VirtualParadisePath.cs | 2 +- .../src/Entities/VirtualParadisePathObject.cs | 2 +- VpSharp/src/Entities/VirtualParadiseUser.cs | 6 +++--- VpSharp/src/Internal/Connection.cs | 10 +++++----- VpSharp/src/Internal/ReasonCode.cs | 8 ++++---- .../ValueConverters/ValueConverter.cs | 2 +- .../ValueConverters/Vector2Converter.cs | 4 ++-- .../ValueConverters/Vector3Converter.cs | 4 ++-- .../Vector3ToColorConverter.cs | 4 ++-- .../ValueConverters/Vector3dConverter.cs | 4 ++-- .../Vector4ToColorConverter.cs | 4 ++-- .../Vector4ToVector3Converter.cs | 4 ++-- .../VectorToNthComponentConverter.cs | 4 ++-- VpSharp/src/Vector3d.cs | 2 +- VpSharp/src/VirtualParadiseClient.Avatars.cs | 6 +++--- VpSharp/src/VirtualParadiseClient.Native.cs | 2 +- .../src/VirtualParadiseClient.NativeEvents.cs | 20 +++++++++---------- VpSharp/src/VirtualParadiseClient.Objects.cs | 2 +- VpSharp/src/VirtualParadiseClient.cs | 1 - 22 files changed, 53 insertions(+), 52 deletions(-) diff --git a/VpSharp.Commands/CommandsExtension.cs b/VpSharp.Commands/CommandsExtension.cs index ebe8fee..b71bdfe 100644 --- a/VpSharp.Commands/CommandsExtension.cs +++ b/VpSharp.Commands/CommandsExtension.cs @@ -36,7 +36,6 @@ public sealed class CommandsExtension : VirtualParadiseClientExtension /// /// The assembly whose command modules to register. /// - /// /// /// A command module could not be instantiated. /// diff --git a/VpSharp/src/Entities/VirtualParadiseObject.cs b/VpSharp/src/Entities/VirtualParadiseObject.cs index 2f6b35a..71eb880 100644 --- a/VpSharp/src/Entities/VirtualParadiseObject.cs +++ b/VpSharp/src/Entities/VirtualParadiseObject.cs @@ -137,7 +137,7 @@ public abstract class VirtualParadiseObject : IEquatable lock (Client.Lock) { int session = target?.Session ?? 0; - (float x, float y, float z) = (Vector3) (position ?? Vector3d.Zero); + (float x, float y, float z) = (Vector3)(position ?? Vector3d.Zero); _ = vp_object_click(Client.NativeInstanceHandle, Id, session, x, y, z); } @@ -154,7 +154,7 @@ public abstract class VirtualParadiseObject : IEquatable { lock (Client.Lock) { - var reason = (ReasonCode) vp_object_delete(Client.NativeInstanceHandle, Id); + var reason = (ReasonCode)vp_object_delete(Client.NativeInstanceHandle, Id); switch (reason) { @@ -207,7 +207,7 @@ public abstract class VirtualParadiseObject : IEquatable return false; } - return Equals((VirtualParadiseObject) obj); + return Equals((VirtualParadiseObject)obj); } /// diff --git a/VpSharp/src/Entities/VirtualParadiseParticleEmitterObjectBuilder.cs b/VpSharp/src/Entities/VirtualParadiseParticleEmitterObjectBuilder.cs index 005fd0b..d69b1d1 100644 --- a/VpSharp/src/Entities/VirtualParadiseParticleEmitterObjectBuilder.cs +++ b/VpSharp/src/Entities/VirtualParadiseParticleEmitterObjectBuilder.cs @@ -70,7 +70,10 @@ public sealed class VirtualParadiseParticleEmitterObjectBuilder : VirtualParadis /// /// Gets or sets a value indicating whether this emitter interpolates its values. /// - /// if this emitter interpolates its values; otherwise, , or to leave unchanged. + /// + /// if this emitter interpolates its values; otherwise, , or + /// to leave unchanged. + /// [SerializationKey("interpolate")] [ValueConverter(typeof(IntToBoolConverter))] public bool? Interpolate { get; set; } @@ -473,4 +476,4 @@ public sealed class VirtualParadiseParticleEmitterObjectBuilder : VirtualParadis Texture = value; return this; } -} \ No newline at end of file +} diff --git a/VpSharp/src/Entities/VirtualParadisePath.cs b/VpSharp/src/Entities/VirtualParadisePath.cs index 044777f..26b7adb 100644 --- a/VpSharp/src/Entities/VirtualParadisePath.cs +++ b/VpSharp/src/Entities/VirtualParadisePath.cs @@ -42,4 +42,4 @@ public sealed class VirtualParadisePath : ICloneable { return new VirtualParadisePath(Easing, Name, Points, IsClosed); } -} \ No newline at end of file +} diff --git a/VpSharp/src/Entities/VirtualParadisePathObject.cs b/VpSharp/src/Entities/VirtualParadisePathObject.cs index cc4f781..5a829d6 100644 --- a/VpSharp/src/Entities/VirtualParadisePathObject.cs +++ b/VpSharp/src/Entities/VirtualParadisePathObject.cs @@ -159,4 +159,4 @@ public sealed class VirtualParadisePathObject : VirtualParadiseObject Path = new VirtualParadisePath((PathEasing)pathType, name, points, closed == 1); } -} \ No newline at end of file +} diff --git a/VpSharp/src/Entities/VirtualParadiseUser.cs b/VpSharp/src/Entities/VirtualParadiseUser.cs index f8836d9..938e2cf 100644 --- a/VpSharp/src/Entities/VirtualParadiseUser.cs +++ b/VpSharp/src/Entities/VirtualParadiseUser.cs @@ -131,7 +131,7 @@ public sealed class VirtualParadiseUser : IEquatable if (_client.CurrentAvatar is not { } avatar) { ThrowHelper.ThrowNotInWorldException(); - return (InviteResponse) (-1); + return (InviteResponse)(-1); } location ??= avatar.Location; @@ -209,8 +209,8 @@ public sealed class VirtualParadiseUser : IEquatable y = vp_double(handle, FloatAttribute.JoinY); z = vp_double(handle, FloatAttribute.JoinZ); - yaw = (float) vp_double(handle, FloatAttribute.JoinYaw); - pitch = (float) vp_double(handle, FloatAttribute.JoinPitch); + yaw = (float)vp_double(handle, FloatAttribute.JoinYaw); + pitch = (float)vp_double(handle, FloatAttribute.JoinPitch); worldName = vp_string(handle, StringAttribute.JoinWorld); } diff --git a/VpSharp/src/Internal/Connection.cs b/VpSharp/src/Internal/Connection.cs index c5126ff..406abe9 100644 --- a/VpSharp/src/Internal/Connection.cs +++ b/VpSharp/src/Internal/Connection.cs @@ -30,7 +30,7 @@ internal sealed class Connection : IDisposable public int Connect(string host, ushort port) { _socket.BeginConnect(host, port, ConnectCallback, this); - return (int) NetworkReturnCode.Success; + return (int)NetworkReturnCode.Success; } public void Dispose() @@ -120,10 +120,10 @@ internal sealed class Connection : IDisposable { if (_readyBuffers.Count == 0) { - return (int) NetworkReturnCode.WouldBlock; + return (int)NetworkReturnCode.WouldBlock; } - var spaceLeft = (int) length; + var spaceLeft = (int)length; nint destination = data; int i; @@ -148,7 +148,7 @@ internal sealed class Connection : IDisposable _readyBuffers.RemoveRange(0, i); - return (int) (length - spaceLeft); + return (int)(length - spaceLeft); } private static void ReceiveCallback(IAsyncResult ar) @@ -218,7 +218,7 @@ internal sealed class Connection : IDisposable public int Send(nint data, uint length) { var buffer = new byte[length]; - Marshal.Copy(data, buffer, 0, (int) length); + Marshal.Copy(data, buffer, 0, (int)length); try { return _socket.Send(buffer); diff --git a/VpSharp/src/Internal/ReasonCode.cs b/VpSharp/src/Internal/ReasonCode.cs index 9fe914a..56467dc 100644 --- a/VpSharp/src/Internal/ReasonCode.cs +++ b/VpSharp/src/Internal/ReasonCode.cs @@ -1,4 +1,4 @@ -namespace VpSharp.Internal; +namespace VpSharp.Internal; internal enum ReasonCode { @@ -45,7 +45,7 @@ internal enum ReasonCode WorldLoginError, /// - /// A world request was made while not being connected to a world server. + /// A world request was made while not being connected to a world server. /// NotInWorld, @@ -86,12 +86,12 @@ internal enum ReasonCode NoSuchUser, /// - /// Timeout + /// Timeout /// Timeout, /// - /// The instance is not connected to a universe. + /// The instance is not connected to a universe. /// NotInUniverse, diff --git a/VpSharp/src/Internal/ValueConverters/ValueConverter.cs b/VpSharp/src/Internal/ValueConverters/ValueConverter.cs index fa4a564..3c5957f 100644 --- a/VpSharp/src/Internal/ValueConverters/ValueConverter.cs +++ b/VpSharp/src/Internal/ValueConverters/ValueConverter.cs @@ -22,7 +22,7 @@ internal abstract class ValueConverter : ValueConverter /// public override void Serialize(TextWriter writer, object value) { - Serialize(writer, (T) value); + Serialize(writer, (T)value); } public abstract void Deserialize(TextReader reader, out T result); diff --git a/VpSharp/src/Internal/ValueConverters/Vector2Converter.cs b/VpSharp/src/Internal/ValueConverters/Vector2Converter.cs index f4f98d7..0d324f6 100644 --- a/VpSharp/src/Internal/ValueConverters/Vector2Converter.cs +++ b/VpSharp/src/Internal/ValueConverters/Vector2Converter.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Cysharp.Text; using VpSharp.Extensions; @@ -18,7 +18,7 @@ internal sealed class Vector2Converter : ValueConverter { int readChar = reader.Read(); - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Internal/ValueConverters/Vector3Converter.cs b/VpSharp/src/Internal/ValueConverters/Vector3Converter.cs index b85c844..3585290 100644 --- a/VpSharp/src/Internal/ValueConverters/Vector3Converter.cs +++ b/VpSharp/src/Internal/ValueConverters/Vector3Converter.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Cysharp.Text; using VpSharp.Extensions; @@ -18,7 +18,7 @@ internal sealed class Vector3Converter : ValueConverter { int readChar = reader.Read(); - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Internal/ValueConverters/Vector3ToColorConverter.cs b/VpSharp/src/Internal/ValueConverters/Vector3ToColorConverter.cs index 455d9e8..8a744ba 100644 --- a/VpSharp/src/Internal/ValueConverters/Vector3ToColorConverter.cs +++ b/VpSharp/src/Internal/ValueConverters/Vector3ToColorConverter.cs @@ -1,4 +1,4 @@ -using Cysharp.Text; +using Cysharp.Text; using VpSharp.Extensions; namespace VpSharp.Internal.ValueConverters; @@ -17,7 +17,7 @@ internal sealed class Vector3ToColorConverter : ValueConverter { int readChar = reader.Read(); - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Internal/ValueConverters/Vector3dConverter.cs b/VpSharp/src/Internal/ValueConverters/Vector3dConverter.cs index 8aecc07..4920b41 100644 --- a/VpSharp/src/Internal/ValueConverters/Vector3dConverter.cs +++ b/VpSharp/src/Internal/ValueConverters/Vector3dConverter.cs @@ -1,4 +1,4 @@ -using Cysharp.Text; +using Cysharp.Text; using VpSharp.Extensions; namespace VpSharp.Internal.ValueConverters; @@ -17,7 +17,7 @@ internal sealed class Vector3dConverter : ValueConverter { int readChar = reader.Read(); - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Internal/ValueConverters/Vector4ToColorConverter.cs b/VpSharp/src/Internal/ValueConverters/Vector4ToColorConverter.cs index 0072ba0..ba5eeb4 100644 --- a/VpSharp/src/Internal/ValueConverters/Vector4ToColorConverter.cs +++ b/VpSharp/src/Internal/ValueConverters/Vector4ToColorConverter.cs @@ -1,4 +1,4 @@ -using Cysharp.Text; +using Cysharp.Text; using VpSharp.Extensions; namespace VpSharp.Internal.ValueConverters; @@ -17,7 +17,7 @@ internal sealed class Vector4ToColorConverter : ValueConverter { int readChar = reader.Read(); - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Internal/ValueConverters/Vector4ToVector3Converter.cs b/VpSharp/src/Internal/ValueConverters/Vector4ToVector3Converter.cs index 501b67f..5983c03 100644 --- a/VpSharp/src/Internal/ValueConverters/Vector4ToVector3Converter.cs +++ b/VpSharp/src/Internal/ValueConverters/Vector4ToVector3Converter.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Cysharp.Text; using VpSharp.Extensions; @@ -18,7 +18,7 @@ internal sealed class Vector4ToVector3Converter : ValueConverter { int readChar = reader.Read(); - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Internal/ValueConverters/VectorToNthComponentConverter.cs b/VpSharp/src/Internal/ValueConverters/VectorToNthComponentConverter.cs index 92292af..f0b7891 100644 --- a/VpSharp/src/Internal/ValueConverters/VectorToNthComponentConverter.cs +++ b/VpSharp/src/Internal/ValueConverters/VectorToNthComponentConverter.cs @@ -1,4 +1,4 @@ -using Cysharp.Text; +using Cysharp.Text; using VpSharp.Extensions; namespace VpSharp.Internal.ValueConverters; @@ -30,7 +30,7 @@ internal sealed class VectorToNthComponentConverter : ValueConverter break; } - var currentChar = (char) readChar; + var currentChar = (char)readChar; if (currentChar == ' ') { spaceCount++; diff --git a/VpSharp/src/Vector3d.cs b/VpSharp/src/Vector3d.cs index 579d21a..7276f12 100644 --- a/VpSharp/src/Vector3d.cs +++ b/VpSharp/src/Vector3d.cs @@ -9,7 +9,7 @@ namespace VpSharp; /// /// Represents a vector with three double-precision floating-point values. This structure very closely resembles the API /// provided by , however its components and the mathematical operations performed on them use -/// arithmetic. +/// arithmetic. /// public struct Vector3d : IEquatable, IFormattable { diff --git a/VpSharp/src/VirtualParadiseClient.Avatars.cs b/VpSharp/src/VirtualParadiseClient.Avatars.cs index 8672104..975dc5a 100644 --- a/VpSharp/src/VirtualParadiseClient.Avatars.cs +++ b/VpSharp/src/VirtualParadiseClient.Avatars.cs @@ -1,4 +1,4 @@ -using System.Collections.Concurrent; +using System.Collections.Concurrent; using System.Numerics; using VpSharp.Entities; using VpSharp.Internal.NativeAttributes; @@ -45,8 +45,8 @@ public sealed partial class VirtualParadiseClient double x = vp_double(sender, FloatAttribute.AvatarX); double y = vp_double(sender, FloatAttribute.AvatarY); double z = vp_double(sender, FloatAttribute.AvatarZ); - var pitch = (float) vp_double(sender, FloatAttribute.AvatarPitch); - var yaw = (float) vp_double(sender, FloatAttribute.AvatarYaw); + var pitch = (float)vp_double(sender, FloatAttribute.AvatarPitch); + var yaw = (float)vp_double(sender, FloatAttribute.AvatarYaw); var position = new Vector3d(x, y, z); var rotation = Quaternion.CreateFromYawPitchRoll(yaw, pitch, 0); diff --git a/VpSharp/src/VirtualParadiseClient.Native.cs b/VpSharp/src/VirtualParadiseClient.Native.cs index 3e7a170..70981a7 100644 --- a/VpSharp/src/VirtualParadiseClient.Native.cs +++ b/VpSharp/src/VirtualParadiseClient.Native.cs @@ -15,7 +15,7 @@ public sealed partial class VirtualParadiseClient private void Initialize() { - var reason = (ReasonCode) Native.vp_init(); + var reason = (ReasonCode)Native.vp_init(); if (reason == ReasonCode.VersionMismatch) { throw new VersionMismatchException(); diff --git a/VpSharp/src/VirtualParadiseClient.NativeEvents.cs b/VpSharp/src/VirtualParadiseClient.NativeEvents.cs index 39b0794..bde17d3 100644 --- a/VpSharp/src/VirtualParadiseClient.NativeEvents.cs +++ b/VpSharp/src/VirtualParadiseClient.NativeEvents.cs @@ -1,4 +1,4 @@ -using System.Collections.Concurrent; +using System.Collections.Concurrent; using System.Drawing; using System.Numerics; using System.Threading.Channels; @@ -71,7 +71,7 @@ public sealed partial class VirtualParadiseClient int g = vp_int(sender, IntegerAttribute.ChatColorGreen); int b = vp_int(sender, IntegerAttribute.ChatColorBlue); color = Color.FromArgb(r, g, b); - style = (FontStyle) vp_int(sender, IntegerAttribute.ChatEffects); + style = (FontStyle)vp_int(sender, IntegerAttribute.ChatEffects); } VirtualParadiseAvatar? avatar = GetAvatar(session); @@ -80,7 +80,7 @@ public sealed partial class VirtualParadiseClient var args = new MessageReceivedEventArgs(message); RaiseEvent(MessageReceived, args); - + foreach (VirtualParadiseClientExtension extension in _extensions) { extension.OnMessageReceived(args); @@ -114,8 +114,8 @@ public sealed partial class VirtualParadiseClient double z = vp_double(sender, FloatAttribute.AvatarZ); position = new Vector3d(x, y, z); - var pitch = (float) vp_double(sender, FloatAttribute.AvatarPitch); - var yaw = (float) vp_double(sender, FloatAttribute.AvatarYaw); + var pitch = (float)vp_double(sender, FloatAttribute.AvatarPitch); + var yaw = (float)vp_double(sender, FloatAttribute.AvatarYaw); rotation = Quaternion.CreateFromYawPitchRoll(yaw, pitch, 0); } @@ -325,7 +325,7 @@ public sealed partial class VirtualParadiseClient DisconnectReason reason; lock (Lock) { - reason = (DisconnectReason) vp_int(sender, IntegerAttribute.DisconnectErrorCode); + reason = (DisconnectReason)vp_int(sender, IntegerAttribute.DisconnectErrorCode); } var args = new DisconnectedEventArgs(reason); @@ -337,7 +337,7 @@ public sealed partial class VirtualParadiseClient DisconnectReason reason; lock (Lock) { - reason = (DisconnectReason) vp_int(sender, IntegerAttribute.DisconnectErrorCode); + reason = (DisconnectReason)vp_int(sender, IntegerAttribute.DisconnectErrorCode); } var args = new DisconnectedEventArgs(reason); @@ -474,7 +474,7 @@ public sealed partial class VirtualParadiseClient { session = vp_int(sender, IntegerAttribute.AvatarSession); url = vp_string(sender, StringAttribute.Url); - target = (UriTarget) vp_int(sender, IntegerAttribute.UrlTarget); + target = (UriTarget)vp_int(sender, IntegerAttribute.UrlTarget); } if (!Uri.IsWellFormedUriString(url, UriKind.Absolute)) @@ -544,8 +544,8 @@ public sealed partial class VirtualParadiseClient double y = vp_double(sender, FloatAttribute.InviteY); double z = vp_double(sender, FloatAttribute.InviteZ); - var yaw = (float) vp_double(sender, FloatAttribute.InviteYaw); - var pitch = (float) vp_double(sender, FloatAttribute.InvitePitch); + var yaw = (float)vp_double(sender, FloatAttribute.InviteYaw); + var pitch = (float)vp_double(sender, FloatAttribute.InvitePitch); position = new Vector3d(x, y, z); rotation = Quaternion.CreateFromYawPitchRoll(yaw, pitch, 0); diff --git a/VpSharp/src/VirtualParadiseClient.Objects.cs b/VpSharp/src/VirtualParadiseClient.Objects.cs index 5f8dede..48ec1d4 100644 --- a/VpSharp/src/VirtualParadiseClient.Objects.cs +++ b/VpSharp/src/VirtualParadiseClient.Objects.cs @@ -148,7 +148,7 @@ public sealed partial class VirtualParadiseClient private async Task ExtractObjectAsync(nint sender) { - var type = (ObjectType) vp_int(sender, IntegerAttribute.ObjectType); + var type = (ObjectType)vp_int(sender, IntegerAttribute.ObjectType); int id = vp_int(sender, IntegerAttribute.ObjectId); int owner = vp_int(sender, IntegerAttribute.ObjectUserId); diff --git a/VpSharp/src/VirtualParadiseClient.cs b/VpSharp/src/VirtualParadiseClient.cs index a226123..856e4da 100644 --- a/VpSharp/src/VirtualParadiseClient.cs +++ b/VpSharp/src/VirtualParadiseClient.cs @@ -184,7 +184,6 @@ public sealed partial class VirtualParadiseClient : IDisposable ReleaseUnmanagedResources(); } - /// /// Enters a specified world at a specified position. ///