font stuff

Author: Sploder12

src/include/sndx/render/atlas.hpp

@@ -13,8 +13,7 @@
 namespace sndx::render {
 
 	template <class IdT = std::string>
-	class ImageAtlas {
-	private:
+	struct ImageAtlas {
 		struct Entry {
 			glm::vec<2, size_t> pos, dims;
 		};
@@ -27,33 +26,20 @@ namespace sndx::render {
 
 		ImageAtlas(decltype(m_entries)&& entries, ImageData&& image) :
 			m_entries(std::move(entries)), m_image(std::move(image)) {}
-	public:
-
-		[[nodiscard]]
-		const auto& getImage() const {
-			return m_image;
-		}
-
-		[[nodiscard]]
-		const auto& getEntry(const IdT& id) const {
-			return m_entries.at(id);
-		}
+	};
 
-		[[nodiscard]]
-		auto size() const {
-			return m_entries.size();
-		}
+	template <class IdT> [[nodiscard]]
+	inline std::unordered_map<IdT, std::pair<glm::vec2, glm::vec2>> normalizeAtlasEntries(const std::unordered_map<IdT, typename ImageAtlas<IdT>::Entry>& entries, glm::vec2 size) {
+		std::unordered_map<IdT, std::pair<glm::vec2, glm::vec2>> out{};
+		out.reserve(entries.size());
 
-		[[nodiscard]]
-		auto begin() const {
-			return m_entries.begin();
+		const glm::vec2 scaling = 1.0f / size;
+		for (const auto& [id, entry] : entries) {
+			out.emplace(id, std::pair{ entry.pos * scaling, entry.dims * scaling });
 		}
 
-		[[nodiscard]]
-		auto end() const {
-			return m_entries.end();
-		}
-	};
+		return out;
+	}
 
 	template <class TextureT, class IdT = std::string>
 	class TextureAtlas {
@@ -70,17 +56,22 @@ namespace sndx::render {
 	public:
 
 		TextureAtlas(const ImageAtlas<IdT>& atlas, bool compress = false):
-			m_entries{}, m_texture{atlas.getImage(), 0, compress } {
-			m_entries.reserve(atlas.size());
-			const auto& image = atlas.getImage();
+			m_entries{}, m_texture{atlas.m_image, 0, compress } {
+			m_entries.reserve(atlas.m_entries.size());
+			const auto& image = atlas.m_image;
 
 			glm::vec2 scaling = 1.0f / glm::vec2{ image.width(), image.height()};
 
-			for (const auto& [id, entry] : atlas) {
+			for (const auto& [id, entry] : atlas.m_entries) {
 				Entry e{ glm::vec2{entry.pos} *scaling, glm::vec2{entry.dims} *scaling };
 				m_entries.emplace(id, std::move(e));
 			}
 		}
+
+		[[nodiscard]]
+		const auto& getEntries() const {
+			return m_entries;
+		}
 
 		[[nodiscard]]
 		const auto& getTexture() const {

src/include/sndx/render/font.hpp

@@ -12,8 +12,8 @@
 
 namespace sndx::render {
 	struct GlyphMetric {
-		glm::ivec2 bearing, dims;
-		float advance;
+		glm::ivec2 bearing{}, dims{};
+		float advance{};
 
 		constexpr GlyphMetric() = default;
 
@@ -23,7 +23,7 @@ namespace sndx::render {
 
 	template <class AtlasT = TextureAtlas<FT_ULong>> 
 	class Font {
-	private:
+	public:
 		AtlasT m_atlas;
 		std::unordered_map<FT_ULong, GlyphMetric> m_metrics{};
 
@@ -35,7 +35,6 @@ namespace sndx::render {
 		Font(AtlasT&& atlas, const std::unordered_map<FT_ULong, GlyphMetric>& metrics, int maxBearingY, bool sdf) :
 			m_atlas(std::move(atlas)), m_metrics(metrics), m_maxBearingY(maxBearingY), m_sdf(sdf) {}
 
-	public:
 		// returns charcode if it exists, the charcode "white square" otherwise
 		[[nodiscard]]
 		FT_ULong getChar(FT_ULong charcode) const {
@@ -53,11 +52,6 @@ namespace sndx::render {
 		const GlyphMetric& getCharMetrics(FT_ULong charcode) const {
 			return m_metrics.at(getChar(charcode));
 		}
-
-		[[nodiscard]]
-		const auto& getAtlas() const {
-			return m_atlas;
-		}
 	};
 
 	class FontBuilder {
@@ -73,7 +67,7 @@ namespace sndx::render {
 
 		using DefaultPacker = decltype(m_builder)::DefaultPacker;
 
-		friend class FreetypeContext;
+		friend struct FreetypeContext;
 
 		FontBuilder(MetricsT&& metrics, GlyphsT&& glyphs, int maxBearingY, bool sdf) :
 			m_metrics(std::move(metrics)), m_glyphs(std::move(glyphs)), m_maxBearingY(maxBearingY), m_sdf(sdf) {