TrueType Textures are now loading properly.

src/dawn/asset/loaders/TrueTypeLoader.cpp

@@ -18,6 +18,26 @@ TrueTypeLoader::TrueTypeLoader(const std::string name) :
 }
 
 void TrueTypeLoader::updateSync() {
+  if(state != TrueTypeLoaderState::ASYNC_DONE) return;
+  state = TrueTypeLoaderState::SYNC_LOADING;
+
+  // Init all the textures.
+  auto it = textures.begin();
+  while(it != textures.end()) {
+    auto texture = it->second.lock();
+
+    if(texture) {
+      texture->setFace(face);
+      it++;
+      continue;
+    }
+
+    it = textures.erase(it);
+  }
+
+  // Done
+  state = TrueTypeLoaderState::SYNC_DONE;
+  this->loaded = true;
 }
 
 void TrueTypeLoader::updateAsync() {
@@ -25,6 +45,7 @@ void TrueTypeLoader::updateAsync() {
   state = TrueTypeLoaderState::ASYNC_LOADING;
 
   // Load the data.
+  this->loader.open();
   size_t size = loader.getSize();
   buffer = new uint8_t[size];
 
@@ -39,7 +60,6 @@ void TrueTypeLoader::updateAsync() {
   // Now close the asset loader
   loader.close();
   state = TrueTypeLoaderState::ASYNC_DONE;
-  this->loaded = true;
 }
 
 std::shared_ptr<TrueTypeTexture> TrueTypeLoader::getTexture(
@@ -53,16 +73,25 @@ std::shared_ptr<TrueTypeTexture> TrueTypeLoader::getTexture(
   }
 
   // Create the texture.
-  auto texture = std::make_shared<TrueTypeTexture>(face, fontSize);
+  auto texture = std::make_shared<TrueTypeTexture>(fontSize);
   textures[fontSize] = texture;
+  if(this->loaded) texture->setFace(face);
   return texture;
 }
 
 TrueTypeLoader::~TrueTypeLoader() {
+  if(
+    this->state == TrueTypeLoaderState::SYNC_DONE ||
+    this->state == TrueTypeLoaderState::SYNC_LOADING ||
+    this->state == TrueTypeLoaderState::ASYNC_DONE
+  ) {
+    FT_Done_Face(face);
+  }
+
+  FT_Done_FreeType(fontLibrary);
+
   if(buffer != nullptr) {
     delete[] buffer;
     buffer = nullptr;
   }
-
-  FT_Done_FreeType(fontLibrary);
 }

src/dawn/asset/loaders/TrueTypeLoader.hpp

@@ -12,7 +12,9 @@ namespace Dawn {
   enum class TrueTypeLoaderState {
     INITIAL,
     ASYNC_LOADING,
-    ASYNC_DONE
+    ASYNC_DONE,
+    SYNC_LOADING,
+    SYNC_DONE
   };
 
   class TrueTypeLoader : public AssetLoader {