diff --git a/assets/opensb/font/iosevka/iosevka-extended.ttf b/assets/opensb/font/iosevka/iosevka-extended.ttf new file mode 100644 index 0000000..786ebac Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extended.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedextrabold.ttf b/assets/opensb/font/iosevka/iosevka-extendedextrabold.ttf new file mode 100644 index 0000000..cc36fe0 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedextrabold.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.ttf new file mode 100644 index 0000000..b2df3e7 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedextralight.ttf b/assets/opensb/font/iosevka/iosevka-extendedextralight.ttf new file mode 100644 index 0000000..77bf0b6 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedextralight.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.ttf new file mode 100644 index 0000000..00b876b Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedoblique.ttf new file mode 100644 index 0000000..5b2a34a Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedsemibold.ttf b/assets/opensb/font/iosevka/iosevka-extendedsemibold.ttf new file mode 100644 index 0000000..740ea68 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedsemibold.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.ttf new file mode 100644 index 0000000..870077e Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extrabold.ttf b/assets/opensb/font/iosevka/iosevka-extrabold.ttf new file mode 100644 index 0000000..eb23806 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extrabold.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extraboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-extraboldoblique.ttf new file mode 100644 index 0000000..9363c9c Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extraboldoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extralight.ttf b/assets/opensb/font/iosevka/iosevka-extralight.ttf new file mode 100644 index 0000000..a5ca425 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extralight.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-extralightoblique.ttf b/assets/opensb/font/iosevka/iosevka-extralightoblique.ttf new file mode 100644 index 0000000..88d0307 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-extralightoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-oblique.ttf b/assets/opensb/font/iosevka/iosevka-oblique.ttf new file mode 100644 index 0000000..b21eb7d Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-oblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-semibold.ttf b/assets/opensb/font/iosevka/iosevka-semibold.ttf new file mode 100644 index 0000000..b521000 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-semibold.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka-semiboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-semiboldoblique.ttf new file mode 100644 index 0000000..9923d08 Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka-semiboldoblique.ttf differ diff --git a/assets/opensb/font/iosevka/iosevka.ttf b/assets/opensb/font/iosevka/iosevka.ttf new file mode 100644 index 0000000..919aaed Binary files /dev/null and b/assets/opensb/font/iosevka/iosevka.ttf differ diff --git a/assets/opensb/font/mono-b.ttf b/assets/opensb/font/spacemono/spacemono-bold.ttf similarity index 100% rename from assets/opensb/font/mono-b.ttf rename to assets/opensb/font/spacemono/spacemono-bold.ttf diff --git a/assets/opensb/font/mono-bi.ttf b/assets/opensb/font/spacemono/spacemono-bolditalic.ttf similarity index 100% rename from assets/opensb/font/mono-bi.ttf rename to assets/opensb/font/spacemono/spacemono-bolditalic.ttf diff --git a/assets/opensb/font/mono-i.ttf b/assets/opensb/font/spacemono/spacemono-italic.ttf similarity index 100% rename from assets/opensb/font/mono-i.ttf rename to assets/opensb/font/spacemono/spacemono-italic.ttf diff --git a/assets/opensb/font/mono.ttf b/assets/opensb/font/spacemono/spacemono.ttf similarity index 100% rename from assets/opensb/font/mono.ttf rename to assets/opensb/font/spacemono/spacemono.ttf diff --git a/assets/opensb/interface.config.patch b/assets/opensb/interface.config.patch index 85e81cf..df471e1 100644 --- a/assets/opensb/interface.config.patch +++ b/assets/opensb/interface.config.patch @@ -14,7 +14,7 @@ "font" : "" }, - "debugFont" : "mono", + "debugFont" : "iosevka-extrabold", "debugFontSize" : 7, "debugFontDirectives" : "?border=1;2224;0000", diff --git a/source/core/StarFont.cpp b/source/core/StarFont.cpp index 9c8636a..6adc4c3 100644 --- a/source/core/StarFont.cpp +++ b/source/core/StarFont.cpp @@ -86,7 +86,7 @@ unsigned Font::width(String::Char c) { } -std::pair Font::render(String::Char c) { +std::pair Font::render(String::Char c) { if (!m_fontImpl) throw FontException("Font::render called on uninitialized font."); @@ -117,7 +117,7 @@ std::pair Font::render(String::Char c) { } } - return { move(image), (slot->bitmap_top - (int)height) + m_pixelSize / 4 }; + return { move(image), {slot->bitmap_left, (slot->bitmap_top - (int)height) + m_pixelSize / 4} }; } } diff --git a/source/core/StarFont.hpp b/source/core/StarFont.hpp index d353611..e4786b6 100644 --- a/source/core/StarFont.hpp +++ b/source/core/StarFont.hpp @@ -34,7 +34,7 @@ public: // May return empty image on unrenderable character (Normally, this will // render a box, but if there is an internal freetype error this may return // an empty image). - std::pair render(String::Char c); + std::pair render(String::Char c); private: FontImplPtr m_fontImpl; diff --git a/source/rendering/StarFontTextureGroup.cpp b/source/rendering/StarFontTextureGroup.cpp index e59d15c..6a33d32 100644 --- a/source/rendering/StarFontTextureGroup.cpp +++ b/source/rendering/StarFontTextureGroup.cpp @@ -67,7 +67,7 @@ const FontTextureGroup::GlyphTexture& FontTextureGroup::glyphTexture(String::Cha else res.first->second.offset = Vec2F(); - res.first->second.offset[1] += pair.second; + res.first->second.offset += Vec2F(pair.second); res.first->second.texture = m_textureGroup->create(image); }