From fcca8bc835db65ac170d1148d52a815df8838d53 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 22 Mar 2025 12:17:57 +0000
Subject: Invert how shared/unique is specified for Collection

Template param is a pointer now, typedefs added for ease.
---
 game/gamestate.h           | 2 +-
 game/network/network.h     | 2 +-
 game/orders.h              | 2 +-
 game/vehicles/train.h      | 2 +-
 game/water.h               | 2 +-
 lib/collection.h           | 9 ++++++---
 test/test-assetFactory.cpp | 2 +-
 test/test-collection.cpp   | 6 +++---
 ui/editNetwork.h           | 2 +-
 ui/gameMainWindow.cpp      | 2 +-
 ui/mainApplication.h       | 2 +-
 ui/toolbar.h               | 2 +-
 ui/windowContent.h         | 2 +-
 13 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/game/gamestate.h b/game/gamestate.h
index 189417d..c5ad239 100644
--- a/game/gamestate.h
+++ b/game/gamestate.h
@@ -16,7 +16,7 @@ public:
 	NO_MOVE(GameState);
 	NO_COPY(GameState);
 
-	Collection<WorldObject> world;
+	SharedCollection<WorldObject> world;
 	std::shared_ptr<Terrain> terrain;
 	std::shared_ptr<Environment> environment;
 	AssetFactory::Assets assets;
diff --git a/game/network/network.h b/game/network/network.h
index 291c4ec..73c3788 100644
--- a/game/network/network.h
+++ b/game/network/network.h
@@ -77,7 +77,7 @@ class NetworkOf : public Network, public Renderable, public NetworkLinkHolder<Li
 protected:
 	using Network::Network;
 
-	Collection<T> links;
+	SharedCollection<T> links;
 	void joinLinks(const Link::Ptr &) const;
 
 protected:
diff --git a/game/orders.h b/game/orders.h
index ca5cfdb..840aa3c 100644
--- a/game/orders.h
+++ b/game/orders.h
@@ -5,7 +5,7 @@
 
 class Objective;
 
