Separate 2D and 3D primitives into their own namespaces

NoahStolk · Jun 15, 2024 · c72516b · c72516b
1 parent 42f67cc
commit c72516b
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 This library uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### Changed
+
+- Moved 2D and 3D primitives to `Detach.Collisions.Primitives2D` and `Detach.Collisions.Primitives3D` namespaces respectively.
+
 ## 0.9.1
 
 ### Added

diff --git a/src/Detach.Tests/Tests/Collisions/Geometry2DTests.cs b/src/Detach.Tests/Tests/Collisions/Geometry2DTests.cs
@@ -1,5 +1,5 @@
 using Detach.Collisions;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Numerics;
 

diff --git a/src/Detach.Tests/Tests/Collisions/Geometry3DTests.cs b/src/Detach.Tests/Tests/Collisions/Geometry3DTests.cs
@@ -1,5 +1,5 @@
 using Detach.Collisions;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives3D;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Numerics;
 

diff --git a/...s/Collisions/Primitives/RectangleTests.cs → ...Collisions/Primitives2D/RectangleTests.cs b/...s/Collisions/Primitives/RectangleTests.cs → ...Collisions/Primitives2D/RectangleTests.cs
@@ -1,9 +1,9 @@
 using Detach.Collisions;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Numerics;
 
-namespace Detach.Tests.Tests.Collisions.Primitives;
+namespace Detach.Tests.Tests.Collisions.Primitives2D;
 
 [TestClass]
 public class RectangleTests

diff --git a/...s/Tests/Collisions/Primitives/ObbTests.cs → ...Tests/Collisions/Primitives3D/ObbTests.cs b/...s/Tests/Collisions/Primitives/ObbTests.cs → ...Tests/Collisions/Primitives3D/ObbTests.cs
@@ -1,10 +1,10 @@
 using Detach.Buffers;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives3D;
 using Detach.Numerics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Numerics;
 
-namespace Detach.Tests.Tests.Collisions.Primitives;
+namespace Detach.Tests.Tests.Collisions.Primitives3D;
 
 [TestClass]
 public class ObbTests

diff --git a/src/Detach.VisualTests/Collisions/CollisionHandler.cs b/src/Detach.VisualTests/Collisions/CollisionHandler.cs
@@ -1,7 +1,7 @@
 using Detach.Collisions;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Detach.VisualTests.State;
-using Rectangle = Detach.Collisions.Primitives.Rectangle;
+using Rectangle = Detach.Collisions.Primitives2D.Rectangle;
 
 namespace Detach.VisualTests.Collisions;
 

diff --git a/src/Detach.VisualTests/State/Shapes2DState.cs b/src/Detach.VisualTests/State/Shapes2DState.cs
@@ -1,4 +1,4 @@
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using System.Numerics;
 
 namespace Detach.VisualTests.State;

diff --git a/src/Detach.VisualTests/TestCodeGenerator/Generator.cs b/src/Detach.VisualTests/TestCodeGenerator/Generator.cs
@@ -1,4 +1,4 @@
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Detach.VisualTests.Collisions;
 using Detach.VisualTests.State;
 using System.Text;

diff --git a/src/Detach.VisualTests/Ui/PositionedDrawList.cs b/src/Detach.VisualTests/Ui/PositionedDrawList.cs
@@ -1,5 +1,5 @@
 using Detach.Buffers;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using ImGuiNET;
 using System.Numerics;
 using System.Runtime.CompilerServices;

diff --git a/src/Detach.VisualTests/Ui/ShapeTables.cs b/src/Detach.VisualTests/Ui/ShapeTables.cs
@@ -1,4 +1,4 @@
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Detach.VisualTests.State;
 using ImGuiNET;
 

diff --git a/src/Detach.VisualTests/Ui/Shapes2DWindow.cs b/src/Detach.VisualTests/Ui/Shapes2DWindow.cs
@@ -1,4 +1,4 @@
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Detach.Utils;
 using Detach.VisualTests.Collisions;
 using Detach.VisualTests.State;

