include/fggl/gui/widgets.hpp

@@ -35,8 +35,8 @@ namespace fggl::gui {
 			void render(gfx::Paint &paint) override {
 				auto pos = topLeft();
 				auto size2 = size();
-				math::vec2 baseLine{pos.x + 10, pos.y + size2.y/2 + 5};
-				paint.text(m_value,baseLine);
+				math::vec2 baseLine{pos.x + 10, pos.y + size2.y / 2 + 5};
+				paint.text(m_value, baseLine);
 			}
 
 			inline void font(std::shared_ptr<FontFace> font) {
@@ -44,7 +44,7 @@ namespace fggl::gui {
 				m_needsLayout = true;
 			}
 
-			inline void text(const std::string& value) {
+			inline void text(const std::string &value) {
 				m_value = value;
 				m_needsLayout = true;
 			}
@@ -54,13 +54,14 @@ namespace fggl::gui {
 			}
 
 			math::vec2 naturalSize() {
-				if ( m_needsLayout ) {
+				if (m_needsLayout) {
 					layout();
 				}
 				return m_naturalSize;
 			}
 
-			void layout();
+			void layout() override;
+			inline void update(float /*deltaTime*/) override {}
 
 		private:
 			std::shared_ptr<gui::FontFace> m_font;
@@ -77,24 +78,23 @@ namespace fggl::gui {
 			void render(gfx::Paint &paint) override;
 
 			void activate() override;
-			void onEnter() override;
-			void onExit() override;
-
-			void label(const std::string& value);
+			void label(const std::string &value);
 
 			[[nodiscard]]
 			std::string label() const;
 
+			inline void update(float /*deltaTime*/) override {}
+
 			void addCallback(Callback callback);
+			void layout() override;
+
 		private:
 			Label m_label;
 			std::string m_value;
 			std::vector<Callback> m_callbacks;
-			bool m_hover;
 			bool m_active;
 	};
 
-
 	class Toggle : public Button {
 		public:
 			Toggle() = default;

include/fggl/input/basics.hpp

@@ -22,10 +22,10 @@
 namespace fggl::input {
 
 	enum class InputType {
-			BUTTON, // 0 || 1
-			UNIDIRECTIONAL_AXIS, // [0,1], absolute
-			BIDIRECTIONAL_AXIS, // [-1, 1], absolute
-			RELATIVE_AXIS // [-1, 1], relative
+		BUTTON, // 0 || 1
+		UNIDIRECTIONAL_AXIS, // [0,1], absolute
+		BIDIRECTIONAL_AXIS, // [-1, 1], absolute
+		RELATIVE_AXIS // [-1, 1], relative
 	};
 
 } // namespace fggl::input

include/fggl/input/camera_input.hpp

@@ -38,7 +38,11 @@ namespace fggl::input {
 		scancode_t rotate_ccw;
 	};
 
-	void process_scroll(entity::EntityManager &ecs, const Input &input, entity::EntityID cam, float minZoom = 10.0F, float maxZoom = 50.0F);
+	void process_scroll(entity::EntityManager &ecs,
+						const Input &input,
+						entity::EntityID cam,
+						float minZoom = 10.0F,
+						float maxZoom = 50.0F);
 
 	/**
 	 * Process the camera based on rotation around a fixed point.

include/fggl/input/input.hpp

@@ -24,11 +24,11 @@
 
 namespace fggl::input {
 
-	constexpr const modules::ModuleService SERVICE_INPUT = modules::make_service("fggl::input::Input");
+	constexpr const auto SERVICE_INPUT = modules::make_service("fggl::input::Input");
 
 	class Input {
 		public:
-			constexpr static const modules::ModuleService service = SERVICE_INPUT;
+			constexpr static const auto service = SERVICE_INPUT;
 
 			Input() = default;
 			void frame(float dt);

include/fggl/input/module.hpp

@@ -26,15 +26,15 @@
 namespace fggl::input {
 
 	struct Generic {
-		constexpr static const char* name = "fggl::input::Generic";
-		constexpr static const std::array<modules::ModuleService, 1> provides = {
+		constexpr static const char *name = "fggl::input::Generic";
+		constexpr static const std::array<modules::ServiceName, 1> provides = {
 			SERVICE_INPUT
 		};
-		constexpr static const std::array<modules::ModuleService, 0> depends = {};
-		static bool factory(modules::ModuleService service, modules::Services& services);
+		constexpr static const std::array<modules::ServiceName, 0> depends = {};
+		static bool factory(modules::ServiceName service, modules::Services &services);
 	};
 
-	bool Generic::factory(modules::ModuleService service, modules::Services& services) {
+	bool Generic::factory(modules::ServiceName service, modules::Services &services) {
 		if (service == SERVICE_INPUT) {
 			services.create<input::Input>();
 			return true;

include/fggl/input/mouse.hpp

@@ -19,17 +19,19 @@
 #include <array>
 #include <bitset>
 
+#include "fggl/math/types.hpp"
+
 namespace fggl::input {
 
 	enum class MouseButton {
-		LEFT,
-		MIDDLE,
-		RIGHT,
-		EXTRA_1,
-		EXTRA_2,
-		EXTRA_3,
-		EXTRA_4,
-		EXTRA_5
+		LEFT  = 0,
+		MIDDLE = 2,
+		RIGHT = 1,
+		EXTRA_1 = 3,
+		EXTRA_2 = 4,
+		EXTRA_3 = 5,
+		EXTRA_4 = 6,
+		EXTRA_5 = 7
 	};
 
 	enum class MouseAxis {
@@ -74,6 +76,7 @@ namespace fggl::input {
 		void operator=(const MouseState &rhs);
 	};
 
+
 	class MouseInput {
 		public:
 			MouseInput() = default;
@@ -121,6 +124,15 @@ namespace fggl::input {
 			MouseState m_prev;
 	};
 
+	// helpers
+	inline math::vec2 mouse_axis(const MouseInput& input) {
+		return { input.axis(MouseAxis::X), input.axis(MouseAxis::Y) };
+	}
+
+	inline math::vec2 mouse_axis_delta(const MouseInput& input) {
+		return { input.axisDelta(MouseAxis::X), input.axisDelta(MouseAxis::Y) };
+	}
+
 };
 
 #endif

include/fggl/math/easing.hpp

@@ -37,7 +37,7 @@ namespace fggl::math {
 	//
 	using transformF = std::function<float(float)>;
 
-	inline float scaleFilter(float in, float inMin, float inMax, float outMin, float outMax, const transformF& filter) {
+	inline float scaleFilter(float in, float inMin, float inMax, float outMin, float outMax, const transformF &filter) {
 		float out = in - inMin;
 		out /= (inMax - inMin);
 		out = filter(out);
@@ -45,7 +45,7 @@ namespace fggl::math {
 		return out + outMin;
 	}
 
-	inline float mix(const transformF& funcA, const transformF& funcB, float weightB, float t) {
+	inline float mix(const transformF &funcA, const transformF &funcB, float weightB, float t) {
 		return ((1 - weightB) * funcA(t)) + (weightB * funcB(t));
 	}
 

include/fggl/math/fmath.hpp

@@ -16,28 +16,90 @@
 #define FGGL_MATH_FMATH_HPP
 
 #include <cmath>
+#include "fggl/math/vector.hpp"
 
 namespace fggl::math {
 
-	// wrap value in range [0, max)
+	/**
+	 * A 4D floating-point vector.
+	 */
+	using vec4f = glm::vec4;
+
+	/**
+	 * A 3D floating-point vector.
+	 */
+	using vec3f = glm::vec3;
+
+	/**
+	 * A 2D floating-point vector.
+	 */
+	using vec2f = glm::vec2;
+
+	constexpr static const math::vec2f VEC2_ZERO{0.0F, 0.0F};
+	constexpr static const math::vec3f VEC3_ZERO{0.0F, 0.0F, 0.0F};
+	constexpr static const math::vec3f VEC3_ONES{1.0F, 1.0F, 1.0F};
+
+	/**
+	 * return the remainder (modulo) of value / maximum.
+	 *
+	 * This will return a value in the range [0, maximum), the result will always be positive, even if passed a negative
+	 * input.
+	 *
+	 * @param value the value to wrap.
+	 * @param max the maximum value that it can take.
+	 * @return the wrapped value
+	 */
 	inline float wrap(float value, float max) {
-		return fmod(max + fmod(value, max), max);
+		return fmodf(max + fmodf(value, max), max);
 	}
 
-	// wrap value in range [min, max)
+	/**
+	 * wrap value in range [min, max)
+	 *
+	 * @param value the value to be tested.
+	 * @param min the minimum allowable value
+	 * @param max the maximum allowable value
+	 */
 	inline float wrap(float value, float min, float max) {
-		if ( min > max ){ std::swap(min, max); };
+		if (min > max) {
+			std::swap(min, max);
+		};
 		value -= min;
 		float rangeSize = max - min;
-		return value - (rangeSize* std::floor(value/rangeSize)) + min;
+		return value - (rangeSize * std::floor(value / rangeSize)) + min;
+	}
+
+	/**
+	 * Ensure that value is wrapped in the range [min, max].
+	 * if the value is larger than max, return max.
+	 * if the value is smaller than min, return min.
+	 *
+	 * @param value the value to be tested.
+	 * @param min the minimum allowable value
+	 * @param max the maximum allowable value
+	 * @return value, if it is in the range [min, max], otherwise the bound that it is outside of.
+	 */
+	constexpr float clamp(float value, float min, float max) {
+		const float valueOrMin = value < min ? min : value;
+		return valueOrMin > max ? max : valueOrMin;
 	}
 
-	// if the value is out of bounds, return that bound
-	inline float clamp(float value, float min, float max) {
-		const float t = value < min ? min : value;
-		return t > max ? max : t;
+	constexpr float lerpImprecise(float start, float end, float t) {
+		return start + t * (end - start);
+	}
+
+	constexpr float lerp(float start, float end, float t) {
+		return (1 - t) * start + t * end;
+	}
+
+	template<typename T>
+	[[nodiscard]]
+	constexpr T smooth_add(T first, T second, const float weight) {
+		const float other = 1 - weight;
+		return (first * other) + (second * weight);
 	}
 
 } // namespace fggl::math
 
+
 #endif //FGGL_MATH_FMATH_HPP

include/fggl/math/imath.hpp

@@ -19,37 +19,69 @@
 #ifndef FGGL_MATH_IMATH_HPP
 #define FGGL_MATH_IMATH_HPP
 
+#include <cstdint>
+
 namespace fggl::math {
 
 	// wrap value in range [0, max)
-	inline int wrap(int value, int max) {
-		if ( value < 0 ) return (n-1)-(-1-value) % n;
-		if ( value >= max ) return value % max;
+	constexpr int wrap(int value, int max) {
+		if (value < 0)
+			return (value - 1) - (-1 - value) % value;
+		if (value >= max)
+			return value % max;
 		return value;
 	}
 
 	// wrap value in range [min, max)
-	inline int wrap(int value, int const min, int const max) {
+	constexpr int wrap(int value, int const min, int const max) {
 		int range = max - min + 1;
-		if ( value < min) {
-			value += range * ( (min - value) / range + 1 );
+		if (value < min) {
+			value += range * ((min - value) / range + 1);
 		}
 		return min + (value - min) % range;
 	}
 
-	inline
-	int clamp(int value, int min, int max) {
+	constexpr int clamp(int value, int min, int max) {
 		const int i = value > max ? max : value;
 		return i < min ? min : value;
 	}
 
 	template<typename T>
-	inline
-	T clampT(T value, T min, T max) {
+	constexpr T clampT(T value, T min, T max) {
 		const T i = value > max ? max : value;
 		return i < min ? min : value;
 	}
 
+	/**
+	 * Calculate the sum of the first N positive integers.
+	 *
+	 * @param n the number to stop at
+	 * @return sum(0 ... N)
+	 */
+	constexpr uint64_t calcSum(uint64_t n) {
+		return (n * (n + 1)) / 2;
+	}
+
+	/**
+	 * Calculate the squared sum of the first N positive integers.
+	 *
+	 * @param n the number to stop at
+	 * @return sum(0 ... N) * sum(0 ... N)
+	 */
+	constexpr uint64_t calcSumSquared(uint64_t n) {
+		return (n * (n + 1) * (2*n + 1)) / 6;
+	}
+
+	/**
+	 * Calculate the cubed sum of the first N positive integers.
+	 *
+	 * @param n the number to stop at
+	 * @return sum(0 ... N) * sum(0 ... N) * sum(0 ... N)
+	 */
+	constexpr uint64_t calcSumCubed(uint64_t n) {
+		return ((n * n) * ((n + 1) * (n + 1))) / 4;
+	}
+
 } // namespace fggl::math
 
 #endif //FGGL_MATH_IMATH_HPP

include/fggl/math/shapes.hpp

@@ -57,9 +57,9 @@ namespace fggl::math::phs3d {
 		math::vec3 min;
 		math::vec3 max;
 
-		void add(const math::vec3& p);
+		void add(const math::vec3 &p);
 		void emtpy();
-		void set(const AABB& other, const math::mat4& m);
+		void set(const AABB &other, const math::mat4 &m);
 
 		inline math::vec3 center() const {
 			return (min + max) / 2.0F;
@@ -73,23 +73,23 @@ namespace fggl::math::phs3d {
 			return max - center();
 		}
 
-		static AABB fromPoints(const std::vector<math::vec3>& points);
+		static AABB fromPoints(const std::vector<math::vec3> &points);
 	};
 
 	struct Plane {
 		glm::vec3 normal;
 		float d; // distance to origin
 
-		inline bool contains(const math::vec3& point) {
+		inline bool contains(const math::vec3 &point) {
 			return glm::dot(point, normal) == d;
 		}
 
-		inline float distance(const math::vec3& q) {
+		inline float distance(const math::vec3 &q) {
 			return glm::dot(q, normal) - d;
 		}
 
 		static Plane fromPoints(const math::vec3, const math::vec3, const math::vec3);
-		static Plane bestFit(const std::vector<math::vec3>& points);
+		static Plane bestFit(const std::vector<math::vec3> &points);
 	};
 
 	struct Barycentric {
@@ -98,8 +98,8 @@ namespace fggl::math::phs3d {
 
 		bool inTriangle() {
 			return 0 <= b[0] && b[0] <= 1 &&
-				   0 <= b[1] && b[1] <= 1 &&
-				   0 <= b[2] && b[2] <= 1;
+				0 <= b[1] && b[1] <= 1 &&
+				0 <= b[2] && b[2] <= 1;
 		}
 
 		inline bool isLegal() const {
@@ -107,8 +107,8 @@ namespace fggl::math::phs3d {
 		}
 	};
 
-	constexpr float THIRD = 1.0F/3.0F;
-	const Barycentric cGrav = { {THIRD, THIRD, THIRD}};
+	constexpr float THIRD = 1.0F / 3.0F;
+	const Barycentric cGrav = {{THIRD, THIRD, THIRD}};
 
 	struct Triangle {
 		std::array<math::vec3, 3> v;
@@ -130,11 +130,11 @@ namespace fggl::math::phs3d {
 		}
 
 		inline float length(int a, int b) const {
-			return glm::length( edge(a, b));
+			return glm::length(edge(a, b));
 		}
 
 		inline float perimeter() const {
-			return length(3, 2) + length(1,3) + length(2, 1);
+			return length(3, 2) + length(1, 3) + length(2, 1);
 		}
 
 		inline float area() const {
@@ -190,13 +190,13 @@ namespace fggl::math::phs3d {
 			return 0.0F;
 		}
 
-		bool CartToBarycentric(const math::vec3& cart, Barycentric& outVal);
-		bool CartToBarycentric2(const math::vec3& cart, Barycentric& outVal);
+		bool CartToBarycentric(const math::vec3 &cart, Barycentric &outVal);
+		bool CartToBarycentric2(const math::vec3 &cart, Barycentric &outVal);
 
-		math::vec3 BarycentricToCart(const Barycentric& p) const {
+		math::vec3 BarycentricToCart(const Barycentric &p) const {
 			return v[0] * p.b[0] +
-				   v[1] * p.b[1] +
-				   v[2] * p.b[2];
+				v[1] * p.b[1] +
+				v[2] * p.b[2];
 		}
 	};
 

include/fggl/math/statistics.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 27/11/22.
+//
+
+#ifndef FGGL_MATH_STATS_HPP
+#define FGGL_MATH_STATS_HPP
+
+#include <cstdint>
+#include <cmath>
+
+namespace fggl::math {
+
+	class CumulativeAverage {
+		public:
+			inline void add(float item) {
+				m_current = ( item + (m_count * m_current) ) / (m_count + 1);
+				m_count++;
+			}
+
+			inline float average() {
+				return m_current;
+			}
+
+		private:
+			float m_current;
+			std::size_t m_count;
+	};
+
+	/**
+	 * Useful Statistics class.
+	 * ported to C++ from Piers' Java implementation.
+	 *
+	 * @tparam T
+	 */
+	template<typename T>
+	class Statistics {
+		public:
+			void add(T observation) {
+				m_count++;
+				m_sum += observation;
+				m_sumSquared += (observation * observation);
+				m_min = std::min(m_min, observation);
+				m_max = std::max(m_max, observation);
+				m_dirty = true;
+			}
+
+			inline T average() {
+				compute();
+				return m_average;
+			}
+
+			inline T average() const {
+				if ( m_dirty ) {
+					return m_sum / m_count;
+				}
+				return m_average;
+			}
+
+			inline T standardDeviation() {
+				compute();
+				return m_standardDiv;
+			}
+
+			inline T standardDeviation() const {
+				if ( !m_dirty ) {
+					return m_standardDiv;
+				}
+				T avg = average();
+				T num = m_sumSquared - (m_count * avg * avg);
+				return num < 0 ? 0 : sqrt( num / (m_count-1));
+			}
+
+			inline T standardError() {
+				compute();
+				return m_standardDiv / sqrt(m_count);
+			}
+
+			inline T standardError() const {
+				if ( !m_dirty ) {
+					return m_standardDiv / sqrt(m_count);
+				}
+				return standardDeviation() / sqrt(m_count);
+			}
+
+			inline T squareSum () const {
+				return m_sumSquared;
+			}
+
+			inline std::size_t count() const {
+				return m_count;
+			}
+
+			inline T sum() const {
+				return m_sum;
+			}
+
+			inline T min() const {
+				return m_min;
+			}
+
+			inline T max() const {
+				return m_max;
+			}
+
+		private:
+			T m_average{0};
+			T m_sum{0};
+			T m_sumSquared{0};
+			T m_standardDiv{0};
+			T m_min{0};
+			T m_max{0};
+			std::size_t m_count{0};
+			bool m_dirty{false};
+
+			void compute() {
+				if ( !m_dirty ) {
+					return;
+				}
+				m_average = m_sum / m_count;
+				T num = m_sumSquared - (m_count * m_average * m_average);
+				if ( num < 0 )  {
+					num = 0;
+				}
+				m_standardDiv = sqrt( num / (m_count-1) );
+				m_dirty = false;
+			}
+	};
+
+	using StatisticsF = Statistics<float>;
+	using StatisticsD = Statistics<double>;
+
+} // namespace fggl::math
+
+#endif //FGGL_MATH_STATS_HPP

include/fggl/math/triangulation.hpp

@@ -127,13 +127,13 @@ namespace fggl::math {
 	}
 
 	static data::Vertex2D pointToVertex(const math::vec2 &point) {
-		return data::Vertex2D{ point, {1.0f, 1.0f, 1.0f} };
+		return data::Vertex2D{point, {1.0F, 1.0F, 1.0F}, {0.0F, 0.0F}};
 	}
 
 	/**
 	 * Fast Triangulation for convex polygons.
 	 */
-	void fan_triangulation(const PolygonVertex& polygon, data::Mesh2D &mesh);
+	void fan_triangulation(const PolygonVertex &polygon, data::Mesh2D &mesh);
 
 } // namespace fggl::util
 

include/fggl/math/types.hpp

@@ -18,21 +18,23 @@
 #include <tuple>
 #include <iostream>
 
-#include <glm/glm.hpp>
+#include "fggl/math/vector.hpp"
+
 #include <glm/ext/matrix_transform.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/euler_angles.hpp>
 #include <glm/gtx/quaternion.hpp>
 
+#include "fggl/math/fmath.hpp"
 #include "fggl/util/guid.hpp"
 
 #ifndef M_PI
-    #define M_PI 3.14159265358979323846
+	#define M_PI 3.14159265358979323846
 #endif
 
 #ifndef M_PI_2
-    #define M_PI_2 1.57079632679489661923
+	#define M_PI_2 1.57079632679489661923
 #endif
 
 namespace fggl::math {
@@ -44,36 +46,99 @@ namespace fggl::math {
 	using uint8 = std::uint8_t;
 
 	// math types (aliased for ease of use)
+
+	/**
+	 * A 4D floating-point vector.
+	 */
 	using vec4 = glm::vec4;
-	using vec4f = glm::vec4;
+
+
+	/**
+	 * A 4D signed integer vector.
+	 */
 	using vec4i = glm::ivec4;
-	using vec4ui = glm::ivec4;
 
+	/**
+	 * A 4D unsigned integer vector.
+	 */
+	using vec4ui = glm::uvec4;
+
+	/**
+	 * A 3D floating-point vector.
+	 */
 	using vec3 = glm::vec3;
+
+	/**
+	 * A 3D integer vector.
+	 */
 	using vec3i = glm::ivec3;
-	using vec3f = glm::vec3;
-	using vec3ui = glm::ivec3;
 
+	/**
+	 * A 3D unsigned integer vector.
+	 */
+	using vec3ui = glm::uvec3;
+
+	/**
+	 * A 2D floating-point vector
+	 */
 	using vec2 = glm::vec2;
-	using vec2f = glm::vec2;
+
+	/**
+	 * A 2D integer vector
+	 */
 	using vec2i = glm::ivec2;
-	using vec2ui = glm::ivec2;
 
+	/**
+	 * a 2D unsigned integer vector
+	 */
+	using vec2ui = glm::uvec2;
+
+	using vec2b = glm::bvec2;
+	using vec3b = glm::bvec3;
+	using vec4b = glm::bvec4;
+
+	/**
+	 * A 2x2 floating-point matrix.
+	 */
 	using mat2 = glm::mat2;
+
+	/**
+	 * A 3x3 floating-point matrix.
+	 */
 	using mat3 = glm::mat3;
+
+	/**
+	 * A 4x4 floating-point matrix.
+	 */
 	using mat4 = glm::mat4;
+
+	/**
+	 * A quaternion.
+	 */
 	using quat = glm::quat;
 
-	constexpr static const math::vec2 VEC2_ZERO {0.0F, 0.0F};
-	constexpr static const math::vec3 VEC3_ZERO {0.0F, 0.0F, 0.0F};
-	constexpr static const math::vec3 VEC3_ONES {1.0F, 1.0F, 1.0F};
+	constexpr static const math::mat4 IDENTITY_M4{1.0F};
+	constexpr static const math::quat IDENTITY_Q{1.0F, 0.0, 0.0, 0.0};
 
-	constexpr static const math::mat4 IDENTITY_M4 {1.0F};
-	constexpr static const math::quat IDENTITY_Q {1.0F, 0.0, 0.0, 0.0};
+	constexpr static const math::vec3 AXIS_X{1.0F, 0.0F, 0.0F};
+	constexpr static const math::vec3 AXIS_Y{0.0F, 1.0F, 0.0F};
+	constexpr static const math::vec3 AXIS_Z{0.0F, 0.0F, 1.0F};
 
-	constexpr static const math::vec3 AXIS_X { 1.0F, 0.0F, 0.0F };
-	constexpr static const math::vec3 AXIS_Y { 0.0F, 1.0F, 0.0F };
-	constexpr static const math::vec3 AXIS_Z { 0.0F, 0.0F, 1.0F };
+	constexpr auto minElm(vec3 a, vec3 b) -> vec3{
+		return {
+			a.x < b.x ? a.x : b.x,
+			a.y < b.y ? a.y : b.y,
+			a.z < b.z ? a.z : b.z
+		};
+	}
+
+	constexpr auto maxElm(vec3 a, vec3 b) -> vec3 {
+		return {
+			a.x > b.x ? a.x : b.x,
+			a.y > b.y ? a.y : b.y,
+			a.z > b.z ? a.z : b.z
+		};
+	}
 
 	// fastFloor from OpenSimplex2
 	inline int fastFloor(double x) {
@@ -81,27 +146,60 @@ namespace fggl::math {
 		return x < xi ? xi - 1 : xi;
 	}
 
-	inline float rescale_norm(float value, float min, float max) {
+	/**
+	 * Rescale a value between [min, max] into [0, 1].
+	 *
+	 * @param value the value to rescale
+	 * @param min the minimum value of the original range
+	 * @param max the maximum value of the original range
+	 * @return the rescaled value, [0, 1]
+	 */
+	constexpr float rescale_norm(float value, float min, float max) {
 		return (value - min) / (max - min);
 	}
 
-	inline float rescale_norm(float value, float min, float max, float newMin, float newMax) {
+	/**
+	 * Rescale a value between [min, max] into [newMin, newMax].
+	 *
+	 * @param value the value to rescale
+	 * @param min the minimum value of the original range
+	 * @param max the maximum value of the original range
+	 * @param newMin the new minimum value
+	 * @param newMax the new maximum value
+	 * @return the rescaled value, [newMin, newMax]
+	 */
+	constexpr float rescale_norm(float value, float min, float max, float newMin, float newMax) {
 		return newMin + ((value - min) * (newMax - newMin)) / (max - min);
 	}
 
-	inline float rescale_ndc(float value, float newMin, float newMax){
+	/**
+	 * Rescale a normalised device-coordinate value [-1, 1] into another range.
+	 *
+	 * @param value the value to rescale, [-1.0, 1.0]
+	 * @param newMin the new minimum value
+	 * @param newMax the new maximum value
+	 * @return the rescaled value, [newMin, newMax]
+	 */
+	constexpr float rescale_ndc(float value, float newMin, float newMax) {
 		return rescale_norm(value, -1, 1, newMin, newMax);
 	}
 
-	inline float rescale_01(float value, float newMin, float newMax){
+	/**
+	 * Rescale a normalised value [0, 1] into another range.
+	 *
+	 * @param value the value to rescale
+	 * @param newMin the new minimum value
+	 * @param newMax the new maximum value
+	 * @return the rescaled value, [newMin, newMax]
+	 */
+	constexpr float rescale_01(float value, float newMin, float newMax) {
 		return rescale_norm(value, 0, 1, newMin, newMax);
 	}
 
-	inline float recale_mean(float value, float avg, float max, float min) {
+	constexpr float recale_mean(float value, float avg, float max, float min) {
 		return (value - avg) / (max - min);
 	}
 
-
 	// reference vectors
 	constexpr vec3f UP{0.0f, 1.0f, 0.0f};
 	constexpr vec3f FORWARD{1.0f, 0.0f, 0.0f};
@@ -115,6 +213,7 @@ namespace fggl::math {
 		return modelMatrix(offset, glm::quat(eulerAngles));
 	}
 
+	// FIXME: we have multiple definitions of rays in the codebase!
 	struct Ray {
 		vec3 origin;
 		vec3 direction;
@@ -189,14 +288,14 @@ namespace fggl::math {
 
 			[[nodiscard]]
 			inline mat4 local() const {
-				const glm::mat4 transformX = glm::rotate( math::IDENTITY_M4,glm::radians(m_euler.x), AXIS_X );
-				const glm::mat4 transformY = glm::rotate( math::IDENTITY_M4, glm::radians(m_euler.y), AXIS_Y );
-				const glm::mat4 transformZ = glm::rotate( math::IDENTITY_M4, glm::radians(m_euler.z), AXIS_Z );
+				const glm::mat4 transformX = glm::rotate(math::IDENTITY_M4, glm::radians(m_euler.x), AXIS_X);
+				const glm::mat4 transformY = glm::rotate(math::IDENTITY_M4, glm::radians(m_euler.y), AXIS_Y);
+				const glm::mat4 transformZ = glm::rotate(math::IDENTITY_M4, glm::radians(m_euler.z), AXIS_Z);
 
 				const auto rotation = transformY * transformX * transformZ;
 				return glm::translate(math::IDENTITY_M4, m_origin)
 					* rotation
-					* glm::scale( math::IDENTITY_M4, m_scale );
+					* glm::scale(math::IDENTITY_M4, m_scale);
 			}
 
 			[[nodiscard]]
@@ -204,7 +303,7 @@ namespace fggl::math {
 				return local();
 			}
 
-			inline void update(const math::mat4& parent) {
+			inline void update(const math::mat4 &parent) {
 				m_model = parent * local();
 			}
 
@@ -224,23 +323,14 @@ namespace fggl::math {
 			vec3 m_scale;
 	};
 
-
-	inline math::mat4 calc_view_matrix(const Transform& transform) {
+	inline math::mat4 calc_view_matrix(const Transform &transform) {
 		return glm::lookAt(transform.origin(), transform.origin() + transform.forward(), transform.up());
 	}
 
-	inline math::mat4 calc_view_matrix(const Transform& transform, vec3 target) {
+	inline math::mat4 calc_view_matrix(const Transform &transform, vec3 target) {
 		return glm::lookAt(transform.origin(), target, transform.up());
 	}
 
 }
 
-// feels a bit strange to be doing this...
-namespace glm {
-	inline bool operator<(const vec3 &lhs, const vec3 &rhs) {
-		return std::tie(lhs.x, lhs.y, lhs.z)
-			< std::tie(rhs.x, rhs.y, rhs.z);
-	}
-}
-
 #endif

include/fggl/math/vector.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 20/08/22.
+//
+
+#ifndef FGGL_MATH_VECTOR_HPP
+#define FGGL_MATH_VECTOR_HPP
+
+#include <ostream>
+#include <tuple>
+
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/glm.hpp>
+
+namespace glm {
+	inline bool operator<(const vec2 &lhs, const vec2 &rhs) {
+		return std::tie(lhs.x, lhs.y)
+			< std::tie(rhs.x, rhs.y);
+	}
+
+	inline bool operator<(const vec3 &lhs, const vec3 &rhs) {
+		return std::tie(lhs.x, lhs.y, lhs.z)
+			< std::tie(rhs.x, rhs.y, rhs.z);
+	}
+
+	inline bool operator<(const vec4 &lhs, const vec4 &rhs) {
+		return std::tie(lhs.x, lhs.y, lhs.z, lhs.w)
+			< std::tie(rhs.x, rhs.y, rhs.z, rhs.w);
+	}
+
+	// output stream operators
+	inline std::ostream &operator<<(std::ostream &os, const vec2 &v) {
+		os << "(" << v.x << ", " << v.y << ")";
+		return os;
+	}
+
+	inline std::ostream &operator<<(std::ostream &os, const vec3 &v) {
+		os << "(" << v.x << ", " << v.y << "," << v.z << ")";
+		return os;
+	}
+
+	inline std::ostream &operator<<(std::ostream &os, const vec4 &v) {
+		os << "(" << v.x << ", " << v.y << "," << v.z << "," << v.w << ")";
+		return os;
+	}
+}
+
+#endif //FGGL_MATH_VECTOR_HPP

include/fggl/mesh/components.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 22/10/22.
+// FIXME HACKY IMPLEMENTATION DETAIL BECAUSE THE ASSET LOADING PIPELINE IS BAD
+//
+
+#include "fggl/mesh/mesh.hpp"
+
+#ifndef FGGL_MESH_COMPONENTS_HPP
+#define FGGL_MESH_COMPONENTS_HPP
+
+namespace fggl::mesh {
+
+	struct StaticMesh3D {
+		constexpr static const char name[] = "StaticMesh3D";
+		constexpr static const util::GUID guid = util::make_guid(name);
+
+		util::GUID meshReference;
+		Mesh3D mesh;
+		std::string pipeline;
+
+		inline StaticMesh3D() = default;
+		inline StaticMesh3D(const Mesh3D &aMesh, std::string aPipeline) :
+			mesh(aMesh), pipeline(std::move(aPipeline)) {}
+	};
+
+	struct StaticMultiMesh3D {
+		constexpr static const char name[] = "StaticMultiMesh3D";
+		constexpr static const util::GUID guid = util::make_guid(name);
+
+		util::GUID meshReference;
+		MultiMesh3D mesh;
+		std::string pipeline;
+
+		inline StaticMultiMesh3D() = default;
+		inline StaticMultiMesh3D(const MultiMesh3D &aMesh, std::string aPipeline) :
+			mesh(aMesh), pipeline(std::move(aPipeline)) {}
+	};
+
+}
+
+#endif //FGGL_MESH_COMPONENTS// _HPP

include/fggl/mesh/mesh.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 18/10/22.
+//
+
+#ifndef FGGL_MESH_MESH_HPP
+#define FGGL_MESH_MESH_HPP
+
+#include "fggl/math/types.hpp"
+#include "fggl/assets/types.hpp"
+
+#include <vector>
+#include <span>
+
+namespace fggl::mesh {
+
+	struct Vertex3D {
+		math::vec3 position;
+		math::vec3 normal;
+		math::vec3 colour{ 1.0F, 1.0F, 1.0F };
+		math::vec2 texPos{ NAN, NAN };
+
+		static Vertex3D from_pos(math::vec3 pos) {
+			return {
+				.position = pos,
+				.normal {NAN, NAN, NAN},
+				.colour {1.0F, 1.0F, 1.0F},
+				.texPos { pos.x, pos.z }
+			};
+		}
+	};
+
+	struct Vertex2D {
+		math::vec2 position;
+		math::vec2 colour;
+		math::vec2 texPos;
+	};
+
+	enum TextureType {
+		DIFFUSE, NORMAL
+	};
+
+	constexpr auto MISSING_TEXTURE = assets::AssetID::make(0);
+	struct Material {
+		std::string name;
+		math::vec3 ambient;
+		math::vec3 diffuse;
+		math::vec3 specular;
+		std::vector<assets::AssetID> diffuseTextures{};
+		std::vector<assets::AssetID> normalTextures{};
+		std::vector<assets::AssetID> specularTextures{};
+
+		inline assets::AssetID getPrimaryDiffuse() {
+			assert( !diffuseTextures.empty() );
+			return diffuseTextures.empty() ? MISSING_TEXTURE : diffuseTextures[0];
+		}
+
+		inline assets::AssetID getPrimaryNormals() {
+			assert( !normalTextures.empty() );
+			return normalTextures.empty() ? MISSING_TEXTURE : normalTextures[0];
+		}
+
+		inline assets::AssetID getPrimarySpecular() {
+			assert( !specularTextures.empty() );
+			return specularTextures.empty() ? MISSING_TEXTURE : specularTextures[0];
+		}
+	};
+
+	template<typename VertexFormat>
+	struct Mesh {
+		std::vector<VertexFormat> data;
+		std::vector<uint32_t> indices;
+		assets::AssetID material;
+
+		inline uint32_t append(const VertexFormat& vert) {
+			auto nextIdx = data.size();
+			data.push_back(vert);
+			return nextIdx;
+		}
+	};
+
+	template<typename MeshFormat>
+	struct MultiMesh {
+		std::vector<MeshFormat> meshes;
+		std::vector<assets::AssetID> materials;
+
+		MeshFormat& generate() {
+			return meshes.template emplace_back();
+		}
+	};
+
+	using Mesh2D = Mesh<Vertex2D>;
+	using MultiMesh2D = MultiMesh<Mesh2D>;
+
+	using Mesh3D = Mesh<Vertex3D>;
+	using MultiMesh3D = MultiMesh<Mesh3D>;
+
+}
+
+#endif //FGGL_MESH_MESH_HPP

include/fggl/modules/manager.hpp

@@ -21,7 +21,9 @@
 
 #include "fggl/modules/module.hpp"
 #include "fggl/debug/logging.hpp"
+#include "fggl/ds/graph.hpp"
 
+#include <cassert>
 #include <queue>
 #include <vector>
 #include <map>
@@ -31,101 +33,53 @@
 
 namespace fggl::modules {
 
-	template<typename T>
-	class DependencyGraph {
+	/**
+	 * Store and initialise modules present in the engine.
+	 *
+	 * This class is responsible for keeping track of which modules the library user has requested, and ensuring that
+	 * their dependencies are loaded in the correct order. Once the dependency graph has been built and instances
+	 * created, it is responsible for providing references to these initialised classes.
+	 */
+	class Manager {
 		public:
-			DependencyGraph() = default;
-
-			void clear() {
-				m_dependencies.clear();
-			}
-
-			void addAll(const T& name, const std::vector<T>& dependencies) {
-				auto existing = m_dependencies.find(name);
-				if (existing == m_dependencies.end()) {
-					m_dependencies[name] = dependencies;
-				} else {
-					existing->second.insert(existing->second.end(), dependencies.begin(), dependencies.end());
-				}
-			}
-
-			void add(const T& name, const T& depends) {
-				m_dependencies[name].push_back(depends);
-			}
-
-			bool getOrder(std::stack<T>& stack) {
-				std::set<T> visited{};
-
-				for (const auto& module : m_dependencies) {
-					if (!visited.contains(module.first)) {
-						sortUtil( module.first, visited, stack);
-					}
-				}
-
-				return true;
-			}
+			Manager() = default;
 
-			bool getOrderRev(std::queue<T>& stack) {
-				std::set<T> visited{};
+			template<ServiceType T>
+			class Service {
+				public:
+					inline Service(Manager* manager) : m_manager(manager) {}
 
-				for (const auto& module : m_dependencies) {
-					if (!visited.contains(module.first)) {
-						sortUtilRev( module.first, visited, stack);
+					inline T* operator->() {
+						if ( m_ptr == nullptr ) {
+							m_ptr = m_manager->get<T>();
+						}
+						return m_ptr;
 					}
-				}
-
-				return true;
-			}
-		private:
-			std::map<T, std::vector<T>> m_dependencies;
 
-			void sortUtil(T idx, std::set<T>& visited, std::stack<T>& stack) {
-				visited.emplace(idx);
+				private:
+					Manager* m_manager;
+					std::shared_ptr<T> m_ptr;
+			};
 
-				for ( auto dep : m_dependencies.at(idx)) {
-					if ( !visited.contains(dep) )
-						sortUtil(dep, visited, stack);
-				}
-
-				stack.push(idx);
-			}
-
-			void sortUtilRev(T idx, std::set<T>& visited, std::queue<T>& stack) {
-				visited.emplace(idx);
-
-				for ( auto dep : m_dependencies.at(idx)) {
-					if ( !visited.contains(dep) )
-						sortUtilRev(dep, visited, stack);
-				}
-
-				stack.push(idx);
-			}
-	};
-
-
-	class Manager {
-		public:
-			Manager() = default;
-
-			inline void addVirtual(const Config& config) {
-				assert( !m_locked );
+			inline void addVirtual(const Config &config) {
+				assert(!m_locked);
 
 				m_modules[config.name] = config;
-				for ( const auto& service : config.provides ) {
+				for (const auto &service : config.provides) {
 					m_serviceProviders[service] = config.name;
 				}
 			}
 
-			template<typename T>
+			template<ModuleType T>
 			void use() {
-				assert( !m_locked );
+				assert(!m_locked);
 
-				Config config { .name = T::name, .provides = {}, .depends = {} };
-				for ( auto service : T::provides ) {
+				Config config{.name = T::name, .provides = {}, .depends = {}};
+				for (auto service : T::provides) {
 					config.provides.push_back(service);
 				}
 
-				for ( auto service : T::depends ) {
+				for (auto service : T::depends) {
 					config.depends.push_back(service);
 				}
 				config.factory = T::factory;
@@ -133,53 +87,68 @@ namespace fggl::modules {
 				addVirtual(config);
 			}
 
+            // FIXME this should be in cpp file
 			bool buildGraph() {
 				// resolve links between modules
-				for (auto& moduleItr : m_modules) {
-					if ( moduleItr.second.depends.empty() ) {
-						m_dependencies.addAll(moduleItr.first, {});
+				for (auto &moduleItr : m_modules) {
+					if (moduleItr.second.depends.empty()) {
+						m_dependencies.addVertex(moduleItr.first);
 						continue;
 					}
 
-					for (auto& service : moduleItr.second.depends) {
+					for (auto &service : moduleItr.second.depends) {
 
 						auto provider = m_serviceProviders.find(service);
-						if ( provider == m_serviceProviders.end() ) {
-							debug::log(debug::Level::warning, "{} depends on {}, but nothing provides it", moduleItr.first, service);
+						if (provider == m_serviceProviders.end()) {
+							debug::log(debug::Level::warning,
+									   "{} depends on {}, but nothing provides it",
+									   moduleItr.first,
+									   service.get());
 							// nothing can provide the service requested, setup is invalid.
 							return false;
 						}
 
-						m_dependencies.add(moduleItr.first, provider->second);
+						m_dependencies.addEdge(moduleItr.first, provider->second);
 					}
 				}
 				return true;
 			}
 
-			template<typename T>
-			T* get() const {
-				assert( m_locked );
+			template<ServiceType T>
+			T *get() const {
+				assert(m_locked);
 				return m_services.template get<T>();
 			}
 
+			template<ServiceType T>
+			Service<T> getLazy() const {
+				assert(m_locked);
+				return { this };
+			}
+
+            //FIXME this should be in cpp file!
 			void resolve() {
-				if ( !buildGraph() ) {
+				assert( !m_locked );
+				if (!buildGraph()) {
 					return;
 				}
 
 				std::queue<ModuleIdentifier> stack;
 				m_dependencies.getOrderRev(stack);
 
-				while ( !stack.empty() ) {
+				while (!stack.empty()) {
 					auto nextToInit = stack.front();
 					debug::log(debug::Level::info, "Initializing {}", nextToInit);
 
-					auto& module = m_modules.at(nextToInit);
-					if ( module.factory != nullptr ) {
-						for (auto& service : module.provides) {
+					auto &module = m_modules.at(nextToInit);
+					if (module.factory != nullptr) {
+						for (auto &service : module.provides) {
 							bool result = module.factory(service, m_services);
-							if ( !result ) {
-								debug::log(debug::Level::warning, "{} could not create service {}", nextToInit, service);
+							if (!result) {
+								debug::log(debug::Level::warning,
+										   "{} could not create service {}",
+										   nextToInit,
+										   service.get());
 							}
 						}
 					} else {
@@ -192,12 +161,16 @@ namespace fggl::modules {
 				m_locked = true;
 			}
 
+			inline Services& services() {
+				return m_services;
+			}
+
 		private:
 			bool m_locked = false;
 			Services m_services;
 			std::map<ModuleIdentifier, Config> m_modules;
-			DependencyGraph<ModuleIdentifier> m_dependencies;
-			std::map<ModuleService, ModuleIdentifier> m_serviceProviders;
+			ds::DirectedGraph<ModuleIdentifier> m_dependencies;
+			std::map<ServiceName, ModuleIdentifier> m_serviceProviders;
 
 	};
 

include/fggl/modules/module.hpp

@@ -26,53 +26,39 @@
 #include <memory>
 
 #include "fggl/util/safety.hpp"
+#include "service.hpp"
 
 namespace fggl::modules {
 
-	using ModuleIdentifier = std::string;
+	template<typename T>
+	concept ModuleType = requires(T type) {
+		{ T::provides };
+		{ T::depends };
+	};
 
-	using ModuleService = util::OpaqueName<std::string_view, struct ModuleServiceTag>;
+	using ModuleIdentifier = std::string;
 
-	constexpr ModuleService make_service(const std::string_view name) {
-		return ModuleService::make(name);
-	}
+	using ServiceFactory = std::function<bool(ServiceName , Services &)>;
+	struct Config {
+		ModuleIdentifier name;
+		std::vector<ServiceName> provides;
+		std::vector<ServiceName> depends;
+		ServiceFactory factory = nullptr;
+	};
 
-	class Services {
+	class Module {
 		public:
-			template<typename Svc, typename Impl, typename ...Args>
-			void bind(Args... args) {
-				static_assert( std::is_base_of_v<Svc, Impl>, "Service type must be assignable from implementation type" );
-				m_services[Svc::service] = std::make_shared<Impl>(args...);
-			}
-
-			template<typename Svc, typename ...Args>
-			Svc* create(Args... args){
-				auto svc = std::make_shared<Svc>(args...);
-				m_services[Svc::service] = svc;
-				return svc.get();
-			}
+			virtual ~Module() = default;
 
-			template<typename Svc>
-			void provide(std::shared_ptr<Svc> service) {
-				m_services[Svc::service] = service;
-			}
+			// copying modules is bad
+			Module(const Module&) = delete;
+			Module& operator=(const Module&) = delete;
 
-			template<typename S>
-			S* get() const {
-				auto serviceWrapper = m_services.at(S::service);
-				auto ptr = std::static_pointer_cast<S>(serviceWrapper);
-				return ptr.get();
-			}
-		private:
-			std::map<ModuleService, std::shared_ptr<void>> m_services;
-	};
+			// moving modules is bad
+			Module(Module&&) = delete;
+			Module& operator=(Module&&) = delete;
 
-	using ServiceFactory = std::function<bool(ModuleService, Services&)>;
-	struct Config {
-		ModuleIdentifier name;
-		std::vector<ModuleService> provides;
-		std::vector<ModuleService> depends;
-		ServiceFactory factory = nullptr;
+			virtual auto create(ServiceName, Services&) -> bool = 0;
 	};
 
 } // namespace fggl::modules

include/fggl/modules/service.hpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//
+// Created by webpigeon on 25/03/23.
+//
+
+#ifndef FGGL_MODULES_SERVICE_HPP
+#define FGGL_MODULES_SERVICE_HPP
+
+#include <map>
+#include <memory>
+
+#include "fggl/util/safety.hpp"
+
+namespace fggl::modules {
+
+	using ServiceName = util::OpaqueName<std::string_view, struct ModuleServiceTag>;
+	constexpr ServiceName make_service(const std::string_view name) {
+		return ServiceName::make(name);
+	}
+
+	template<typename T>
+	concept ServiceType = requires(T* type) {
+		{ T::service };
+	};
+
+	template<typename T, typename U>
+	concept Derived = std::is_base_of<U, T>::value;
+
+	class Services {
+		public:
+			template<ServiceType Svc, Derived<Svc> Impl, typename ...Args>
+			void bind(Args... args) {
+				m_services[Svc::service] = std::make_shared<Impl>(args...);
+			}
+
+			template<ServiceType Svc, typename ...Args>
+			Svc *create(Args... args) {
+				auto svc = std::make_shared<Svc>(args...);
+				m_services[Svc::service] = svc;
+				return svc.get();
+			}
+
+			template<ServiceType Svc>
+			void provide(std::shared_ptr<Svc> service) {
+				m_services[Svc::service] = service;
+			}
+
+			template<ServiceType S>
+			S *get() const {
+				auto serviceWrapper = m_services.at(S::service);
+				auto ptr = std::static_pointer_cast<S>(serviceWrapper);
+				return ptr.get();
+			}
+
+		private:
+			std::map<ServiceName, std::shared_ptr<void>> m_services;
+	};
+
+} // namespace fggl::modules
+
+
+
+#endif //FGGL_MODULES_SERVICE_HPP

include/fggl/phys/callbacks.hpp

@@ -25,17 +25,17 @@
 
 namespace fggl::phys {
 
-	using CollisionCB = std::function<void(entity::EntityID , entity::EntityID)>;
+	using CollisionCB = std::function<void(entity::EntityID, entity::EntityID)>;
 
 	struct CollisionCallbacks {
-		constexpr static const char* name = "phys::Callbacks";
+		constexpr static const char *name = "phys::Callbacks";
 		CollisionCB onEnter = nullptr;
 		CollisionCB onExit = nullptr;
 		CollisionCB onStay = nullptr;
 	};
 
 	struct CollisionCache {
-		constexpr static const char* name = "phys::Cache";
+		constexpr static const char *name = "phys::Cache";
 		std::unordered_set<entity::EntityID> collisions;
 		std::unordered_set<entity::EntityID> lastFrame;
 	};