tidy up font loading a bit

Author: dhthwy

library/SDLConsole_impl.cpp

@@ -1228,7 +1228,7 @@ class Font : public SignalEmitter {
         return '?';
     }
 
-    Font make_copy()
+    Font clone()
     {
         return *this;
     }
@@ -1294,60 +1294,16 @@ class Font : public SignalEmitter {
 };
 
 
-using FontMap = std::map<std::pair<std::string, int>, Font>;
-class FontLoader {
-public:
-    FontLoader(SDL_Renderer* renderer)
-        : renderer_(renderer)
-    {
-    }
-
-    virtual ~FontLoader() = default;
-
-    virtual Font* open(const std::string& path, int size) = 0;
-
-    Font* base_font()
-    {
-        return &fmap_.begin()->second;
-    }
+using FontMap = std::map<std::string, Font>;
 
-    Font* clone(std::string key, Font* font)
-    {
-        auto kp = std::make_pair(key, 0);
-        auto result = fmap_.emplace(kp, font->make_copy());
-        return &result.first->second;
-    }
-
-    FontLoader(const FontLoader&) = delete;
-    FontLoader& operator=(const FontLoader&) = delete;
-
-    FontLoader(FontLoader&& other) noexcept
-        : fmap_(std::move(other.fmap_))
-        , renderer_(other.renderer_)
-        , textures_(std::move(other.textures_))
-    {
-    }
-
-    FontLoader& operator=(FontLoader&& other) noexcept
-    {
-        if (this != &other) {
-            fmap_ = std::move(other.fmap_);
-            renderer_ = other.renderer_;
-            textures_ = std::move(other.textures_);
-        }
-        return *this;
-    }
-
-protected:
+class BMPFontLoader {
+private:
     FontMap fmap_;
     SDL_Renderer* renderer_;
     std::vector<SDL_Texture*> textures_;
-};
-
-class BMPFontLoader : public FontLoader {
 public:
     BMPFontLoader(SDL_Renderer* renderer)
-        : FontLoader(renderer)
+        : renderer_(renderer)
     {
     }
 
@@ -1360,15 +1316,19 @@ class BMPFontLoader : public FontLoader {
         }*/
     }
 
-    Font* open(const std::string& path, int size)
+    Font* base_font()
     {
-        auto key = std::make_pair(path, 0);
-        auto it = fmap_.find(key);
+        return &fmap_.begin()->second;
+    }
 
-        if (it != fmap_.end()) {
-            return &it->second;
-        }
+    Font* clone(std::string key, Font* font)
+    {
+        auto it = fmap_.emplace(key, font->clone());
+        return &it.first->second;
+    }
 
+    Font* load(const std::string& path)
+    {
         SDL_Surface* surface = DFSDL::DFIMG_Load(path.c_str());
         if (surface == nullptr) {
             return nullptr;
@@ -1382,19 +1342,20 @@ class BMPFontLoader : public FontLoader {
         // Create a surface in ARGB8888 format, and replace the keyed color
         // with fully transparant pixels. This step completely removes the color.
         // NOTE: Do not use surface->pitch
-
         SDL_Surface* conv_surface = sdl_console::SDL_CreateRGBSurfaceWithFormat(0, surface->w, surface->h, 32,
                                                                                 SDL_PixelFormatEnum::SDL_PIXELFORMAT_ARGB8888);
         sdl_console::SDL_BlitSurface(surface, nullptr, conv_surface, nullptr);
         sdl_console::SDL_FreeSurface(surface);
         surface = conv_surface;
 
-        int width = surface->w;
-        int height = surface->h;
+         // FIXME: magic numbers
+        int cols = 16;
+        int rows = 16;
+        int glyph_w = surface->w / cols;
+        int glyph_h = surface->h / rows;
 
         std::vector<Glyph> glyphs;
-        // FIXME: magic numbers
-        glyphs = build_glyph_rects(width, height, 16, 16);
+        glyphs = build_glyph_rects(surface->w, surface->h, cols, rows);
 
         auto* texture = sdl_tsd.CreateTextureFromSurface(renderer_, surface);
         if (!texture ) {
@@ -1405,12 +1366,9 @@ class BMPFontLoader : public FontLoader {
         sdl_console::SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
         textures_.push_back(texture);
 
-        assert(width > 0);
-        assert(height > 0);
-
         // FIXME: magic numbers
-        auto result = fmap_.emplace(key, Font(renderer_, texture, glyphs, std::max(8, width/16), std::max(8, height/16)));
-        return &result.first->second;
+        auto it = fmap_.emplace(path, Font(renderer_, texture, glyphs, glyph_w, glyph_h));
+        return &it.first->second;
     }
 
     BMPFontLoader(const BMPFontLoader&) = delete;
@@ -1589,7 +1547,7 @@ class Widget : public SignalEmitter {
         , context(window_context)
 
     {
-        auto* bmpfont = context.font_loader.open("data/art/curses_640x300.png", 14);
+        auto* bmpfont = context.font_loader.load("data/art/curses_640x300.png");
         if (!bmpfont) {
             throw(std::runtime_error("Error loading font"));
         }