include/fggl/gfx/paint.hpp

@@ -225,21 +225,22 @@ namespace fggl::gfx {
 	};
 
 	inline Path2D make_shape(math::vec2 center, float radius, int sides, math::vec3 colour = colours::WHITE, ShapeOpts opts = {}) {
-		double angle = (M_PI * 2.0) / sides;
+		float angle = ((math::PI * 2.0F) / sides);
 
 		fggl::gfx::Path2D tileGfx(center);
 		tileGfx.colour(colour);
 
 		for (int i=0; i < sides; ++i) {
-			float xPos = (float)(sin(i * angle + opts.angleOffset) * radius) + center.x;
-			float yPos = (float)(cos(i * angle + opts.angleOffset) * radius) + center.y;
-			if (!opts.sinFirst) {
-				std::swap(xPos, yPos);
-			}
+			math::vec2 pos (
+				(float)(cosf(i * angle + opts.angleOffset) * radius),
+				(float)(sinf(i * angle + opts.angleOffset) * radius)
+				);
+			pos += center;
+
 			if ( i == 0 ) {
-				tileGfx.moveTo( {xPos, yPos} );
+				tileGfx.moveTo( pos );
 			} else {
-				tileGfx.pathTo({xPos, yPos});
+				tileGfx.pathTo( pos );
 			}
 		}
 		tileGfx.close();

include/fggl/gfx/phong.hpp

@@ -50,6 +50,27 @@ namespace fggl::gfx {
 	};
 
 	struct Light {
+		math::vec3 position;
+		math::vec3 ambient;
+		math::vec3 specular;
+		math::vec3 diffuse;
+	};
+
+	struct DirectionalLight : public Light {
+		constexpr static const char *name = "gfx::phong::directional";
+		constexpr static const util::GUID guid = util::make_guid(name);
+	};
+
+	struct PointLight : public Light {
+		constexpr static const char *name = "gfx::phong::point";
+		constexpr static const util::GUID guid = util::make_guid(name);
+
+		float constant = 1.0F;
+		float linear;
+		float quadratic;
+	};
+
+	struct Light2 {
 		constexpr static const char *name = "gfx::light";
 		constexpr static const util::GUID guid = util::make_guid("gfx::light");
 		bool enabled;

include/fggl/gfx/setup.hpp

@@ -37,10 +37,44 @@ namespace fggl::gfx {
 
 	class WindowGraphics {
 		public:
-			constexpr const static modules::ModuleService service = modules::make_service("fggl::gfx::WindowGraphics");
+			constexpr const static auto service = modules::make_service("fggl::gfx::WindowGraphics");
 
+			WindowGraphics() = default;
+			virtual ~WindowGraphics() = default;
+
+			// no copy
+			WindowGraphics(const WindowGraphics& ) = delete;
+			WindowGraphics& operator=(const WindowGraphics&) = delete;
+
+			// no move
+			WindowGraphics(WindowGraphics&&) = delete;
+			WindowGraphics& operator=(WindowGraphics&&) = delete;
+
+			[[nodiscard]]
 			virtual GraphicsDetails config() const = 0;
-			virtual Graphics *create(display::Window &window) = 0;
+
+			[[nodiscard]]
+			virtual Graphics* create(display::Window &window) = 0;
+
+			inline Graphics* createMain(display::Window& window) {
+				assert( m_graphics == nullptr );
+				m_graphics = create(window);
+				return m_graphics;
+			}
+
+			inline void release() {
+				if ( m_graphics != nullptr ) {
+					delete m_graphics;
+					m_graphics = nullptr;
+				}
+			}
+
+			[[nodiscard]] inline Graphics* get() const {
+				return m_graphics;
+			}
+
+		private:
+			Graphics* m_graphics = nullptr;
 	};
 
 } // namespace fggl::gfx

include/fggl/grid/actions.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 19/12/22.
+//
+
+#ifndef FGGL_GRID_ACTIONS_H
+#define FGGL_GRID_ACTIONS_H
+
+#include <cstdint>
+#include <variant>
+
+#include "fggl/grid/hexagon.hpp"
+#include "fggl/grid/tokens.hpp"
+
+#include "fggl/util/safety.hpp"
+
+namespace fggl::grid {
+
+	template<typename State, typename Target>
+	class ActionType;
+
+	template<typename State, typename Target>
+	class Action {
+		public:
+			virtual void progress(State* state) = 0;
+			virtual bool isDone() = 0;
+	};
+
+	template<typename State, typename Target>
+	class InstantAction : public Action<State, Target> {
+		public:
+			void progress(State* state) final;
+			bool isDone() final;
+		private:
+			ActionType<State, Target>* m_action;
+			TokenIdentifer m_actor;
+			Target m_target;
+	};
+
+	template<typename State, typename Target>
+	class DurativeAction : public Action<State, Target> {
+		public:
+			void progress(State* state) final;
+			bool isDone() final;
+		private:
+			ActionType<State, Target>* m_action;
+			TokenIdentifer m_actor;
+			Target m_target;
+			uint64_t m_completionRound;
+	};
+
+	template<typename State, typename Target>
+	class ActionType {
+		public:
+			virtual bool canApply(const State* state, TokenIdentifer actor, Target target) = 0;
+			virtual void apply(State* state, TokenIdentifer actor, Target target) = 0;
+
+			virtual Action<State, Target> ground(TokenIdentifer actor, Target target) = 0;
+	};
+
+
+} // namespace fggl::grid
+
+#endif //FGGL_GRID_ACTIONS_H

include/fggl/grid/hexagon.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_GRID_HEX_HPP
+#define FGGL_GRID_HEX_HPP
+
+#include <array>
+#include <vector>
+#include <cmath>
+#include <compare>
+
+#include <fggl/math/fmath.hpp>
+
+/**
+ * Hexagonal Grid Implementation.
+ * Based largely off Amit's incredible grid documentation.
+ */
+namespace fggl::grid {
+
+	enum class HexDirPointy {
+		RIGHT = 0, TOP_RIGHT = 1, TOP_LEFT = 2, LEFT = 3, BOTTOM_LEFT = 4, BOTTOM_RIGHT = 5
+	};
+
+	enum class HexDirFlat {
+		BOTTOM_RIGHT = 0, TOP_RIGHT = 1, TOP = 2, TOP_LEFT = 3, BOTTOM_LEFT = 4, BOTTOM = 5
+	};
+
+	constexpr std::array< std::array<int, 2>, 6> HEX_DIRECTIONS {{
+		{1, 0}, {1, -1}, {0, 1},
+		{-1, 0}, {-1, 1}, {0, 1}
+	}};
+
+	constexpr std::array< std::array<int, 2>, 6> HEX_DIAGONALS {{
+																	{2, -1}, {+1, -2}, {-1, -1},
+																	{-2, 1}, {-1, 2}, {1, 1}
+																}};
+
+	template<typename T>
+	struct HexPointT {
+
+		constexpr HexPointT(T posQ, T posR) : m_pos({posQ, posR}) {}
+		constexpr explicit HexPointT(const std::array<int, 2>& pos) : m_pos(pos[0], pos[1]) {}
+
+		[[nodiscard]]
+		constexpr auto q() const -> T {
+			return m_pos[0];
+		}
+
+		[[nodiscard]]
+		constexpr auto r() const -> T{
+			return m_pos[1];
+		}
+
+		[[nodiscard]]
+		constexpr auto s() const -> T {
+			return -m_pos[0]-m_pos[1];
+		}
+
+		inline HexPointT neighbour(HexDirPointy dir) {
+			auto& offset = HEX_DIRECTIONS.at( (int)dir );
+			return { m_pos[0] + offset[0], m_pos[1] + offset[1] };
+		}
+
+		inline HexPointT neighbour(HexDirFlat dir) {
+			auto& offset = HEX_DIAGONALS.at( (int)dir );
+			return { m_pos[0] + offset[0], m_pos[1] + offset[1] };
+		}
+
+		HexPointT operator+(const HexPointT<T>& other) const {
+			return { m_pos[0] + other.m_pos[0], m_pos[1] + other.m_pos[1] };
+		}
+
+		HexPointT operator-(const HexPointT<T>& other) const {
+			return { m_pos[0] - other.m_pos[0], m_pos[1] - other.m_pos[1] };
+		}
+
+		bool operator==(const HexPointT<T>& other) const {
+			return m_pos[0] == other.m_pos[0] && m_pos[1] == m_pos[1];
+		}
+
+		auto operator<=>(const HexPointT<T>& other) const = default;
+
+		[[nodiscard]]
+		auto distance(const HexPointT& other) const -> T {
+			auto vec = *this - other;
+			return (
+				::abs(vec.q())
+				+ ::abs(vec.q() - vec.r())
+				+ ::abs(vec.r()) / 2
+				);
+		}
+
+		[[nodiscard]]
+		auto hexesInRange(int range) const -> std::vector<HexPointT<T>> {
+			std::vector<HexPointT<T>> results;
+			for ( auto q = -range; q <= range; ++q ) {
+				auto stopCount = std::min(range, -q+range);
+				for ( auto r = std::max(-range, -q-range); r <= stopCount; ++r ) {
+					results.push_back( *this + HexPointT<T>(q, r) );
+				}
+			}
+			return results;
+		}
+
+		private:
+			std::array<T, 2> m_pos;
+	};
+
+	using FloatHex = HexPointT<float>;
+	using IntHex = HexPointT<int>;
+
+	template<typename T>
+	constexpr FloatHex hexLerp(const HexPointT<T>& start, const HexPointT<T>& end, float t) {
+		return {
+			 math::lerp(start.q(), end.q(), t),
+			 math::lerp(start.r(), end.r(), t)
+		};
+	}
+
+	[[nodiscard]]
+	constexpr IntHex round2(const FloatHex& hex) {
+		auto q = std::round( hex.q() );
+		auto r = std::round( hex.r() );
+		auto s = std::round( hex.s() );
+
+		auto qDiff = std::abs( q - hex.q() );
+		auto rDiff = std::abs( r - hex.r() );
+		auto sDiff = std::abs( s - hex.r() );
+
+		if ( qDiff > rDiff && qDiff > sDiff) {
+			q = -r-s;
+		} else if ( rDiff > sDiff ) {
+			r = -q-s;
+		} else {
+			s = -q-r;
+		}
+
+		return {(int)q, (int)r};
+	}
+
+	std::vector<IntHex> lineTo(const IntHex& start, const IntHex& end);
+
+} // namespace fggl::grid
+
+#endif //FGGL_GRID_HEX_HPP

include/fggl/grid/hexgrid.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 10/12/22.
+//
+
+#ifndef FGGL_GRID_HEXAGON_BOARD_HPP
+#define FGGL_GRID_HEXAGON_BOARD_HPP
+
+#include <map>
+#include <set>
+#include <optional>
+#include <utility>
+#include <variant>
+
+#include "fggl/grid/hexagon.hpp"
+#include "fggl/grid/tokens.hpp"
+#include "fggl/grid/actions.hpp"
+
+#include "fggl/math/types.hpp"
+
+namespace fggl::grid {
+
+	class HexGrid;
+
+	using HexTarget = std::variant<TokenIdentifer, IntHex>;
+	using HexAction = Action<HexGrid, HexTarget>;
+
+	struct MaterialData {
+		std::string name;
+		math::vec3 colour;
+	};
+
+	struct TerrainType {
+		std::shared_ptr<MaterialData> data;
+	};
+
+	struct HexTile {
+		std::shared_ptr<MaterialData> terrain;
+		std::vector< std::shared_ptr<Token> > m_tokens;
+
+		[[nodiscard]]
+		inline std::optional<const MaterialData> data() const {
+			if (terrain == nullptr) {
+				{}
+			}
+
+			return *terrain;
+		}
+	};
+
+
+	class HexGrid {
+		public:
+			inline bool isValidPos(const IntHex& pos) const {
+				return m_tiles.contains(pos);
+			}
+
+			void setTerrain(const IntHex& pos, const TerrainType& terrain) {
+				auto& mapTile = m_tiles[pos];
+				mapTile.terrain = terrain.data;
+			}
+
+			std::optional<const MaterialData> getTerrain(const IntHex& pos) const {
+				const auto itr = m_tiles.find(pos);
+				if ( itr == m_tiles.end() ) {
+					return {};
+				}
+				return itr->second.data();
+			}
+
+			std::set<IntHex> getAllTiles() {
+				std::set<IntHex> posSet;
+				for ( auto& [pos,data] : m_tiles ) {
+					posSet.emplace( pos );
+				}
+				return posSet;
+			}
+
+			std::set<HexTile> tilesInRange(const IntHex& pos, int range) const;
+			std::set<HexTile> neighboursOf(const IntHex& pos) const;
+
+		private:
+			std::map<IntHex, HexTile> m_tiles;
+			std::map<uint64_t, std::shared_ptr<Token>> m_tokens;
+	};
+
+} // namespace fggl::grid
+
+#endif //FGGL_GRID_HEXAGON_BOARD_HPP

include/fggl/grid/layout.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/>.
+ */
+
+/*
+ * 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/12/22.
+//
+
+#ifndef FGGL_FGGL_GRID_LAYOUT_HPP
+#define FGGL_FGGL_GRID_LAYOUT_HPP
+
+#include "fggl/math/types.hpp"
+#include "fggl/grid/hexagon.hpp"
+
+namespace fggl::grid {
+
+	// factor out the call to sqrt so the matrices can be constexpr
+	constexpr float M_SQRT_3 = 1.73205080757F;
+	constexpr float M_SQRT_3_OVER_2 = M_SQRT_3 / 2.0F;
+
+	constexpr math::mat2 MAT_HEX_POINTY{
+		M_SQRT_3, 0.0F,
+		M_SQRT_3_OVER_2, 3.F / 2.F
+	};
+
+	constexpr math::mat2 MAT_HEX_FLAT{
+		3.F / 2.F, M_SQRT_3_OVER_2,
+		0.0F, M_SQRT_3
+	};
+
+	struct Orientation {
+		math::mat2 m_forward;
+		math::mat2 m_backward;
+		int m_angle;
+
+		inline Orientation(int angle, math::mat2 forward) : m_forward(forward), m_backward(glm::inverse(forward)), m_angle(angle) {};
+
+		static inline Orientation make_pointy() {
+			return { 30, MAT_HEX_POINTY};
+		}
+
+		static inline Orientation make_flat() {
+			return { 0, MAT_HEX_FLAT };
+		}
+	};
+
+
+	constexpr int HEX_SIDES = 6;
+	constexpr int DEG_PER_HEX_SIDE = 360 / HEX_SIDES; // 60 degrees per side
+
+	struct Layout {
+		Orientation m_orientation;
+		math::vec2 m_size;
+		math::vec2 m_origin;
+
+		Layout(Orientation orientation, math::vec2 size, math::vec2 origin) : m_orientation(orientation), m_size(size), m_origin(origin){}
+		Layout(Orientation orientation, float size) : m_orientation(orientation), m_size(size, size), m_origin() {}
+
+		inline void translate(float dx, float dy){
+			m_origin.x += dx;
+			m_origin.y += dy;
+		}
+
+		[[nodiscard]]
+		inline math::vec2 origin() const {
+			return m_origin;
+		}
+
+		[[nodiscard]]
+		inline math::vec2 size() const {
+			return m_size;
+		}
+
+		[[nodiscard]]
+		inline math::vec2 toScreen(IntHex gridPos) const {
+			const math::vec2 hexPoint{gridPos.q(), gridPos.r()};
+			auto point = (m_orientation.m_forward * hexPoint) * m_size;
+			return point + m_origin;
+		}
+
+		[[nodiscard]]
+		inline FloatHex toGrid(math::vec2 screen) const {
+			auto point = (screen - m_origin) / m_size;
+			auto hexPos = m_orientation.m_backward * point;
+			return {hexPos.x, hexPos.y};
+		}
+
+		[[nodiscard]]
+		inline math::vec2 cornerOffset(int corner) const {
+			const int angInc = DEG_PER_HEX_SIDE * corner;
+			const float angle = (angInc + m_orientation.m_angle) * ( fggl::math::PI / 180.0F);
+			return {
+				m_size.x * cosf(angle),
+				m_size.y * sinf(angle)
+			};
+		}
+
+		void paintHex(fggl::gfx::Paint& paint, IntHex pos, math::vec3 colour, math::vec2 offset) const {
+			const auto hexScreenCenter = toScreen(pos);
+
+			gfx::Path2D path({0,0});
+			path.colour(colour);
+
+			for (int i=0; i < HEX_SIDES; ++i) {
+				auto cornerPos =  hexScreenCenter + cornerOffset(i);
+				if ( i == 0) {
+					path.moveTo(cornerPos + offset);
+				} else {
+					path.pathTo(cornerPos + offset);
+				}
+			}
+			paint.stroke(path);
+		}
+
+
+	};
+
+}
+
+#endif //FGGL_FGGL_GRID_LAYOUT_HPP

include/fggl/grid/tokens.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 19/12/22.
+//
+
+#ifndef FGGL_GRID_TOKENS_HPP
+#define FGGL_GRID_TOKENS_HPP
+
+#include <cstdint>
+#include <map>
+
+#include "fggl/util/guid.hpp"
+
+namespace fggl::grid {
+
+	using TokenIdentifer = fggl::util::OpaqueName<uint64_t, struct Token>;
+
+	class TokenType {
+		public:
+			using PropType = int64_t;
+
+			inline void setProperty(util::GUID name, PropType newVal) {
+				m_properties[name] = newVal;
+			}
+
+			[[nodiscard]]
+			inline PropType getProperty(util::GUID name, PropType unsetVal=0) const {
+				try {
+					return m_properties.at(name);
+				} catch ( std::out_of_range& e ) {
+					return unsetVal;
+				}
+			}
+		private:
+			std::map<util::GUID, PropType> m_properties;
+			std::map<util::GUID, uint64_t> m_cost;
+	};
+
+	class Token {
+		public:
+			Token() = default;
+			explicit Token(std::shared_ptr<TokenType> type) : m_type(std::move(type)) {}
+
+			inline void setProperty(util::GUID name, TokenType::PropType newVal) {
+				m_properties[name] = newVal;
+			}
+
+			[[nodiscard]]
+			inline TokenType::PropType getProperty(util::GUID name, TokenType::PropType unsetVal=0) const {
+				try {
+					auto prop = m_properties.at(name);
+					return prop;
+				} catch ( std::out_of_range& ex) {
+					return m_type->getProperty(name, unsetVal);
+				}
+			}
+
+			[[nodiscard]]
+			inline TokenType::PropType getPropertyDirect(util::GUID name, TokenType::PropType unsetVal=0) const {
+				try {
+					auto prop = m_properties.at(name);
+					return prop;
+				} catch ( std::out_of_range& ex) {
+					return unsetVal;
+				}
+			}
+		private:
+			TokenIdentifer m_id;
+			std::shared_ptr<TokenType> m_type;
+			std::map<util::GUID, TokenType::PropType> m_properties;
+	};
+
+} // namespace fggl::grid
+
+#endif //FGGL_GRID_TOKENS_HPP

include/fggl/gui/fonts.hpp

@@ -30,7 +30,10 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+
 namespace fggl::gui {
+	constexpr const char* DEFAULT_FONT_NAME = "LiberationSans-Regular.ttf";
+
 
 	struct GlyphMetrics {
 		math::vec2 size;
@@ -57,7 +60,7 @@ namespace fggl::gui {
 			}
 
 			math::vec2 stringSize(const std::string &text);
-			void texture(char letter, int &width, int &height, void **buff);
+			void texture(char letter, int &width, int &height, unsigned char **buff);
 
 		private:
 			FT_Face m_face;
@@ -68,9 +71,9 @@ namespace fggl::gui {
 
 	class FontLibrary {
 		public:
-			constexpr static const modules::ModuleService service = modules::make_service("fggl::gui::font");
+			constexpr static const auto service = modules::make_service("fggl::gui::font");
 
-			FontLibrary(data::Storage *storage);
+			explicit FontLibrary(data::Storage *storage);
 			~FontLibrary();
 
 			// copy and moving not needed
@@ -100,10 +103,18 @@ namespace fggl::gui {
 				return ptr;
 			}
 
+			inline void setDefaultFont(const std::string& name) {
+				m_defaultFont = getFont(name);
+			}
+
+			inline std::shared_ptr<FontFace> getDefaultFont() const {
+				return m_defaultFont;
+			}
 		private:
 			FT_Library m_context;
 			data::Storage *m_storage;
 			std::map<const std::string, std::shared_ptr<FontFace>> m_cache;
+			std::shared_ptr<FontFace> m_defaultFont;
 	};
 
 } // nmespace fggl::gui

include/fggl/gui/model/parser.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 04/03/23.
+//
+
+#ifndef FGGL_GUI_MODEL_PARSER_HPP
+#define FGGL_GUI_MODEL_PARSER_HPP
+
+#include <fggl/gui/model/structure.hpp>
+#include <fggl/gui/fonts.hpp>
+#include <fggl/modules/module.hpp>
+
+namespace fggl::gui::model {
+
+	constexpr auto WIDGET_FACTORY_SERVICE = modules::make_service("gui::WidgetService");
+
+	class WidgetFactory {
+		public:
+			constexpr static auto service = WIDGET_FACTORY_SERVICE;
+			inline WidgetFactory(FontLibrary* lib) : m_fontLibrary(lib) {}
+
+			inline Widget* build(std::string templateName) {
+				return new Widget(m_templates.at(templateName).get());
+			}
+
+			inline Widget* buildEmpty() {
+				return new Widget(m_fontLibrary);
+			}
+
+			inline void push(std::string name, const Widget&& definition) {
+				m_templates.emplace(name, std::make_unique<Widget>(definition));
+			}
+
+			Widget* getTemplate(const std::string& name) {
+				auto itr = m_templates.find(name);
+				if ( itr == m_templates.end() ){
+					return nullptr;
+				}
+				return itr->second.get();
+			}
+
+		private:
+			std::map<std::string, std::unique_ptr<Widget>> m_templates;
+			FontLibrary* m_fontLibrary;
+	};
+
+	Widget* parseFile(WidgetFactory& factory, const std::string& path);
+
+} // namespace fggl::gui::model
+
+#endif //FGGL_GUI_MODEL_PARSER_HPP

include/fggl/gui/model/structure.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 04/03/23.
+//
+
+#ifndef FGGL_GUI_MODEL_STRUCTURE_HPP
+#define FGGL_GUI_MODEL_STRUCTURE_HPP
+
+#include <map>
+#include <variant>
+#include <vector>
+#include <string>
+#include <optional>
+
+#include <fggl/math/types.hpp>
+#include <fggl/gui/fonts.hpp>
+
+namespace fggl::gui::model {
+
+	using AttrKey = std::string;
+	using AttrValue = std::variant<bool, int, float, std::string, math::vec2, math::vec3>;
+
+	constexpr float UNDEFINED = INFINITY;
+	constexpr math::vec2 UNDEFINED_SIZE{INFINITY, INFINITY};
+
+	class Widget {
+		public:
+			using ChildItr = std::vector<Widget>::iterator;
+			using ChildItrConst = std::vector<Widget>::const_iterator;
+
+			inline Widget(FontLibrary* library) :
+				m_parent(nullptr),
+				m_children(),
+				m_fontLibrary(library),
+				m_attrs(),
+				m_cachedSize(),
+				m_dirty(true) {
+			}
+
+			explicit inline Widget(Widget* parent) :
+				m_parent(parent),
+				m_children(),
+				m_fontLibrary(parent->m_fontLibrary),
+				m_attrs(),
+				m_cachedSize(),
+				m_dirty(true) {
+			}
+
+			inline bool isRoot() const {
+				return m_parent == nullptr;
+			}
+
+			inline bool isLeaf() const {
+				return m_children.empty();
+			}
+
+			inline bool hasAttr(const AttrKey& key) const {
+				return m_attrs.contains(key);
+			}
+
+			inline std::map<AttrKey, AttrValue> attrs() {
+				return m_attrs;
+			}
+
+			template<typename type>
+			inline type get(const AttrKey& key) const {
+				return std::get<type>(m_attrs.at(key));
+			}
+
+			template<typename type>
+			type get_or_default(const AttrKey& key) const {
+				auto itr = m_attrs.find(key);
+				if ( itr == m_attrs.end() ) {
+					return type();
+				} else {
+					return std::get<type>(itr->second);
+				}
+			}
+
+			template<typename type>
+			inline void set(const AttrKey& key, type value) {
+				m_attrs[key] = value;
+			}
+
+			inline void addChild(const Widget& element) {
+				auto childItr = m_children.insert( m_children.cend(), element );
+				childItr->m_parent = this;
+			}
+
+			inline ChildItr begin() {
+				return m_children.begin();
+			}
+
+			inline ChildItrConst begin() const noexcept {
+				return m_children.begin();
+			}
+
+			inline ChildItrConst cbegin() const noexcept {
+				return m_children.cbegin();
+			}
+
+			inline ChildItr end() {
+				return m_children.end();
+			}
+
+			inline ChildItrConst end() const {
+				return m_children.end();
+			}
+
+			inline ChildItrConst cend() const {
+				return m_children.cend();
+			}
+
+			inline std::optional<math::vec2> preferredSize() {
+				calcPrefSize(m_fontLibrary->getDefaultFont());
+				return m_cachedSize;
+			}
+
+		private:
+			Widget *m_parent;
+			std::vector<Widget> m_children;
+			FontLibrary* m_fontLibrary;
+			std::map< AttrKey, AttrValue > m_attrs;
+			math::vec2 m_cachedSize;
+			bool m_dirty;
+
+			void calcPrefSize(std::shared_ptr<FontFace> face);
+	};
+
+	void attr_box_set(Widget& widget, const AttrKey& key, auto top, auto right, auto bottom, auto left) {
+		widget.set(key + "::top", top);
+		widget.set(key + "::right", right);
+		widget.set(key + "::bottom", bottom);
+		widget.set(key + "::left", left);
+	}
+
+	inline void attr_box_set(Widget& widget, const AttrKey& key, auto vert, auto horz) {
+		attr_box_set(widget, key, vert, horz, vert, horz);
+	}
+
+	inline void attr_box_set(Widget& widget, const AttrKey& key, auto value) {
+		attr_box_set(widget, key, value, value, value, value);
+	}
+
+
+} // namespace fggl::gui::model
+
+#endif //FGGL_GUI_MODEL_STRUCTURE_HPP

include/fggl/gui/module.hpp

@@ -20,27 +20,53 @@
 #define FGGL_GUI_MODULE_HPP
 
 #include "fggl/gui/fonts.hpp"
+#include "fggl/gui/model/parser.hpp"
+
 #include "fggl/data/module.hpp"
+#include "fggl/assets/packed/module.hpp"
 
 namespace fggl::gui {
 
+	constexpr auto MIME_TTF = assets::from_mime("font/ttf");
+	constexpr auto ASSET_FONT_TTF = assets::make_asset_type("font/ttf");
+
+	static assets::AssetTypeID is_font(std::filesystem::path path) {
+		if ( path.extension() == ".ttf" ){
+			return ASSET_FONT_TTF;
+		}
+		return assets::INVALID_ASSET_TYPE;
+	}
+
 	struct FreeType {
 		constexpr static const char *name = "fggl::gui::FreeType";
-		constexpr static const std::array<modules::ModuleService, 1> provides = {
-			FontLibrary::service
+		constexpr static const std::array<modules::ServiceName, 2> provides = {
+			FontLibrary::service,
+			model::WidgetFactory::service
 		};
-		constexpr static const std::array<modules::ModuleService, 1> depends = {
-			data::Storage::service
+		constexpr static const std::array<modules::ServiceName, 2> depends = {
+			data::Storage::service,
+			assets::CheckinAdapted::service
 		};
-		static bool factory(modules::ModuleService name, modules::Services &serviceManager);
+		static bool factory(modules::ServiceName name, modules::Services &serviceManager);
 	};
 
-	bool FreeType::factory(modules::ModuleService service, modules::Services &services) {
+	bool FreeType::factory(modules::ServiceName service, modules::Services &services) {
 		if (service == FontLibrary::service) {
 			auto storage = services.get<data::Storage>();
 			services.create<FontLibrary>(storage);
+
+			auto* checkin = services.get<assets::CheckinAdapted>();
+			checkin->setLoader( MIME_TTF, assets::NEEDS_CHECKIN, is_font );
+
 			return true;
 		}
+
+		if ( service == model::WidgetFactory::service ) {
+			auto fonts = services.get<FontLibrary>();
+			services.create<model::WidgetFactory>(fonts);
+			return true;
+		}
+
 		return false;
 	}
 }

include/fggl/gui/renderer/renderer.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 04/03/23.
+//
+
+#ifndef FGGL_GUI_RENDERER_RENDERER_HPP
+#define FGGL_GUI_RENDERER_RENDERER_HPP
+
+#include <fggl/gui/model/structure.hpp>
+#include <fggl/gfx/paint.hpp>
+
+namespace fggl::gui::renderer {
+
+	struct Box {
+		float top;
+		float right;
+		float bottom;
+		float left;
+
+		inline Box trim(Box border) const {
+			return {
+				top + border.top,
+				right - border.right,
+				bottom - border.bottom,
+				left + border.left
+			};
+		}
+
+		inline Box expand(Box border) const {
+			return {
+				top - border.top,
+				right + border.right,
+				bottom + border.bottom,
+				left - border.left
+			};
+		}
+
+		inline float width() const {
+			return right - left;
+		}
+
+		inline float height() const {
+			return bottom - top;
+		}
+	};
+
+	inline math::vec2 get_vec2(const model::Widget& root, const std::string& name) {
+		if ( !root.hasAttr(name) ) {
+			return {};
+		}
+		return root.get<math::vec2>(name);
+	}
+
+	inline math::vec3 get_vec3_rgb(const model::Widget& root, const std::string& name) {
+		if ( !root.hasAttr(name) ) {
+			return {};
+		}
+		return root.get<math::vec3>(name);
+	}
+
+	inline Box get_box(const model::Widget& root, const std::string& name) {
+		return {
+			root.get_or_default<float>(name + "::top"),
+			root.get_or_default<float>(name + "::right"),
+			root.get_or_default<float>(name + "::bottom"),
+			root.get_or_default<float>(name + "::left")
+		};
+	}
+
+	inline Box getBounds(math::vec2 pos, math::vec2 size) {
+		return {
+			pos.y,
+			pos.x + size.x,
+			pos.y + size.y,
+			pos.x
+		};
+	}
+
+	void draw_box(gfx::Path2D &path, glm::vec2 topLeft, glm::vec2 bottomRight);
+
+	void draw_border_patch(gfx::Paint& paint, Box& bounds, Box& size, math::vec3 colour);
+
+	void draw_border_solid(gfx::Paint& paint, Box& bounds, Box& size, math::vec3 colour);
+
+	void draw_background_solid(gfx::Paint& paint, Box& bounds, math::vec3 colour);
+
+	void layout(model::Widget& root);
+
+	void visit(const model::Widget& root, gfx::Paint& paint, Box offset = {0.0F, 1024.0F, 768.0F, 0.0F});
+
+} // namespace fggl::gui::renderer
+
+#endif //FGGL_GUI_RENDERER_RENDERER_HPP

include/fggl/gui/widgets.hpp

@@ -61,7 +61,7 @@ namespace fggl::gui {
 			}
 
 			void layout() override;
-			inline void update(float deltaTime) override {}
+			inline void update(float /*deltaTime*/) override {}
 
 		private:
 			std::shared_ptr<gui::FontFace> m_font;
@@ -83,7 +83,7 @@ namespace fggl::gui {
 			[[nodiscard]]
 			std::string label() const;
 
-			inline void update(float deltaTime) override {}
+			inline void update(float /*deltaTime*/) override {}
 
 			void addCallback(Callback callback);
 			void layout() override;

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

@@ -27,14 +27,14 @@ 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 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/fmath.hpp

@@ -84,6 +84,21 @@ namespace fggl::math {
 		return valueOrMin > max ? max : valueOrMin;
 	}
 
+	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
 
 

include/fggl/math/imath.hpp

@@ -19,10 +19,12 @@
 #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) {
+	constexpr int wrap(int value, int max) {
 		if (value < 0)
 			return (value - 1) - (-1 - value) % value;
 		if (value >= max)
@@ -31,7 +33,7 @@ namespace fggl::math {
 	}
 
 	// 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);
@@ -39,19 +41,47 @@ namespace fggl::math {
 		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/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