few fixes

Author: salaros

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <NetStandardVersion>netstandard2.1</NetStandardVersion>
     <NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
   </PropertyGroup>

Directory.Build.targets

@@ -42,7 +42,7 @@
     <None Remove="**\*.Cache" />
 
     <!-- FxCop Analyzer-related configuration -->
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0-beta*">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -54,7 +54,7 @@
     </PackageReference>
 
     <!-- Sonar Analyzer-related configuration -->
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.6.*">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="[8.*, 9.0)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/CodeCave.Threejs.Entities.csproj

@@ -10,23 +10,15 @@
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
-    <Version>0.7.0</Version>
-    <FileVersion>0.7.0</FileVersion>
-    <AssemblyVersion>0.7.0</AssemblyVersion>
+    <Version>0.7.2</Version>
+    <FileVersion>0.7.2</FileVersion>
+    <AssemblyVersion>0.7.2</AssemblyVersion>
     <RepositoryType>git</RepositoryType>
     <PackageProjectUrl>https://github.com/CodeCavePro/threejs-entities.git</PackageProjectUrl>
     <RepositoryUrl>https://github.com/CodeCavePro/threejs-entities.git</RepositoryUrl>
     <PackageTags>nuget, package, library, three.js, revit, export</PackageTags>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-    <CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
-    <CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="JsonSubTypes" Version="1.8.*" />
     <PackageReference Include="Newtonsoft.Json" Version="[10.0.1, 12.1)" />

src/Extensions/Object3DExtensions.cs

@@ -69,7 +69,7 @@ public static ObjectScene AddCube(this ObjectScene objectScene, double width, do
             };
             objectScene.AddMaterial(material);
 
-            var cubeObject = new Object3D("Mesh", Guid.NewGuid().ToString())
+            var cubeObject = new Object3D("Mesh", Guid.NewGuid().ToString(), id: null)
             {
                 CastShadow = true,
                 ReceiveShadow = true,
@@ -86,10 +86,16 @@ internal static System.Collections.Generic.IEnumerable<Object3D> Flatten(this Sy
         {
             foreach (var obj in collection)
             {
-                if (obj.Children.Count == 0)
+                if ((obj?.Children?.Count ?? 0) == 0)
                     yield return obj;
 
-                foreach (var c in obj.Children.Flatten())
+                var children = obj?.Children?.Flatten() ??
+#if !NETFRAMEWORK
+                    Array.Empty<Object3D>();
+#else
+                    new Object3D[0];
+#endif
+                foreach (var c in children)
                     yield return c;
             }
         }

src/Geometries/BufferGeometry.cs

@@ -4,7 +4,7 @@ namespace CodeCave.Threejs.Entities
 {
     /// <summary>
     /// An efficient representation of mesh, line, or point geometry.
-    /// Includes vertex positions, face indices, normals, colors, UVs,
+    /// Includes vertex positions, face indexes, normals, colors, UVs,
     /// and custom attributes within buffers, reducing the cost of passing all this data to the GPU.
     /// To read and edit data in BufferGeometry attributes, see BufferAttribute documentation.
     ///

src/Geometries/Geometry.cs

@@ -56,7 +56,7 @@ public Geometry(string uuid)
         [JsonPropertyName("data")]
         public virtual GeometryData Data { get; internal set; }
 
-        /// <summary>Adds the point to the vertices.</summary>
+        /// <summary>Adds the point to the vertexes.</summary>
         /// <param name="vertex">The vertex.</param>
         [SuppressMessage(
             "StyleCop.CSharp.OrderingRules",
@@ -72,7 +72,7 @@ public void AddPoint(Vector3 vertex)
             Data.Vertices.Add(vertex.Z);
         }
 
-        /// <summary>Adds the point to the vertices.</summary>
+        /// <summary>Adds the point to the vertexes.</summary>
         /// <param name="x">The x coordinate.</param>
         /// <param name="y">The y coordinate.</param>
         /// <param name="z">The z coordinate.</param>
@@ -83,8 +83,8 @@ public void AddPoint(double x, double y, double z)
             Data.Vertices.Add(z);
         }
 
-        /// <summary>Adds a faces from its vertices.</summary>
-        /// <param name="vertices">The vertices of a face.</param>
+        /// <summary>Adds a faces from its vertexes.</summary>
+        /// <param name="vertices">The vertexes of a face.</param>
         public void AddFace(params int[] vertices)
         {
             Data.Faces.AddRange(vertices);

src/Math/Color.cs

@@ -48,7 +48,8 @@ public Color(int red, int green, int blue)
 
         /// <summary>Initializes a new instance of the <see cref="Color"/> class.</summary>
         /// <param name="integerValue">The integer value.</param>
-        [JsonConstructor]
+        [Newtonsoft.Json.JsonConstructor]
+        [System.Text.Json.Serialization.JsonConstructor]
         internal Color(int integerValue = 0)
         {
             this.integerValue = integerValue;

src/Objects/Group.cs

@@ -5,7 +5,7 @@ namespace CodeCave.Threejs.Entities
     public class Group : Object3D
     {
         public Group(string uuid = null)
-            : base(nameof(Group), uuid)
+            : base(nameof(Group), uuid, id: null)
         {
         }
     }

src/Objects/Object3D.cs

@@ -22,6 +22,7 @@ namespace CodeCave.Threejs.Entities
     public class Object3D : IEquatable<Object3D>, IEqualityComparer<Object3D>
     {
         private List<Object3D> children;
+        private double[] matrix;
 
         /// <summary>Initializes a new instance of the <see cref="Object3D"/> class.</summary>
         /// <param name="type">The type of the object.</param>
@@ -89,9 +90,15 @@ public Object3D(string type = nameof(Object3D), string uuid = null, long? id = n
         /// The local transform matrix.
         /// </value>
         [DataMember(Name = "matrix")]
-        [JsonProperty("matrix")]
+        [JsonProperty("matrix", ObjectCreationHandling = ObjectCreationHandling.Replace)]
         [JsonPropertyName("matrix")]
-        public ICollection<double> Matrix => new[]
+        public double[] Matrix
+        {
+            get => matrix ?? (matrix = DefaultMatrix);
+            private set => matrix = value ?? DefaultMatrix;
+        }
+
+        public double[] DefaultMatrix => new[]
         {
             Scale?.X ?? 1D, 0D, 0D, 0D, // TODO implement rotation, quaternion
             0D, Scale?.Y ?? 1D, 0D, 0D,

src/Objects/Scene.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Newtonsoft.Json;
@@ -16,15 +17,15 @@ public class Scene : Object3D
         /// <summary>Initializes a new instance of the <see cref="Scene"/> class.</summary>
         /// <param name="uuid">The unique identified of the object.</param>
         public Scene(string uuid)
-            : base(nameof(Scene), uuid)
+            : base(nameof(Scene), uuid, id: null)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="Scene"/> class.</summary>
         [Newtonsoft.Json.JsonConstructor]
         [System.Text.Json.Serialization.JsonConstructor]
         private Scene()
-            : this(null)
+            : this(uuid: Guid.NewGuid().ToString())
         {
         }
 

src/Serialization/NewtonsoftJson/ColorIntConverter.cs

@@ -22,8 +22,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var integerValue = (int)value;
-            writer.WriteValue(integerValue);
+            if (value is not Color)
+                throw new NotImplementedException();
+
+            writer.WriteValue(((Color)value).ToInt32());
         }
     }
 }