refactor(surface): made surface component creation only possible through surface system

modules/surface/private/linux/system.cpp

@@ -54,12 +54,6 @@ System::System(memory::Ref<ecs::Registry> registry): m_registry(std::move(regist
 	    "Failed to initialize surface system: registry has surface component(s)"
 	);
 
-	m_registry->connect_on_construct<SurfaceComponent>(
-	    [this](ecs::Registry &registry, ecs::EntityId entity) {
-		    on_surface_construct(registry, entity);
-	    }
-	);
-
 	m_registry->connect_on_destruct<SurfaceComponent>(
 	    [this](ecs::Registry &registry, ecs::EntityId entity) {
 		    on_surface_destruct(registry, entity);
@@ -106,11 +100,12 @@ void System::on_unregister()
 {
 }
 
-void System::on_surface_construct(ecs::Registry &registry, ecs::EntityId entity)
+auto System::create_component(ecs::EntityId entity, SurfaceComponent::CreateInfo info)
+    -> std::optional<SurfaceComponent *>
+try
 {
-	try
+	auto &component = m_registry->add<SurfaceComponent>(entity, info);
-	{
+	auto &surface = m_registry->get<SurfaceComponent>(entity);
-		auto &surface = registry.get<SurfaceComponent>(entity);
 	const auto &resolution = surface.get_resolution();
 	const auto &position = surface.get_position();
 	ensure_component_sanity(surface);
@@ -188,15 +183,16 @@ void System::on_surface_construct(ecs::Registry &registry, ecs::EntityId entity)
 	{
 		XUnmapWindow(display, main_window);
 	}
-	}
+
-	catch (const std::exception &exp)
+	return &component;
-	{
+}
+catch (const std::exception &exp)
+{
 	log_err("Exception thrown when on_constructing surface component");
 	log_err("\tentity: {}", entity);
 	log_err("\twhat: {}", exp.what());
-		registry.remove<SurfaceComponent>(entity);
+	m_registry->remove<SurfaceComponent>(entity);
-		throw;
+	return {};
-	}
 }
 
 void System::on_surface_destruct(ecs::Registry &registry, ecs::EntityId entity)
@@ -285,7 +281,6 @@ void System::handle_events(SurfaceComponent &surface)
 			const auto new_height = event.xconfigure.height;
 			if (prev_width != new_width || prev_height != new_height)
 			{
-				log_dbg("resized: {} - {}", new_width, new_height);
 				surface.m_resolution.x = new_width;
 				surface.m_resolution.y = new_height;
 				queue.emplace_back<ResizedEvent>(ResizedEvent {
@@ -342,7 +337,7 @@ void System::modify_title(SurfaceComponent &surface, const ModifyTitleRequest &r
 
 void System::modify_resolution(SurfaceComponent &surface, const ModifyResolutionRequest &request)
 {
-	surface.m_resolution = request.resolution;
+	// surface.m_resolution = request.resolution;
 
 	auto &[display, window, _] = surface.m_native_data;
 	const auto &[width, height] = request.resolution;

modules/surface/public/components.hpp

@@ -13,7 +13,10 @@ typedef struct _XDisplay Display;
 
 namespace lt::surface {
 
-/** Represents a platform's surface (eg. a Window). */
+/** Represents a platform's surface (eg. a Window).
+ *
+ * @note This is a "system component"
+ */
 class SurfaceComponent
 {
 public:
@@ -66,15 +69,6 @@ public:
 		bool visible;
 	};
 
-	SurfaceComponent(const CreateInfo &info)
-	    : m_title(info.title)
-	    , m_resolution(info.resolution)
-	    , m_vsync(info.vsync)
-	    , m_visible(info.visible)
-	    , m_native_data({})
-	{
-	}
-
 	[[nodiscard]] auto get_title() const -> std::string_view
 	{
 		return m_title;
@@ -127,6 +121,15 @@ public:
 	}
 
 private:
+	SurfaceComponent(const CreateInfo &info)
+	    : m_title(info.title)
+	    , m_resolution(info.resolution)
+	    , m_vsync(info.vsync)
+	    , m_visible(info.visible)
+	    , m_native_data({})
+	{
+	}
+
 	std::string m_title;
 
 	math::uvec2 m_resolution;

modules/surface/public/system.hpp

@@ -4,6 +4,7 @@
 #include <ecs/registry.hpp>
 #include <math/vec2.hpp>
 #include <memory/reference.hpp>
+#include <surface/components.hpp>
 
 namespace lt::surface {
 
@@ -26,6 +27,9 @@ public:
 
 	void on_unregister() override;
 
+	auto create_component(ecs::EntityId entity, SurfaceComponent::CreateInfo info)
+	    -> std::optional<SurfaceComponent *>;
+
 	void tick(app::TickInfo tick) override;
 
 	[[nodiscard]] auto get_last_tick_result() const -> const app::TickResult & override
@@ -34,8 +38,6 @@ public:
 	}
 
 private:
-	void on_surface_construct(ecs::Registry &registry, ecs::EntityId entity);
-
 	void on_surface_destruct(ecs::Registry &registry, ecs::EntityId entity);
 
 	void handle_requests(struct SurfaceComponent &surface);