refactor: make vector2 & bounds data classes

1 files changed, 3 insertions, 18 deletions

diff --git a/src/bootstrap.cpp b/src/bootstrap.cpp
index 343f01b..a0d8ab2 100644
--- a/src/bootstrap.cpp
+++ b/src/bootstrap.cpp
@@ -2,7 +2,6 @@
 
 // Interfaces
 #include "interfaces/argument_parser.hpp"
-#include "interfaces/bounds.hpp"
 #include "interfaces/game.hpp"
 #include "interfaces/game_initializer.hpp"
 #include "interfaces/input.hpp"
@@ -10,15 +9,14 @@
 #include "interfaces/matrix.hpp"
 #include "interfaces/randomization.hpp"
 #include "interfaces/scene.hpp"
-#include "interfaces/vector2.hpp"
 
 // Implementations
 #include "argument_parser.hpp"
+#include "engine/data/bounds.hpp"
+#include "engine/data/vector2.hpp"
 #include "engine/game_initializer.hpp"
-#include "engine/graphics/bounds.hpp"
 #include "engine/graphics/scene.hpp"
 #include "engine/graphics/string_matrix.hpp"
-#include "engine/graphics/vector2.hpp"
 #include "engine/user/cursor.hpp"
 #include "engine/user/input.hpp"
 #include "game/game.hpp"
@@ -56,25 +54,12 @@ Container bootstrap()
 				std::make_shared<SeedGenerator>(std::make_unique<std::random_device>()));
 		});
 
-	container.bind<IVector2Factory>().to_factory(
-		[](const IVector2Options &options)
-		{
-			return std::dynamic_pointer_cast<IVector2>(
-				std::make_shared<Vector2>(options));
-		});
-
 	container.bind<IMatrixFactory<std::string_view>>().to_factory(
-		[](const IBounds &bounds)
+		[](const Bounds &bounds)
 		{
 			return std::dynamic_pointer_cast<IMatrix<std::string_view>>(
 				std::make_shared<StringMatrix>(bounds));
 		});
 
-	container.bind<IBoundsFactory>().to_factory(
-		[](const IBoundsOptions &options)
-		{
-			return std::dynamic_pointer_cast<IBounds>(std::make_shared<Bounds>(options));
-		});
-
 	return container;
 }