From 7ad8ae5e40debbe17dfd677c587855c55356a96e Mon Sep 17 00:00:00 2001
From: Daniel Evans <dan@rekt.io>
Date: Fri, 2 Dec 2016 00:42:38 +0000
Subject: [PATCH] Make loadTXD synchronous only

---
 rwengine/src/engine/GameData.cpp   | 20 +++++++++++---------
 rwengine/src/engine/GameData.hpp   |  3 ++-
 rwengine/src/engine/GameWorld.cpp  |  4 ++--
 rwlib/source/loaders/LoaderTXD.cpp | 23 +----------------------
 rwlib/source/loaders/LoaderTXD.hpp | 19 -------------------
 5 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp
index fdc1e387..6ff9198e 100644
--- a/rwengine/src/engine/GameData.cpp
+++ b/rwengine/src/engine/GameData.cpp
@@ -295,21 +295,23 @@ void GameData::loadWater(const std::string& path) {
     }
 }
 
-void GameData::loadTXD(const std::string& name, bool async) {
+void GameData::loadTXD(const std::string& name) {
     if (loadedFiles.find(name) != loadedFiles.end()) {
         return;
     }
 
     loadedFiles[name] = true;
 
-    auto j = new LoadTextureArchiveJob(workContext, &index, textures, name);
+    /// @todo refactor loadTXD to use correct file locations
+    auto file = index.openFile(name);
+    if (!file) {
+        logger->error("Data", "Failed to open txd: " + name);
+        return;
+    }
 
-    if (async) {
-        workContext->queueJob(j);
-    } else {
-        j->work();
-        j->complete();
-        delete j;
+    TextureLoader l;
+    if (!l.loadFromMemory(file, textures)) {
+        logger->error("Data", "Error loading txd: " + name);
     }
 }
 
@@ -493,7 +495,7 @@ void GameData::loadSplash(const std::string& name) {
     std::string lower(name);
     std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
-    loadTXD(lower + ".txd", false);
+    loadTXD(lower + ".txd");
 
     engine->state->currentSplash = lower;
 }
diff --git a/rwengine/src/engine/GameData.hpp b/rwengine/src/engine/GameData.hpp
index 74169c5c..47028157 100644
--- a/rwengine/src/engine/GameData.hpp
+++ b/rwengine/src/engine/GameData.hpp
@@ -18,6 +18,7 @@ class Logger;
 #include <audio/MADStream.hpp>
 #include <gl/TextureData.hpp>
 #include <platform/FileIndex.hpp>
+#include <job/WorkContext.hpp>
 
 #include <memory>
 
@@ -115,7 +116,7 @@ public:
     /**
      * Attempts to load a TXD, or does nothing if it has already been loaded
      */
-    void loadTXD(const std::string& name, bool async = false);
+    void loadTXD(const std::string& name);
 
     /**
      * Converts combined {name}_l{LOD} into name and lod.
diff --git a/rwengine/src/engine/GameWorld.cpp b/rwengine/src/engine/GameWorld.cpp
index 49d35fbf..d393d7ef 100644
--- a/rwengine/src/engine/GameWorld.cpp
+++ b/rwengine/src/engine/GameWorld.cpp
@@ -168,7 +168,7 @@ InstanceObject* GameWorld::createInstance(const uint16_t id,
                        std::begin(texturename), tolower);
 
         if (!texturename.empty()) {
-            data->loadTXD(texturename + ".txd", true);
+            data->loadTXD(texturename + ".txd");
         }
 
         // Check for dynamic data.
@@ -261,7 +261,7 @@ CutsceneObject* GameWorld::createCutsceneObject(const uint16_t id,
     }
 
     if (!texturename.empty()) {
-        data->loadTXD(texturename + ".txd", true);
+        data->loadTXD(texturename + ".txd");
     }
 
     auto instance = new CutsceneObject(this, pos, rot, model, modelinfo);
diff --git a/rwlib/source/loaders/LoaderTXD.cpp b/rwlib/source/loaders/LoaderTXD.cpp
index 4fb02338..587acded 100644
--- a/rwlib/source/loaders/LoaderTXD.cpp
+++ b/rwlib/source/loaders/LoaderTXD.cpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <vector>
 
 GLuint gErrorTextureData[] = {0xFFFF00FF, 0xFF000000, 0xFF000000, 0xFFFF00FF};
 GLuint gDebugTextureData[] = {0xFF0000FF, 0xFF00FF00};
@@ -190,25 +191,3 @@ bool TextureLoader::loadFromMemory(FileHandle file,
 
     return true;
 }
-
-// TODO Move the Job system out of the loading code
-#include <platform/FileIndex.hpp>
-
-LoadTextureArchiveJob::LoadTextureArchiveJob(WorkContext* context,
-                                             FileIndex* index,
-                                             TextureArchive& inTextures,
-                                             const std::string& file)
-    : WorkJob(context), archive(inTextures), fileIndex(index), _file(file) {
-}
-
-void LoadTextureArchiveJob::work() {
-    data = fileIndex->openFile(_file);
-}
-
-void LoadTextureArchiveJob::complete() {
-    // TODO error status
-    if (data) {
-        TextureLoader loader;
-        loader.loadFromMemory(data, archive);
-    }
-}
diff --git a/rwlib/source/loaders/LoaderTXD.hpp b/rwlib/source/loaders/LoaderTXD.hpp
index 1dce4cc8..d4299dbc 100644
--- a/rwlib/source/loaders/LoaderTXD.hpp
+++ b/rwlib/source/loaders/LoaderTXD.hpp
@@ -5,7 +5,6 @@
 #include <loaders/RWBinaryStream.hpp>
 
 #include <functional>
-#include <job/WorkContext.hpp>
 #include <map>
 #include <platform/FileHandle.hpp>
 #include <string>
@@ -22,22 +21,4 @@ public:
     bool loadFromMemory(FileHandle file, TextureArchive& inTextures);
 };
 
-// TODO: refactor this interface to be more like ModelLoader so they can be
-// rolled into one.
-class LoadTextureArchiveJob : public WorkJob {
-private:
-    TextureArchive& archive;
-    FileIndex* fileIndex;
-    std::string _file;
-    FileHandle data;
-
-public:
-    LoadTextureArchiveJob(WorkContext* context, FileIndex* index,
-                          TextureArchive& inTextures, const std::string& file);
-
-    void work();
-
-    void complete();
-};
-
 #endif