-class Orders : public Collection<Objective> {
+class Orders : public SharedCollection<Objective> {
 public:
 	[[nodiscard]] Objective * current() const;
 	Objective * next();
diff --git a/game/vehicles/train.h b/game/vehicles/train.h
index 4933347..88e30f9 100644
--- a/game/vehicles/train.h
+++ b/game/vehicles/train.h
@@ -15,7 +15,7 @@ class SceneShader;
 class ShadowMapper;
 template<typename> class Ray;
 
-class Train : public Vehicle, public Collection<RailVehicle, false>, public Can<Go>, public Can<Idle> {
+class Train : public Vehicle, public UniqueCollection<RailVehicle>, public Can<Go>, public Can<Idle> {
 public:
 	explicit Train(const Link::CPtr & link, float linkDist = 0) : Vehicle {link, linkDist} { }
 
diff --git a/game/water.h b/game/water.h
index f9fe080..07d9ae1 100644
--- a/game/water.h
+++ b/game/water.h
@@ -29,6 +29,6 @@ private:
 	void generateMeshes();
 
 	std::shared_ptr<GeoData> geoData;
-	Collection<MeshT<Vertex>, false> meshes;
+	UniqueCollection<MeshT<Vertex>> meshes;
 	Texture::Ptr water;
 };
diff --git a/lib/collection.h b/lib/collection.h
index 6802bcb..2deefb9 100644
--- a/lib/collection.h
+++ b/lib/collection.h
@@ -6,11 +6,11 @@
 #include <type_traits>
 #include <vector>
 
-template<typename Object, bool shared = true> class Collection {
+template<typename Ptr> class Collection {
 public:
 	virtual ~Collection() = default;
 
-	using Ptr = std::conditional_t<shared, std::shared_ptr<Object>, std::unique_ptr<Object>>;
+	using Object = Ptr::element_type;
 	using Objects = std::vector<Ptr>;
 	Objects objects;
 
@@ -19,7 +19,7 @@ public:
 	create(Params &&... params)
 		requires std::is_base_of_v<Object, T>
 	{
-		if constexpr (shared) {
+		if constexpr (requires(Ptr ptr) { ptr = std::make_shared<T>(std::forward<Params>(params)...); }) {
 			auto obj = std::make_shared<T>(std::forward<Params>(params)...);
 			objects.emplace_back(obj);
 			return obj;
@@ -129,3 +129,6 @@ protected:
 		});
 	}
 };
+
+template<typename T> using SharedCollection = Collection<std::shared_ptr<T>>;
+template<typename T> using UniqueCollection = Collection<std::unique_ptr<T>>;
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 03319da..72f13b3 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -71,7 +71,7 @@ public:
 		sceneRenderer.render(*this);
 	}
 
-	Collection<const Renderable> objects;
+	SharedCollection<const Renderable> objects;
 
 private:
 	SceneRenderer sceneRenderer;
diff --git a/test/test-collection.cpp b/test/test-collection.cpp
index 00204fc..00298bb 100644
--- a/test/test-collection.cpp
+++ b/test/test-collection.cpp
@@ -34,10 +34,10 @@ public:
 	}
 };
 
-using TestCollection = Collection<Base>;
+using TestCollection = SharedCollection<Base>;
 
-BOOST_TEST_DONT_PRINT_LOG_VALUE(Collection<Base>::Objects::const_iterator)
-BOOST_TEST_DONT_PRINT_LOG_VALUE(Collection<Base>::Objects::const_reverse_iterator)
+BOOST_TEST_DONT_PRINT_LOG_VALUE(TestCollection::Objects::const_iterator)
+BOOST_TEST_DONT_PRINT_LOG_VALUE(TestCollection::Objects::const_reverse_iterator)
 
 BOOST_FIXTURE_TEST_SUITE(tc, TestCollection)
 
diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index ae887bd..2fc102a 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -36,7 +36,7 @@ public:
 		using Ptr = std::unique_ptr<Builder>;
 
 	protected:
-		Collection<const Link> candidateLinks;
+		SharedCollection<const Link> candidateLinks;
 	};
 
 private:
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index b58f3dc..07901b3 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -32,7 +32,7 @@ GameMainWindow::GameMainWindow(size_t w, size_t h) : WindowContent {w, h}, Scene
 {
 	uiComponents.create<ManualCameraController>(glm::vec2 {310'727'624, 494'018'810});
 	auto gms = uiComponents.create<GameMainSelector>(&camera, ScreenAbsCoord {w, h});
-	uiComponents.create<GameMainToolbar>(gms.get());
+	uiComponents.create<GameMainToolbar>(gms);
 }
 
 GameMainWindow::~GameMainWindow() { }
diff --git a/ui/mainApplication.h b/ui/mainApplication.h
index a6cb126..1489587 100644
--- a/ui/mainApplication.h
+++ b/ui/mainApplication.h
@@ -6,7 +6,7 @@
 
 class MainApplication : public ApplicationBase {
 public:
-	using Windows = Collection<Window>;
+	using Windows = SharedCollection<Window>;
 	void mainLoop();
 
 protected:
diff --git a/ui/toolbar.h b/ui/toolbar.h
index ea560f5..b0480e2 100644
--- a/ui/toolbar.h
+++ b/ui/toolbar.h
@@ -19,5 +19,5 @@ public:
 
 	bool handleInput(const SDL_Event & e, const Position & parentPos) override;
 
-	Collection<IconButton, false> icons;
+	UniqueCollection<IconButton> icons;
 };
diff --git a/ui/windowContent.h b/ui/windowContent.h
index 474445a..5437da6 100644
--- a/ui/windowContent.h
+++ b/ui/windowContent.h
@@ -21,6 +21,6 @@ public:
 	virtual bool handleInput(const SDL_Event & e);
 
 protected:
-	::Collection<UIComponent> uiComponents;
+	UniqueCollection<UIComponent> uiComponents;
 	UIShader uiShader;
 };
-- 
cgit v1.2.3