diff --git a/src/Detach/Collisions/Geometry2D.cs b/src/Detach/Collisions/Geometry2D.cs
@@ -1,4 +1,4 @@
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives2D;
 using Detach.Numerics;
 using System.Numerics;
 

diff --git a/src/Detach/Collisions/Geometry3D.cs b/src/Detach/Collisions/Geometry3D.cs
@@ -1,5 +1,5 @@
 using Detach.Buffers;
-using Detach.Collisions.Primitives;
+using Detach.Collisions.Primitives3D;
 using System.Numerics;
 
 namespace Detach.Collisions;

diff --git a/src/Detach/Collisions/Primitives/Circle.cs → src/Detach/Collisions/Primitives2D/Circle.cs b/src/Detach/Collisions/Primitives/Circle.cs → src/Detach/Collisions/Primitives2D/Circle.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives2D;
 
 public record struct Circle
 {

diff --git a/...ch/Collisions/Primitives/LineSegment2D.cs → .../Collisions/Primitives2D/LineSegment2D.cs b/...ch/Collisions/Primitives/LineSegment2D.cs → .../Collisions/Primitives2D/LineSegment2D.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives2D;
 
 public record struct LineSegment2D
 {

diff --git a/...ollisions/Primitives/OrientedRectangle.cs → ...lisions/Primitives2D/OrientedRectangle.cs b/...ollisions/Primitives/OrientedRectangle.cs → ...lisions/Primitives2D/OrientedRectangle.cs
@@ -2,7 +2,7 @@
 using Detach.Numerics;
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives2D;
 
 public record struct OrientedRectangle
 {

diff --git a/...Detach/Collisions/Primitives/Rectangle.cs → ...tach/Collisions/Primitives2D/Rectangle.cs b/...Detach/Collisions/Primitives/Rectangle.cs → ...tach/Collisions/Primitives2D/Rectangle.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives2D;
 
 public record struct Rectangle
 {

diff --git a/src/Detach/Collisions/Primitives/Aabb.cs → src/Detach/Collisions/Primitives3D/Aabb.cs b/src/Detach/Collisions/Primitives/Aabb.cs → src/Detach/Collisions/Primitives3D/Aabb.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives3D;
 
 public record struct Aabb
 {

diff --git a/...ch/Collisions/Primitives/LineSegment3D.cs → .../Collisions/Primitives3D/LineSegment3D.cs b/...ch/Collisions/Primitives/LineSegment3D.cs → .../Collisions/Primitives3D/LineSegment3D.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives3D;
 
 public record struct LineSegment3D
 {

diff --git a/src/Detach/Collisions/Primitives/Obb.cs → src/Detach/Collisions/Primitives3D/Obb.cs b/src/Detach/Collisions/Primitives/Obb.cs → src/Detach/Collisions/Primitives3D/Obb.cs
@@ -2,7 +2,7 @@
 using Detach.Numerics;
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives3D;
 
 public record struct Obb
 {

diff --git a/src/Detach/Collisions/Primitives/Ray.cs → src/Detach/Collisions/Primitives3D/Ray.cs b/src/Detach/Collisions/Primitives/Ray.cs → src/Detach/Collisions/Primitives3D/Ray.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives3D;
 
 public record struct Ray
 {

diff --git a/src/Detach/Collisions/Primitives/Sphere.cs → src/Detach/Collisions/Primitives3D/Sphere.cs b/src/Detach/Collisions/Primitives/Sphere.cs → src/Detach/Collisions/Primitives3D/Sphere.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives3D;
 
 public record struct Sphere
 {

diff --git a/src/Detach/Collisions/Primitives/Triangle.cs → ...etach/Collisions/Primitives3D/Triangle.cs b/src/Detach/Collisions/Primitives/Triangle.cs → ...etach/Collisions/Primitives3D/Triangle.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
 
-namespace Detach.Collisions.Primitives;
+namespace Detach.Collisions.Primitives3D;
 
 public record struct Triangle
 {