few improvements to Object3D.AddChild method

Author: salaros

src/CodeCave.Threejs.Entities.csproj

@@ -12,9 +12,9 @@
  <IsPackable>true</IsPackable>
  <IncludeSymbols>true</IncludeSymbols> 
  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
- <Version>0.7.4</Version>
- <FileVersion>0.7.4</FileVersion>
- <AssemblyVersion>0.7.4</AssemblyVersion>
+ <Version>0.8.2</Version>
+ <FileVersion>0.8.2</FileVersion>
+ <AssemblyVersion>0.8.2</AssemblyVersion>
  <RepositoryType>git</RepositoryType>
  <PackageProjectUrl>https://github.com/CodeCavePro/threejs-entities.git</PackageProjectUrl>
  <RepositoryUrl>https://github.com/CodeCavePro/threejs-entities.git</RepositoryUrl>
@@ -23,7 +23,7 @@
 
  <ItemGroup>
  <PackageReference Include="JsonSubTypes" Version="1.8.*" />
- <PackageReference Include="Newtonsoft.Json" Version="[10.0.1, 12.1)" />
+ <PackageReference Include="Newtonsoft.Json" Version="[10.0.1, 13.1)" />
  <PackageReference Include="System.Text.Json" Version="3.1.*" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
  <PackageReference Include="System.Text.Json" Version="5.0.*" Condition="'$(TargetFramework)' == 'net5.0'" />
  <PackageReference Include="System.Text.Json" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6.0'" />

src/Objects/Object3D.cs

@@ -19,9 +19,9 @@ namespace CodeCave.Threejs.Entities
  [JsonSubtypes.KnownSubType(typeof(Scene), nameof(Scene))]
  [JsonSubtypes.KnownSubType(typeof(Group), nameof(Group))]
  [System.Text.Json.Serialization.JsonConverter(typeof(Utf8Json.PolymorphicJsonConverter<Object3D>))]
- public class Object3D : IEquatable<Object3D>, IEqualityComparer<Object3D>
+ public class Object3D : IEquatable<Object3D>
  {
- private List<Object3D> children;
+ private HashSet<Object3D> children;
  private double[] matrix;
  private Vector3 position = new Vector3(0, 0, 0);
 
@@ -34,7 +34,7 @@ public class Object3D : IEquatable<Object3D>, IEqualityComparer<Object3D>
  [System.Text.Json.Serialization.JsonConstructor]
  public Object3D(string type = nameof(Object3D), string uuid = null, long? id = null)
  {
- children = new List<Object3D>();
+ children = new HashSet<Object3D>();
 
  Id = id;
  UserData = new Dictionary<string, string>();
@@ -129,7 +129,7 @@ public double[] Matrix
  public IReadOnlyCollection<Object3D> Children
  {
  get => children as IReadOnlyCollection<Object3D>;
- private set => children = new List<Object3D>(value);
+ private set => children = new HashSet<Object3D>(value);
  }
 
  /// <summary>
@@ -268,7 +268,7 @@ public bool HasChild(Object3D childObject)
  /// <returns>Optimized object.</returns>
  public Object3D Optimize()
  {
- children = new List<Object3D>(
+ children = new HashSet<Object3D>(
  children
  .Flatten()
  .Where(c => !c.IsInvisible));
@@ -277,7 +277,7 @@ public Object3D Optimize()
 
  public Object3D CleanUp()
  {
- children = new List<Object3D>(
+ children = new HashSet<Object3D>(
  children
  .Select(c => c.CleanUp())
  .Where(c => !c.IsInvisible));
@@ -295,6 +295,7 @@ public Object3D CleanUp()
  /// <returns>true if the current object is equal to the <paramref name="other" /> parameter; otherwise, false.</returns>
  public bool Equals(Object3D other) =>
  Uuid.Equals(other?.Uuid, StringComparison.OrdinalIgnoreCase) &&
+ Position.Equals(other?.Position) &&
  GetHashCode().Equals(other?.GetHashCode());
 
  /// <summary>Returns a hash code for this instance.</summary>
@@ -305,18 +306,16 @@ public override int GetHashCode()
  hashCode = (hashCode * -1521134295) + EqualityComparer<string>.Default.GetHashCode(Uuid);
  hashCode = (hashCode * -1521134295) + EqualityComparer<string>.Default.GetHashCode(GeometryUuid);
  hashCode = (hashCode * -1521134295) + EqualityComparer<string>.Default.GetHashCode(MaterialUuid);
- hashCode = (hashCode * -1521134295) + EqualityComparer<List<Object3D>>.Default.GetHashCode(children);
+ hashCode = (hashCode * -1521134295) + EqualityComparer<Vector3>.Default.GetHashCode(Position);
+ hashCode = (hashCode * -1521134295) + EqualityComparer<HashSet<Object3D>>.Default.GetHashCode(children);
  return hashCode;
  }
 
  /// <summary>Determines whether the specified objects are equal.</summary>
  /// <param name="x">The first <see cref="Object3D" /> object to compare.</param>
  /// <param name="y">The second <see cref="Object3D" /> object to compare.</param>
  /// <returns>true if the specified objects are equal; otherwise, false.</returns>
- public bool Equals(Object3D x, Object3D y)
- {
- return x?.Equals(y) ?? false;
- }
+ public static bool Equals(Object3D x, Object3D y) => x?.Equals(y) ?? false;
 
  /// <summary>Returns a hash code for this instance.</summary>
  /// <param name="obj">The object.</param>