From b2b0fafe76367690b621fbcc6262485c33961dda Mon Sep 17 00:00:00 2001
From: themancalledjakob <jakob@jrkb.land>
Date: Sun, 26 Mar 2023 21:18:33 +0200
Subject: [PATCH] get individual glyphgeometry ... and namespace

---
 src/Atlas.cpp | 39 ++++++++++++++++++++++++++++-----------
 src/Atlas.h   |  2 ++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/Atlas.cpp b/src/Atlas.cpp
index 53c67cf..24e6417 100644
--- a/src/Atlas.cpp
+++ b/src/Atlas.cpp
@@ -9,27 +9,28 @@
 #include <cstdlib>
 #include <set>
 
-ofxMsdfgen::Atlas::Atlas(){
+namespace ofxMsdfgen {
+Atlas::Atlas(){
 }
-ofxMsdfgen::Atlas::~Atlas(){
+Atlas::~Atlas(){
 }
 
-void ofxMsdfgen::Atlas::setup(string _fontPath){
+void Atlas::setup(string _fontPath){
     fontPath = _fontPath;
     if(generate()){
-        ofLogNotice("ofxMsdfgen::Atlas::setup()") << "generated Atlas";
+        ofLogNotice("Atlas::setup()") << "generated Atlas";
     }else{
-        ofLogError("ofxMsdfgen::Atlas::setup()") << "whoops, could not generate Atlas";
+        ofLogError("Atlas::setup()") << "whoops, could not generate Atlas";
     }
 }
 
-void ofxMsdfgen::Atlas::setup(string _fontPath,
-                              AtlasSettings _settings){
+void Atlas::setup(string _fontPath,
+                  AtlasSettings _settings){
     settings = _settings;
     setup(_fontPath);
 }
 
-bool ofxMsdfgen::Atlas::generate(){
+bool Atlas::generate(){
     bool success = false;
     //{
     msdfgen::FreetypeHandle * ft = msdfgen::initializeFreetype();
@@ -110,7 +111,8 @@ bool ofxMsdfgen::Atlas::generate(){
             // The atlas bitmap can now be retrieved via atlasStorage as a BitmapConstRef.
             // The glyphs array (or fontGeometry) contains positioning data for typesetting text.
             msdfgen::Bitmap <float, 3> bitmap(generator.atlasStorage());
-            ofxMsdfgen::toOfImage(bitmap, atlasImage);
+            toOfImage(bitmap, atlasImage);
+            atlasImage.update();
 
             std::vector <msdf_atlas::GlyphBox> layout = generator.getLayout();
             int i = 0;
@@ -129,10 +131,25 @@ bool ofxMsdfgen::Atlas::generate(){
     return success;
 }
 
-const ofImage & ofxMsdfgen::Atlas::getAtlasImage(){
+const ofImage & Atlas::getAtlasImage(){
     return atlasImage;
 }
 
-const vector <ofxMsdfgen::GlyphGeometry> & ofxMsdfgen::Atlas::getGlyphGeometries(){
+const vector <GlyphGeometry> & Atlas::getGlyphGeometries(){
     return glyphGeometries;
 }
+
+const GlyphGeometry & Atlas::getGlyphGeometry(unsigned char character){
+    for(const GlyphGeometry & gg : glyphGeometries){
+        if(gg.getCodepoint() == static_cast <msdf_atlas::unicode_t>(character)){
+            return gg;
+        }
+    }
+    // not found!
+    ofLogError("Atlas::getGlyphGeometry")
+        << "glyph(" << character << ") not found!" << endl
+        << "returning first glyph. this is bad." << endl;
+    // FIXME: proper error handling
+    return glyphGeometries[0];
+}
+}
diff --git a/src/Atlas.h b/src/Atlas.h
index 528a8bd..fffc437 100644
--- a/src/Atlas.h
+++ b/src/Atlas.h
@@ -5,6 +5,7 @@
 #include <freetype2/freetype/freetype.h>
 #include <msdf-atlas-gen/msdf-atlas-gen.h>
 #include <msdf-atlas-gen/types.h>
+#include <unordered_map>
 #include "conversion.h"
 
 namespace ofxMsdfgen {
@@ -30,6 +31,7 @@ class Atlas {
         bool generate();
         const ofImage & getAtlasImage();
         const vector <GlyphGeometry> & getGlyphGeometries();
+        const GlyphGeometry & getGlyphGeometry(unsigned char character);
         AtlasSettings settings;
     private:
         string fontPath;