From c72516ba834fd90b5298a58cf16f5e15c8a0df07 Mon Sep 17 00:00:00 2001 From: Noah Stolk <31079637+NoahStolk@users.noreply.github.com> Date: Sat, 15 Jun 2024 12:21:51 +0200 Subject: [PATCH] Separate 2D and 3D primitives into their own namespaces --- CHANGELOG.md | 6 ++++++ src/Detach.Tests/Tests/Collisions/Geometry2DTests.cs | 2 +- src/Detach.Tests/Tests/Collisions/Geometry3DTests.cs | 2 +- .../{Primitives => Primitives2D}/RectangleTests.cs | 4 ++-- .../Collisions/{Primitives => Primitives3D}/ObbTests.cs | 4 ++-- src/Detach.VisualTests/Collisions/CollisionHandler.cs | 4 ++-- src/Detach.VisualTests/State/Shapes2DState.cs | 2 +- src/Detach.VisualTests/TestCodeGenerator/Generator.cs | 2 +- src/Detach.VisualTests/Ui/PositionedDrawList.cs | 2 +- src/Detach.VisualTests/Ui/ShapeTables.cs | 2 +- src/Detach.VisualTests/Ui/Shapes2DWindow.cs | 2 +- src/Detach/Collisions/Geometry2D.cs | 2 +- src/Detach/Collisions/Geometry3D.cs | 2 +- .../Collisions/{Primitives => Primitives2D}/Circle.cs | 2 +- .../{Primitives => Primitives2D}/LineSegment2D.cs | 2 +- .../{Primitives => Primitives2D}/OrientedRectangle.cs | 2 +- .../Collisions/{Primitives => Primitives2D}/Rectangle.cs | 2 +- src/Detach/Collisions/{Primitives => Primitives3D}/Aabb.cs | 2 +- .../{Primitives => Primitives3D}/LineSegment3D.cs | 2 +- src/Detach/Collisions/{Primitives => Primitives3D}/Obb.cs | 2 +- src/Detach/Collisions/{Primitives => Primitives3D}/Ray.cs | 2 +- .../Collisions/{Primitives => Primitives3D}/Sphere.cs | 2 +- .../Collisions/{Primitives => Primitives3D}/Triangle.cs | 2 +- 23 files changed, 31 insertions(+), 25 deletions(-) rename src/Detach.Tests/Tests/Collisions/{Primitives => Primitives2D}/RectangleTests.cs (96%) rename src/Detach.Tests/Tests/Collisions/{Primitives => Primitives3D}/ObbTests.cs (98%) rename src/Detach/Collisions/{Primitives => Primitives2D}/Circle.cs (82%) rename src/Detach/Collisions/{Primitives => Primitives2D}/LineSegment2D.cs (88%) rename src/Detach/Collisions/{Primitives => Primitives2D}/OrientedRectangle.cs (97%) rename src/Detach/Collisions/{Primitives => Primitives2D}/Rectangle.cs (96%) rename src/Detach/Collisions/{Primitives => Primitives3D}/Aabb.cs (97%) rename src/Detach/Collisions/{Primitives => Primitives3D}/LineSegment3D.cs (88%) rename src/Detach/Collisions/{Primitives => Primitives3D}/Obb.cs (98%) rename src/Detach/Collisions/{Primitives => Primitives3D}/Ray.cs (88%) rename src/Detach/Collisions/{Primitives => Primitives3D}/Sphere.cs (82%) rename src/Detach/Collisions/{Primitives => Primitives3D}/Triangle.cs (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aa1938..7e46cef 100644 --- 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 index 32cc37c..60de656 100644 --- 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 index 8c55c29..c4cb87a 100644 --- 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/src/Detach.Tests/Tests/Collisions/Primitives/RectangleTests.cs b/src/Detach.Tests/Tests/Collisions/Primitives2D/RectangleTests.cs similarity index 96% rename from src/Detach.Tests/Tests/Collisions/Primitives/RectangleTests.cs rename to src/Detach.Tests/Tests/Collisions/Primitives2D/RectangleTests.cs index b2e99a0..6508581 100644 --- a/src/Detach.Tests/Tests/Collisions/Primitives/RectangleTests.cs +++ b/src/Detach.Tests/Tests/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/src/Detach.Tests/Tests/Collisions/Primitives/ObbTests.cs b/src/Detach.Tests/Tests/Collisions/Primitives3D/ObbTests.cs similarity index 98% rename from src/Detach.Tests/Tests/Collisions/Primitives/ObbTests.cs rename to src/Detach.Tests/Tests/Collisions/Primitives3D/ObbTests.cs index 8c78e4e..5e94257 100644 --- a/src/Detach.Tests/Tests/Collisions/Primitives/ObbTests.cs +++ b/src/Detach.Tests/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 index 565640d..cae809d 100644 --- 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 index 1de9825..4463600 100644 --- 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 index 2d8130c..470d4e5 100644 --- 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 index e84b444..8fdee23 100644 --- 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 index 14c94e8..0e7a4d7 100644 --- 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 index 23a5a84..20ae064 100644 --- 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 index 79fabe5..36b499e 100644 --- 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 index 13cc789..d8a44e6 100644 --- 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 b/src/Detach/Collisions/Primitives2D/Circle.cs similarity index 82% rename from src/Detach/Collisions/Primitives/Circle.cs rename to src/Detach/Collisions/Primitives2D/Circle.cs index 8053ed2..e8d83ac 100644 --- a/src/Detach/Collisions/Primitives/Circle.cs +++ b/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/src/Detach/Collisions/Primitives/LineSegment2D.cs b/src/Detach/Collisions/Primitives2D/LineSegment2D.cs similarity index 88% rename from src/Detach/Collisions/Primitives/LineSegment2D.cs rename to src/Detach/Collisions/Primitives2D/LineSegment2D.cs index a912ca0..55ee8c4 100644 --- a/src/Detach/Collisions/Primitives/LineSegment2D.cs +++ b/src/Detach/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/src/Detach/Collisions/Primitives/OrientedRectangle.cs b/src/Detach/Collisions/Primitives2D/OrientedRectangle.cs similarity index 97% rename from src/Detach/Collisions/Primitives/OrientedRectangle.cs rename to src/Detach/Collisions/Primitives2D/OrientedRectangle.cs index 172c74f..bf071fc 100644 --- a/src/Detach/Collisions/Primitives/OrientedRectangle.cs +++ b/src/Detach/Collisions/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/src/Detach/Collisions/Primitives/Rectangle.cs b/src/Detach/Collisions/Primitives2D/Rectangle.cs similarity index 96% rename from src/Detach/Collisions/Primitives/Rectangle.cs rename to src/Detach/Collisions/Primitives2D/Rectangle.cs index e0dfbf2..01d2ac6 100644 --- a/src/Detach/Collisions/Primitives/Rectangle.cs +++ b/src/Detach/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 b/src/Detach/Collisions/Primitives3D/Aabb.cs similarity index 97% rename from src/Detach/Collisions/Primitives/Aabb.cs rename to src/Detach/Collisions/Primitives3D/Aabb.cs index 0844fce..3603116 100644 --- a/src/Detach/Collisions/Primitives/Aabb.cs +++ b/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/src/Detach/Collisions/Primitives/LineSegment3D.cs b/src/Detach/Collisions/Primitives3D/LineSegment3D.cs similarity index 88% rename from src/Detach/Collisions/Primitives/LineSegment3D.cs rename to src/Detach/Collisions/Primitives3D/LineSegment3D.cs index 939341f..f7e19d0 100644 --- a/src/Detach/Collisions/Primitives/LineSegment3D.cs +++ b/src/Detach/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 b/src/Detach/Collisions/Primitives3D/Obb.cs similarity index 98% rename from src/Detach/Collisions/Primitives/Obb.cs rename to src/Detach/Collisions/Primitives3D/Obb.cs index c59c67c..8c6d51b 100644 --- a/src/Detach/Collisions/Primitives/Obb.cs +++ b/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 b/src/Detach/Collisions/Primitives3D/Ray.cs similarity index 88% rename from src/Detach/Collisions/Primitives/Ray.cs rename to src/Detach/Collisions/Primitives3D/Ray.cs index 6c41b46..e82aa12 100644 --- a/src/Detach/Collisions/Primitives/Ray.cs +++ b/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 b/src/Detach/Collisions/Primitives3D/Sphere.cs similarity index 82% rename from src/Detach/Collisions/Primitives/Sphere.cs rename to src/Detach/Collisions/Primitives3D/Sphere.cs index 6d83baf..78fb66e 100644 --- a/src/Detach/Collisions/Primitives/Sphere.cs +++ b/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 b/src/Detach/Collisions/Primitives3D/Triangle.cs similarity index 95% rename from src/Detach/Collisions/Primitives/Triangle.cs rename to src/Detach/Collisions/Primitives3D/Triangle.cs index 0d40aae..2fb3087 100644 --- a/src/Detach/Collisions/Primitives/Triangle.cs +++ b/src/Detach/Collisions/Primitives3D/Triangle.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Detach.Collisions.Primitives; +namespace Detach.Collisions.Primitives3D; public record struct Triangle {