Merge pull request #1 from mrange/vectorized-minmax-superfix

Vectorized minmax superfix
Unity-and-wireless-communications · Nov 26, 2024 · d6b9256 · d6b9256
2 parents 1020115 + 3d19b51
commit d6b9256
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+# Apple
+.DS_Store
+
 # User-specific files
 *.suo
 *.user
@@ -221,7 +224,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -317,7 +320,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,6 +329,6 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 /tests/TestFiles
diff --git a/src/SharpGLTF.Core/Schema2/VectorMinMax.cs b/src/SharpGLTF.Core/Schema2/VectorMinMax.cs
@@ -1,3 +1,4 @@
+#if NET6_0_OR_GREATER
 using System;
 using System.Numerics;
 using System.Runtime.Intrinsics;
@@ -307,4 +308,5 @@ private static unsafe void ProcessRemainingElements(float* ptr, int start, int l
             }
         }
     }
-}
+}
+#endif
diff --git a/src/SharpGLTF.Core/Schema2/gltf.Accessors.cs b/src/SharpGLTF.Core/Schema2/gltf.Accessors.cs
@@ -149,6 +149,7 @@ protected override IEnumerable<ExtraProperties> GetLogicalChildren()
             return base.GetLogicalChildren().ConcatElements(_sparse);
         }
 
+#if NET6_0_OR_GREATER
         public void UpdateBounds() 
         {
             this._min.Clear();
@@ -173,8 +174,8 @@ public void UpdateBounds()
                 _max.Add(max[i]);
             }
         }
-
-        public void UpdateBoundsOld()
+#else        
+        public void UpdateBounds()
         {
             this._min.Clear();
             this._max.Clear();
@@ -209,6 +210,7 @@ public void UpdateBoundsOld()
                 }
             }
         }
+#endif
 
         #endregion
 

diff --git a/src/SharpGLTF.Core/SharpGLTF.Core.csproj b/src/SharpGLTF.Core/SharpGLTF.Core.csproj
@@ -28,8 +28,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Numerics.Tensors" Version="8.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/SharpGLTF.Toolkit/.DS_Store b/src/SharpGLTF.Toolkit/.DS_Store
diff --git a/src/SharpGLTF.Toolkit/Geometry/.DS_Store b/src/SharpGLTF.Toolkit/Geometry/.DS_Store