From 972e588d75bb6403c752deab6ae1fd67b3c6059b Mon Sep 17 00:00:00 2001 From: cinder Date: Mon, 10 Oct 2022 16:30:12 -0500 Subject: [PATCH] Pattern matching so hot right now --- .../MeshmerizerR.cs | 3 +-- LibreMetaverse/Messages/LindenMessages.cs | 13 ++++--------- LibreMetaverse/Permissions.cs | 3 +-- LibreMetaverse/Primitives/ParticleSystem.cs | 3 +-- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs b/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs index d4a436ad..5056b63c 100644 --- a/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs +++ b/LibreMetaverse.Rendering.Meshmerizer/MeshmerizerR.cs @@ -466,8 +466,7 @@ namespace OpenMetaverse.Rendering FacetedMesh ret = null; OSD meshOSD = Helpers.DecompressOSD(compressedMeshData); - OSDArray meshFaces = meshOSD as OSDArray; - if (meshFaces != null) + if (meshOSD is OSDArray meshFaces) { ret = new FacetedMesh {Faces = new List()}; for (int faceIndex = 0; faceIndex < meshFaces.Count; faceIndex++) diff --git a/LibreMetaverse/Messages/LindenMessages.cs b/LibreMetaverse/Messages/LindenMessages.cs index ebf441a6..be2565f1 100644 --- a/LibreMetaverse/Messages/LindenMessages.cs +++ b/LibreMetaverse/Messages/LindenMessages.cs @@ -4345,8 +4345,7 @@ namespace OpenMetaverse.Messages.Linden Scale = map["scale"].AsVector3(); // Extra params - OSDArray extraParams = map["extra_parameters"] as OSDArray; - if (extraParams != null) + if (map["extra_parameters"] is OSDArray extraParams) { ExtraParams = new ExtraParam[extraParams.Count]; for (int i = 0; i < extraParams.Count; i++) @@ -4401,8 +4400,7 @@ namespace OpenMetaverse.Messages.Linden ProfileEnd = (float)profile["end"].AsReal(); ProfileHollow = (float)profile["hollow"].AsReal(); - OSDMap sculpt = shape["sculpt"] as OSDMap; - if (sculpt != null) + if (shape["sculpt"] is OSDMap sculpt) { SculptID = sculpt["id"].AsUUID(); SculptType = (SculptType)sculpt["type"].AsInteger(); @@ -4434,9 +4432,7 @@ namespace OpenMetaverse.Messages.Linden public void Deserialize(OSDMap map) { - OSDArray array = map["objects"] as OSDArray; - - if (array != null) + if (map["objects"] is OSDArray array) { Objects = new Object[array.Count]; @@ -4490,8 +4486,7 @@ namespace OpenMetaverse.Messages.Linden /// Incoming data to deserialize public void Deserialize(OSDMap map) { - OSDArray array = map["ObjectData"] as OSDArray; - if (array != null) + if (map["ObjectData"] is OSDArray array) { ObjectPhysicsProperties = new Primitive.PhysicsProperties[array.Count]; diff --git a/LibreMetaverse/Permissions.cs b/LibreMetaverse/Permissions.cs index 283da10e..63eb4ba9 100644 --- a/LibreMetaverse/Permissions.cs +++ b/LibreMetaverse/Permissions.cs @@ -108,9 +108,8 @@ namespace OpenMetaverse public static Permissions FromOSD(OSD llsd) { Permissions permissions = new Permissions(); - OSDMap map = llsd as OSDMap; - if (map != null) + if (llsd is OSDMap map) { permissions.BaseMask = (PermissionMask)map["base_mask"].AsUInteger(); permissions.EveryoneMask = (PermissionMask)map["everyone_mask"].AsUInteger(); diff --git a/LibreMetaverse/Primitives/ParticleSystem.cs b/LibreMetaverse/Primitives/ParticleSystem.cs index 421135b1..258d391e 100644 --- a/LibreMetaverse/Primitives/ParticleSystem.cs +++ b/LibreMetaverse/Primitives/ParticleSystem.cs @@ -460,9 +460,8 @@ namespace OpenMetaverse public static ParticleSystem FromOSD(OSD osd) { ParticleSystem partSys = new ParticleSystem(); - OSDMap map = osd as OSDMap; - if (map != null) + if (osd is OSDMap map) { partSys.CRC = map["crc"].AsUInteger(); partSys.PartFlags = map["part_flags"].AsUInteger();