From d454dcf0051e1b6e32618fe6b4419fead04b8917 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 17 Apr 2022 19:08:48 -0400 Subject: [PATCH] Handle even more changes in libxiv refactors --- exdviewer/src/mainwindow.cpp | 3 +-- libxiv | 2 +- mdlviewer/src/mainwindow.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/exdviewer/src/mainwindow.cpp b/exdviewer/src/mainwindow.cpp index 952755d..11ea8b2 100644 --- a/exdviewer/src/mainwindow.cpp +++ b/exdviewer/src/mainwindow.cpp @@ -53,8 +53,7 @@ MainWindow::MainWindow(GameData& data) : data(data) { path = getEXDFilename(exh, nameLowercase, getLanguageCode(Language::English), page); } - data.extractFile("exd/" + path, path); - auto exd = readEXD(exh, path, page); + auto exd = readEXD(exh, *data.extractFile("exd/" + path), page); for (int i = 0; i < exd.rows.size(); i++) { for (int j = 0; j < exd.rows[i].data.size(); j++) { auto newItem = new QTableWidgetItem(exd.rows[i].data[j].data.c_str()); diff --git a/libxiv b/libxiv index b11767d..c78a1ab 160000 --- a/libxiv +++ b/libxiv @@ -1 +1 @@ -Subproject commit b11767dc0243d06b1811a43982c76dbe2716caaf +Subproject commit c78a1ab2458d18ddd92fc2728e3eedd95fdc4078 diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp index 2a74eae..b06462a 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/mdlviewer/src/mainwindow.cpp @@ -108,8 +108,7 @@ MainWindow::MainWindow(GameData& data) : data(data) { auto exh = *data.readExcelSheet("Item"); auto path = getEXDFilename(exh, "item", getLanguageCode(Language::English), exh.pages[1]); - data.extractFile("exd/" + path, path); - auto exd = readEXD(exh, path, exh.pages[1]); + auto exd = readEXD(exh, *data.extractFile("exd/" + path), exh.pages[1]); for(auto row : exd.rows) { auto primaryModel = row.data[47].uint64Data; auto secondaryModel = row.data[48].uint64Data; @@ -227,12 +226,13 @@ void MainWindow::refreshModel() { #endif for(auto gear : loadedGears) { - data.extractFile(build_equipment_path(gear->modelInfo.primaryID, currentRace, gear->slot), "top.mdl"); + auto mdl_data = data.extractFile(build_equipment_path(gear->modelInfo.primaryID, currentRace, gear->slot)); + auto model = parseMDL(*mdl_data); #ifndef USE_STANDALONE_WINDOW - vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod)); + vkWindow->models.push_back(renderer->addModel(model, currentLod)); #else - standaloneWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod)); + standaloneWindow->models.push_back(renderer->addModel(model, currentLod)); #endif } }