diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/font.hpp | 6 | ||||
| -rw-r--r-- | include/ui.hpp | 2 | ||||
| -rw-r--r-- | include/vector2.hpp | 17 |
3 files changed, 22 insertions, 3 deletions
diff --git a/include/font.hpp b/include/font.hpp index 0a6e38b..20d27be 100644 --- a/include/font.hpp +++ b/include/font.hpp @@ -51,6 +51,9 @@ public: FT_Done_FreeType(ftLibrary); } + constexpr static inline int SizeSmall = 16; + constexpr static inline int SizeLarge = 24; + static void init(const std::string& ttf); static void setFontSize(int size); static void setFontColor(float r, float g, float b); @@ -65,6 +68,9 @@ public: static inline auto& getFont(void) { return fontData.at(currentSize); } + + static inline auto getCharWidth(char c) + { return fontData.at(currentSize)[c - 33].wh.x; } }; #endif // FONT_HPP_ diff --git a/include/ui.hpp b/include/ui.hpp index 61c06cf..70f3b80 100644 --- a/include/ui.hpp +++ b/include/ui.hpp @@ -83,7 +83,7 @@ public: */ static void putText(const vec2& p, const std::string& s, ...); - static void putString(const vec2& p, const std::string& s, float wrap = 0.12345f); + static void putString(const vec2& p, const std::string& s, float wrap = 0); static float putStringCentered(const vec2& p, const std::string& s, bool print = true); static void dialogBox(const std::string& n, const std::string& s, ...); diff --git a/include/vector2.hpp b/include/vector2.hpp index 5c9f9e1..54b0809 100644 --- a/include/vector2.hpp +++ b/include/vector2.hpp @@ -4,6 +4,9 @@ #include <string> #include <type_traits> +#include <sstream> +#include <iomanip> + template<typename T> struct vector2 { static_assert(std::is_arithmetic<T>::value, "vector2 members must be an arithmetic type (i.e. numbers)"); @@ -123,8 +126,18 @@ struct vector2 { } // other functions - std::string toString(void) const { - return "(" + std::to_string(x) + ", " + std::to_string(y) + ")"; + std::string toString(int precision = -1) const { + std::stringstream ss; + std::string sx, sy; + ss << std::fixed; + if (precision > -1) + ss << std::setprecision(precision); + ss << x; + sx = ss.str(); + ss.str(std::string()); + ss << y; + sy = ss.str(); + return "(" + sx + ", " + sy + ")"; } }; |