change fonts to woff2

54 files changed, 20 insertions, 16 deletions

diff --git a/assets/opensb/font/barcode.ttf b/assets/opensb/font/barcode.ttf
deleted file mode 100644
index bd8db3e..0000000
--- a/assets/opensb/font/barcode.ttf
+++ /dev/null
diff --git a/assets/opensb/font/barcode/barcode.woff2 b/assets/opensb/font/barcode/barcode.woff2
new file mode 100644
index 0000000..14a5d09
--- /dev/null
+++ b/assets/opensb/font/barcode/barcode.woff2
diff --git a/assets/opensb/font/barcode/barcodetext.woff2 b/assets/opensb/font/barcode/barcodetext.woff2
new file mode 100644
index 0000000..5c36d20
--- /dev/null
+++ b/assets/opensb/font/barcode/barcodetext.woff2
diff --git a/assets/opensb/font/barcodetext.ttf b/assets/opensb/font/barcodetext.ttf
deleted file mode 100644
index e9833dc..0000000
--- a/assets/opensb/font/barcodetext.ttf
+++ /dev/null
diff --git a/assets/opensb/font/beech.ttf b/assets/opensb/font/beech.ttf
deleted file mode 100644
index ab6e755..0000000
--- a/assets/opensb/font/beech.ttf
+++ /dev/null
diff --git a/assets/opensb/font/beech.woff2 b/assets/opensb/font/beech.woff2
new file mode 100644
index 0000000..9deaead
--- /dev/null
+++ b/assets/opensb/font/beech.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extended.ttf b/assets/opensb/font/iosevka/iosevka-extended.ttf
deleted file mode 100644
index 4dcfe07..0000000
--- a/assets/opensb/font/iosevka/iosevka-extended.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extended.woff2 b/assets/opensb/font/iosevka/iosevka-extended.woff2
new file mode 100644
index 0000000..d7f3f3e
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extended.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextrabold.ttf b/assets/opensb/font/iosevka/iosevka-extendedextrabold.ttf
deleted file mode 100644
index eefff2b..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedextrabold.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextrabold.woff2 b/assets/opensb/font/iosevka/iosevka-extendedextrabold.woff2
new file mode 100644
index 0000000..15ea6b6
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedextrabold.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.ttf
deleted file mode 100644
index e0728af..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.woff2 b/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.woff2
new file mode 100644
index 0000000..0c2881b
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedextraboldoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextralight.ttf b/assets/opensb/font/iosevka/iosevka-extendedextralight.ttf
deleted file mode 100644
index 568547c..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedextralight.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextralight.woff2 b/assets/opensb/font/iosevka/iosevka-extendedextralight.woff2
new file mode 100644
index 0000000..59afa90
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedextralight.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.ttf
deleted file mode 100644
index 22fc898..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.woff2 b/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.woff2
new file mode 100644
index 0000000..b02fb04
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedextralightoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedoblique.ttf
deleted file mode 100644
index b01e43d..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedoblique.woff2 b/assets/opensb/font/iosevka/iosevka-extendedoblique.woff2
new file mode 100644
index 0000000..fe05a91
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedsemibold.ttf b/assets/opensb/font/iosevka/iosevka-extendedsemibold.ttf
deleted file mode 100644
index c8b29d2..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedsemibold.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedsemibold.woff2 b/assets/opensb/font/iosevka/iosevka-extendedsemibold.woff2
new file mode 100644
index 0000000..d51aa87
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedsemibold.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.ttf
deleted file mode 100644
index 1ad0c75..0000000
--- a/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.woff2 b/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.woff2
new file mode 100644
index 0000000..ba2d6c5
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extendedsemiboldoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extrabold.ttf b/assets/opensb/font/iosevka/iosevka-extrabold.ttf
deleted file mode 100644
index f7e8b2a..0000000
--- a/assets/opensb/font/iosevka/iosevka-extrabold.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extrabold.woff2 b/assets/opensb/font/iosevka/iosevka-extrabold.woff2
new file mode 100644
index 0000000..f6de179
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extrabold.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extraboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-extraboldoblique.ttf
deleted file mode 100644
index 3cc300c..0000000
--- a/assets/opensb/font/iosevka/iosevka-extraboldoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extraboldoblique.woff2 b/assets/opensb/font/iosevka/iosevka-extraboldoblique.woff2
new file mode 100644
index 0000000..a040e29
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extraboldoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extralight.ttf b/assets/opensb/font/iosevka/iosevka-extralight.ttf
deleted file mode 100644
index 2569b41..0000000
--- a/assets/opensb/font/iosevka/iosevka-extralight.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extralight.woff2 b/assets/opensb/font/iosevka/iosevka-extralight.woff2
new file mode 100644
index 0000000..607e9ae
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extralight.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-extralightoblique.ttf b/assets/opensb/font/iosevka/iosevka-extralightoblique.ttf
deleted file mode 100644
index e07eafb..0000000
--- a/assets/opensb/font/iosevka/iosevka-extralightoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-extralightoblique.woff2 b/assets/opensb/font/iosevka/iosevka-extralightoblique.woff2
new file mode 100644
index 0000000..e56b986
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-extralightoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-oblique.ttf b/assets/opensb/font/iosevka/iosevka-oblique.ttf
deleted file mode 100644
index 974e7f3..0000000
--- a/assets/opensb/font/iosevka/iosevka-oblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-oblique.woff2 b/assets/opensb/font/iosevka/iosevka-oblique.woff2
new file mode 100644
index 0000000..a0c11cf
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-oblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-semibold.ttf b/assets/opensb/font/iosevka/iosevka-semibold.ttf
deleted file mode 100644
index 790ed69..0000000
--- a/assets/opensb/font/iosevka/iosevka-semibold.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-semibold.woff2 b/assets/opensb/font/iosevka/iosevka-semibold.woff2
new file mode 100644
index 0000000..2387364
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-semibold.woff2
diff --git a/assets/opensb/font/iosevka/iosevka-semiboldoblique.ttf b/assets/opensb/font/iosevka/iosevka-semiboldoblique.ttf
deleted file mode 100644
index 6494b71..0000000
--- a/assets/opensb/font/iosevka/iosevka-semiboldoblique.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka-semiboldoblique.woff2 b/assets/opensb/font/iosevka/iosevka-semiboldoblique.woff2
new file mode 100644
index 0000000..1335205
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka-semiboldoblique.woff2
diff --git a/assets/opensb/font/iosevka/iosevka.ttf b/assets/opensb/font/iosevka/iosevka.ttf
deleted file mode 100644
index 6e74875..0000000
--- a/assets/opensb/font/iosevka/iosevka.ttf
+++ /dev/null
diff --git a/assets/opensb/font/iosevka/iosevka.woff2 b/assets/opensb/font/iosevka/iosevka.woff2
new file mode 100644
index 0000000..765597a
--- /dev/null
+++ b/assets/opensb/font/iosevka/iosevka.woff2
diff --git a/assets/opensb/font/newspaper.ttf b/assets/opensb/font/newspaper.ttf
deleted file mode 100644
index c9bea16..0000000
--- a/assets/opensb/font/newspaper.ttf
+++ /dev/null
diff --git a/assets/opensb/font/newspaper.woff2 b/assets/opensb/font/newspaper.woff2
new file mode 100644
index 0000000..ca7389e
--- /dev/null
+++ b/assets/opensb/font/newspaper.woff2
diff --git a/assets/opensb/font/pixelhobo.ttf b/assets/opensb/font/pixelhobo.ttf
deleted file mode 100644
index fd7a473..0000000
--- a/assets/opensb/font/pixelhobo.ttf
+++ /dev/null
diff --git a/assets/opensb/font/pixelhobo.woff2 b/assets/opensb/font/pixelhobo.woff2
new file mode 100644
index 0000000..1754f67
--- /dev/null
+++ b/assets/opensb/font/pixelhobo.woff2
diff --git a/assets/opensb/font/spacemono/spacemono-bold.ttf b/assets/opensb/font/spacemono/spacemono-bold.ttf
deleted file mode 100644
index 20e3449..0000000
--- a/assets/opensb/font/spacemono/spacemono-bold.ttf
+++ /dev/null
diff --git a/assets/opensb/font/spacemono/spacemono-bold.woff2 b/assets/opensb/font/spacemono/spacemono-bold.woff2
new file mode 100644
index 0000000..68ae1c4
--- /dev/null
+++ b/assets/opensb/font/spacemono/spacemono-bold.woff2
diff --git a/assets/opensb/font/spacemono/spacemono-bolditalic.ttf b/assets/opensb/font/spacemono/spacemono-bolditalic.ttf
deleted file mode 100644
index ff2ea5a..0000000
--- a/assets/opensb/font/spacemono/spacemono-bolditalic.ttf
+++ /dev/null
diff --git a/assets/opensb/font/spacemono/spacemono-bolditalic.woff2 b/assets/opensb/font/spacemono/spacemono-bolditalic.woff2
new file mode 100644
index 0000000..dd7cbcc
--- /dev/null
+++ b/assets/opensb/font/spacemono/spacemono-bolditalic.woff2
diff --git a/assets/opensb/font/spacemono/spacemono-italic.ttf b/assets/opensb/font/spacemono/spacemono-italic.ttf
deleted file mode 100644
index f36282f..0000000
--- a/assets/opensb/font/spacemono/spacemono-italic.ttf
+++ /dev/null
diff --git a/assets/opensb/font/spacemono/spacemono-italic.woff2 b/assets/opensb/font/spacemono/spacemono-italic.woff2
new file mode 100644
index 0000000..a8d5b87
--- /dev/null
+++ b/assets/opensb/font/spacemono/spacemono-italic.woff2
diff --git a/assets/opensb/font/spacemono/spacemono.ttf b/assets/opensb/font/spacemono/spacemono.ttf
deleted file mode 100644
index 04e56b9..0000000
--- a/assets/opensb/font/spacemono/spacemono.ttf
+++ /dev/null
diff --git a/assets/opensb/font/spacemono/spacemono.woff2 b/assets/opensb/font/spacemono/spacemono.woff2
new file mode 100644
index 0000000..b7d252a
--- /dev/null
+++ b/assets/opensb/font/spacemono/spacemono.woff2
diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp
index 01a6001..53c008d 100644
--- a/source/base/StarAssets.cpp
+++ b/source/base/StarAssets.cpp
@@ -1181,7 +1181,7 @@ shared_ptr<Assets::AssetData> Assets::loadAudio(AssetPath const& path) const {
 shared_ptr<Assets::AssetData> Assets::loadFont(AssetPath const& path) const {
   return unlockDuring([&]() {
     auto newData = make_shared<FontData>();
-    newData->font = Font::loadTrueTypeFont(make_shared<ByteArray>(read(path.basePath)));
+    newData->font = Font::loadFont(make_shared<ByteArray>(read(path.basePath)));
     return newData;
   });
 }
diff --git a/source/core/StarFont.cpp b/source/core/StarFont.cpp
index 82151e3..63356ad 100644
--- a/source/core/StarFont.cpp
+++ b/source/core/StarFont.cpp
@@ -32,11 +32,11 @@ struct FontImpl {
   FT_Face face;
 };
 
-FontPtr Font::loadTrueTypeFont(String const& fileName, unsigned pixelSize) {
-  return loadTrueTypeFont(make_shared<ByteArray>(File::readFile(fileName)), pixelSize);
+FontPtr Font::loadFont(String const& fileName, unsigned pixelSize) {
+  return loadFont(make_shared<ByteArray>(File::readFile(fileName)), pixelSize);
 }
 
-FontPtr Font::loadTrueTypeFont(ByteArrayConstPtr const& bytes, unsigned pixelSize) {
+FontPtr Font::loadFont(ByteArrayConstPtr const& bytes, unsigned pixelSize) {
   FontPtr font = make_shared<Font>();
   font->m_fontBuffer = bytes;
 
@@ -54,7 +54,7 @@ FontPtr Font::loadTrueTypeFont(ByteArrayConstPtr const& bytes, unsigned pixelSiz
 Font::Font() : m_pixelSize(0), m_alphaThreshold(0) {}
 
 FontPtr Font::clone() const {
-  return Font::loadTrueTypeFont(m_fontBuffer, m_pixelSize);
+  return Font::loadFont(m_fontBuffer, m_pixelSize);
 }
 
 void Font::setPixelSize(unsigned pixelSize) {
diff --git a/source/core/StarFont.hpp b/source/core/StarFont.hpp
index 1fa5c8c..ec10533 100644
--- a/source/core/StarFont.hpp
+++ b/source/core/StarFont.hpp
@@ -14,8 +14,8 @@ STAR_CLASS(Font);
 
 class Font {
 public:
-  static FontPtr loadTrueTypeFont(String const& fileName, unsigned pixelSize = 12);
-  static FontPtr loadTrueTypeFont(ByteArrayConstPtr const& bytes, unsigned pixelSize = 12);
+  static FontPtr loadFont(String const& fileName, unsigned pixelSize = 12);
+  static FontPtr loadFont(ByteArrayConstPtr const& bytes, unsigned pixelSize = 12);
 
   Font();
 
diff --git a/source/rendering/StarTextPainter.cpp b/source/rendering/StarTextPainter.cpp
index 3266e18..58b5cbc 100644
--- a/source/rendering/StarTextPainter.cpp
+++ b/source/rendering/StarTextPainter.cpp
@@ -337,15 +337,19 @@ void TextPainter::reloadFonts() {
   auto assets = Root::singleton().assets();
   String defaultName = "hobo";
   auto defaultFont = loadFont("/hobo.ttf", defaultName);
-  for (auto& fontPath : assets->scanExtension("ttf")) {
-    auto font = assets->font(fontPath);
-    if (font == defaultFont)
-      continue;
-
-    auto name = AssetPath::filename(fontPath);
-    name = name.substr(0, name.findLast("."));
-    addFont(loadFont(fontPath, name), name);
-  }
+  auto loadFontsByExtension = [&](String const& ext) {
+    for (auto& fontPath : assets->scanExtension(ext)) {
+      auto font = assets->font(fontPath);
+      if (font == defaultFont)
+        continue;
+
+      auto name = AssetPath::filename(fontPath);
+      name = name.substr(0, name.findLast("."));
+      addFont(loadFont(fontPath, name), name);
+    }
+  };
+  loadFontsByExtension("ttf");
+  loadFontsByExtension("woff2");
   m_fontTextureGroup.addFont(defaultFont, defaultName, true);
 }