From 8b34cd08fee1fccf75ec4a0c83251315390257b7 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 13 Oct 2023 17:02:29 -0400 Subject: [PATCH] Update libphysis and adapt to API changes --- armoury/src/gearview.cpp | 10 +++++----- extern/libphysis | 2 +- mdlviewer/src/mainwindow.cpp | 2 +- sagasu/src/mainwindow.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/armoury/src/gearview.cpp b/armoury/src/gearview.cpp index cbd1371..8dca1ad 100644 --- a/armoury/src/gearview.cpp +++ b/armoury/src/gearview.cpp @@ -313,7 +313,7 @@ void GearView::updatePart() } if (mdl_data.size > 0) { - auto mdl = physis_mdl_parse(mdl_data.size, mdl_data.data); + auto mdl = physis_mdl_parse(mdl_data); std::vector materials; for (int i = 0; i < mdl.num_material_names; i++) { @@ -365,7 +365,7 @@ void GearView::updatePart() auto mdl_data = cache.lookupFile(mdlPath); if (mdl_data.size > 0) { - auto mdl = physis_mdl_parse(mdl_data.size, mdl_data.data); + auto mdl = physis_mdl_parse(mdl_data); std::vector materials; for (int i = 0; i < mdl.num_material_names; i++) { @@ -388,7 +388,7 @@ void GearView::updatePart() auto mdl_data = cache.lookupFile(mdlPath); if (mdl_data.size > 0) { - auto mdl = physis_mdl_parse(mdl_data.size, mdl_data.data); + auto mdl = physis_mdl_parse(mdl_data); std::vector materials; for (int i = 0; i < mdl.num_material_names; i++) { @@ -411,7 +411,7 @@ void GearView::updatePart() auto mdl_data = cache.lookupFile(mdlPath); if (mdl_data.size > 0) { - auto mdl = physis_mdl_parse(mdl_data.size, mdl_data.data); + auto mdl = physis_mdl_parse(mdl_data); std::vector materials; for (int i = 0; i < mdl.num_material_names; i++) { @@ -434,7 +434,7 @@ void GearView::updatePart() auto mdl_data = cache.lookupFile(mdlPath); if (mdl_data.size > 0) { - auto mdl = physis_mdl_parse(mdl_data.size, mdl_data.data); + auto mdl = physis_mdl_parse(mdl_data); const char *material_name = mdl.material_names[0]; const std::string skinmtrl_path = diff --git a/extern/libphysis b/extern/libphysis index c6f904c..14fa036 160000 --- a/extern/libphysis +++ b/extern/libphysis @@ -1 +1 @@ -Subproject commit c6f904c8c65b65b0bc2565b7b38991f4e7eaf737 +Subproject commit 14fa0367302aa2b3ef9a8adba5cbe61f81a1f672 diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp index 92c4049..ebac4cf 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/mdlviewer/src/mainwindow.cpp @@ -48,7 +48,7 @@ void MainWindow::setupFileMenu(QMenu *menu) auto buffer = physis_read_file(fileName.toStdString().c_str()); - part->addModel(physis_mdl_parse(buffer.size, buffer.data), QStringLiteral("mdl"), {}, 0); + part->addModel(physis_mdl_parse(buffer), QStringLiteral("mdl"), {}, 0); }); } diff --git a/sagasu/src/mainwindow.cpp b/sagasu/src/mainwindow.cpp index bb9d0b0..85fbfca 100644 --- a/sagasu/src/mainwindow.cpp +++ b/sagasu/src/mainwindow.cpp @@ -89,7 +89,7 @@ void MainWindow::refreshParts(QString path) partHolder->addTab(exdWidget, QStringLiteral("Note")); } else if (info.completeSuffix() == QStringLiteral("mdl")) { auto mdlWidget = new MDLPart(data, fileCache); - mdlWidget->addModel(physis_mdl_parse(file.size, file.data), QStringLiteral("mdl"), {}, 0); + mdlWidget->addModel(physis_mdl_parse(file), QStringLiteral("mdl"), {}, 0); partHolder->addTab(mdlWidget, QStringLiteral("Model")); } else if (info.completeSuffix() == QStringLiteral("tex")) { auto texWidget = new TexPart(data);