// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>,
-// Ingo Ruhnke <grumbel@gmx.de>
+// Ingo Ruhnke <grumbel@gmail.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
#include <stdint.h>
#include <string>
-#include "math/rect.hpp"
+#include "math/rectf.hpp"
#include "math/vector.hpp"
#include "video/color.hpp"
#include "video/surface.hpp"
VARIABLE
};
+public:
/** Construct a fixed-width font
*
* @param glyph_width VARIABLE for proportional fonts, VARIABLE for monospace ones
const Vector& position, DrawingEffect drawing_effect, Color color,
float alpha) const;
- GlyphWidth glyph_width;
-
- std::vector<Surface> glyph_surfaces;
- std::vector<Surface> shadow_surfaces;
- int char_height;
- int shadowsize;
-
+ void loadFontFile(const std::string &filename);
+ void loadFontSurface(const std::string &glyphimage,
+ const std::string &shadowimage,
+ const std::vector<std::string> &chars,
+ GlyphWidth glyph_width,
+ int char_width);
+private:
struct Glyph {
/** How many pixels should the cursor advance after printing the
glyph */
int surface_idx;
/** Position of the glyph inside the surface */
- Rect rect;
+ Rectf rect;
+
+ Glyph() :
+ advance(),
+ offset(),
+ surface_idx(),
+ rect()
+ {}
};
+private:
+ GlyphWidth glyph_width;
+
+ std::vector<SurfacePtr> glyph_surfaces;
+ std::vector<SurfacePtr> shadow_surfaces;
+ int char_height;
+ int shadowsize;
+ int border;
+
/** 65536 of glyphs */
std::vector<Glyph> glyphs;
-
- void loadFontFile(const std::string &filename);
- void loadFontSurface(const std::string &glyphimage,
- const std::string &shadowimage,
- const std::vector<std::string> &chars,
- GlyphWidth glyph_width,
- int char_width);
};
#endif