From 589598b34c8a7f684ccddf6e1fa3ba08d0b96bcf Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 9 Jul 2023 11:31:18 -0400 Subject: [PATCH] Rename mdlviewer to Armoury Editor --- CMakeLists.txt | 2 +- {mdlviewer => armoury}/CMakeLists.txt | 12 +++++------ {mdlviewer => armoury}/include/boneeditor.h | 0 {mdlviewer => armoury}/include/cmpeditor.h | 0 .../include/fullmodelviewer.h | 4 ++-- .../include/gearlistmodel.h | 0 .../include/gearlistwidget.h | 0 {mdlviewer => armoury}/include/gearview.h | 0 {mdlviewer => armoury}/include/mainwindow.h | 0 .../include/quaternionedit.h | 0 .../include/singlegearview.h | 0 {mdlviewer => armoury}/include/vec3edit.h | 0 {mdlviewer => armoury}/src/boneeditor.cpp | 1 + {mdlviewer => armoury}/src/cmpeditor.cpp | 2 ++ .../src/fullmodelviewer.cpp | 10 ++++----- {mdlviewer => armoury}/src/gearlistmodel.cpp | 0 {mdlviewer => armoury}/src/gearlistwidget.cpp | 0 {mdlviewer => armoury}/src/gearview.cpp | 0 {mdlviewer => armoury}/src/main.cpp | 0 {mdlviewer => armoury}/src/mainwindow.cpp | 21 ++----------------- {mdlviewer => armoury}/src/quaternionedit.cpp | 0 {mdlviewer => armoury}/src/singlegearview.cpp | 0 {mdlviewer => armoury}/src/vec3edit.cpp | 0 23 files changed, 19 insertions(+), 33 deletions(-) rename {mdlviewer => armoury}/CMakeLists.txt (85%) rename {mdlviewer => armoury}/include/boneeditor.h (100%) rename {mdlviewer => armoury}/include/cmpeditor.h (100%) rename {mdlviewer => armoury}/include/fullmodelviewer.h (92%) rename {mdlviewer => armoury}/include/gearlistmodel.h (100%) rename {mdlviewer => armoury}/include/gearlistwidget.h (100%) rename {mdlviewer => armoury}/include/gearview.h (100%) rename {mdlviewer => armoury}/include/mainwindow.h (100%) rename {mdlviewer => armoury}/include/quaternionedit.h (100%) rename {mdlviewer => armoury}/include/singlegearview.h (100%) rename {mdlviewer => armoury}/include/vec3edit.h (100%) rename {mdlviewer => armoury}/src/boneeditor.cpp (99%) rename {mdlviewer => armoury}/src/cmpeditor.cpp (99%) rename {mdlviewer => armoury}/src/fullmodelviewer.cpp (98%) rename {mdlviewer => armoury}/src/gearlistmodel.cpp (100%) rename {mdlviewer => armoury}/src/gearlistwidget.cpp (100%) rename {mdlviewer => armoury}/src/gearview.cpp (100%) rename {mdlviewer => armoury}/src/main.cpp (100%) rename {mdlviewer => armoury}/src/mainwindow.cpp (75%) rename {mdlviewer => armoury}/src/quaternionedit.cpp (100%) rename {mdlviewer => armoury}/src/singlegearview.cpp (100%) rename {mdlviewer => armoury}/src/vec3edit.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f4477d..d1f6c18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ endif() add_subdirectory(renderer) add_subdirectory(exdviewer) -add_subdirectory(mdlviewer) +add_subdirectory(armoury) add_subdirectory(argcracker) add_subdirectory(explorer) add_subdirectory(bonedecomp) diff --git a/mdlviewer/CMakeLists.txt b/armoury/CMakeLists.txt similarity index 85% rename from mdlviewer/CMakeLists.txt rename to armoury/CMakeLists.txt index 168c8a5..7b3583c 100644 --- a/mdlviewer/CMakeLists.txt +++ b/armoury/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(assimp REQUIRED) set_target_properties(assimp::assimp PROPERTIES MAP_IMPORTED_CONFIG_DEBUG Release) -add_executable(mdlviewer +add_executable(armoury src/main.cpp src/mainwindow.cpp src/vec3edit.cpp @@ -14,12 +14,12 @@ add_executable(mdlviewer src/cmpeditor.cpp src/gearlistwidget.cpp src/gearlistmodel.cpp) -target_include_directories(mdlviewer +target_include_directories(armoury PUBLIC include PRIVATE ${CMAKE_BINARY_DIR}) -target_link_libraries(mdlviewer PUBLIC +target_link_libraries(armoury PUBLIC ${LIBRARIES} Qt5::Core Qt5::Widgets @@ -31,7 +31,7 @@ target_link_libraries(mdlviewer PUBLIC mdlpart NovusCommon) -install(TARGETS mdlviewer +install(TARGETS armoury DESTINATION "${INSTALL_BIN_PATH}") if(WIN32) @@ -42,8 +42,8 @@ if(WIN32) find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}") # Run windeployqt immediately after build - add_custom_command(TARGET mdlviewer + add_custom_command(TARGET armoury POST_BUILD - COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" + COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" ) endif() \ No newline at end of file diff --git a/mdlviewer/include/boneeditor.h b/armoury/include/boneeditor.h similarity index 100% rename from mdlviewer/include/boneeditor.h rename to armoury/include/boneeditor.h diff --git a/mdlviewer/include/cmpeditor.h b/armoury/include/cmpeditor.h similarity index 100% rename from mdlviewer/include/cmpeditor.h rename to armoury/include/cmpeditor.h diff --git a/mdlviewer/include/fullmodelviewer.h b/armoury/include/fullmodelviewer.h similarity index 92% rename from mdlviewer/include/fullmodelviewer.h rename to armoury/include/fullmodelviewer.h index dd68293..ceb150a 100644 --- a/mdlviewer/include/fullmodelviewer.h +++ b/armoury/include/fullmodelviewer.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include "gearview.h" @@ -8,7 +8,7 @@ struct GameData; class FileCache; -class FullModelViewer : public QWidget { +class FullModelViewer : public QMainWindow { Q_OBJECT public: explicit FullModelViewer(GameData* data, FileCache& cache); diff --git a/mdlviewer/include/gearlistmodel.h b/armoury/include/gearlistmodel.h similarity index 100% rename from mdlviewer/include/gearlistmodel.h rename to armoury/include/gearlistmodel.h diff --git a/mdlviewer/include/gearlistwidget.h b/armoury/include/gearlistwidget.h similarity index 100% rename from mdlviewer/include/gearlistwidget.h rename to armoury/include/gearlistwidget.h diff --git a/mdlviewer/include/gearview.h b/armoury/include/gearview.h similarity index 100% rename from mdlviewer/include/gearview.h rename to armoury/include/gearview.h diff --git a/mdlviewer/include/mainwindow.h b/armoury/include/mainwindow.h similarity index 100% rename from mdlviewer/include/mainwindow.h rename to armoury/include/mainwindow.h diff --git a/mdlviewer/include/quaternionedit.h b/armoury/include/quaternionedit.h similarity index 100% rename from mdlviewer/include/quaternionedit.h rename to armoury/include/quaternionedit.h diff --git a/mdlviewer/include/singlegearview.h b/armoury/include/singlegearview.h similarity index 100% rename from mdlviewer/include/singlegearview.h rename to armoury/include/singlegearview.h diff --git a/mdlviewer/include/vec3edit.h b/armoury/include/vec3edit.h similarity index 100% rename from mdlviewer/include/vec3edit.h rename to armoury/include/vec3edit.h diff --git a/mdlviewer/src/boneeditor.cpp b/armoury/src/boneeditor.cpp similarity index 99% rename from mdlviewer/src/boneeditor.cpp rename to armoury/src/boneeditor.cpp index a380f80..1903d0c 100644 --- a/mdlviewer/src/boneeditor.cpp +++ b/armoury/src/boneeditor.cpp @@ -36,6 +36,7 @@ BoneEditor::BoneEditor(GearView* gearView, QWidget* parent) : gearView(gearView) setLayout(layout); auto boneListWidget = new QTreeWidget(); + boneListWidget->setHeaderLabel("Name"); connect(gearView, &GearView::modelReloaded, this, [this, boneListWidget, gearView] { boneListWidget->clear(); diff --git a/mdlviewer/src/cmpeditor.cpp b/armoury/src/cmpeditor.cpp similarity index 99% rename from mdlviewer/src/cmpeditor.cpp rename to armoury/src/cmpeditor.cpp index 666f556..57ef2a6 100644 --- a/mdlviewer/src/cmpeditor.cpp +++ b/armoury/src/cmpeditor.cpp @@ -24,6 +24,8 @@ std::vector raceTree = { {Race::Viera, {Subrace::Rava, Subrace::Veena}}}; CmpEditor::CmpEditor(GameData* data) : data(data) { + setWindowTitle("CMP Editor"); + auto layout = new QHBoxLayout(); setLayout(layout); diff --git a/mdlviewer/src/fullmodelviewer.cpp b/armoury/src/fullmodelviewer.cpp similarity index 98% rename from mdlviewer/src/fullmodelviewer.cpp rename to armoury/src/fullmodelviewer.cpp index 1e49c4b..9a647b1 100644 --- a/mdlviewer/src/fullmodelviewer.cpp +++ b/armoury/src/fullmodelviewer.cpp @@ -14,13 +14,13 @@ FullModelViewer::FullModelViewer(GameData* data, FileCache& cache) : data(data) setMinimumWidth(1280); setMinimumHeight(720); + auto dummyWidget = new QWidget(); + setCentralWidget(dummyWidget); + auto layout = new QVBoxLayout(); - setLayout(layout); + dummyWidget->setLayout(layout); - auto menuBar = new QMenuBar(); - layout->addWidget(menuBar); - - auto fileMenu = menuBar->addMenu("File"); + auto fileMenu = menuBar()->addMenu("File"); auto datOpenAction = fileMenu->addAction("Load character DAT..."); connect(datOpenAction, &QAction::triggered, [=] { diff --git a/mdlviewer/src/gearlistmodel.cpp b/armoury/src/gearlistmodel.cpp similarity index 100% rename from mdlviewer/src/gearlistmodel.cpp rename to armoury/src/gearlistmodel.cpp diff --git a/mdlviewer/src/gearlistwidget.cpp b/armoury/src/gearlistwidget.cpp similarity index 100% rename from mdlviewer/src/gearlistwidget.cpp rename to armoury/src/gearlistwidget.cpp diff --git a/mdlviewer/src/gearview.cpp b/armoury/src/gearview.cpp similarity index 100% rename from mdlviewer/src/gearview.cpp rename to armoury/src/gearview.cpp diff --git a/mdlviewer/src/main.cpp b/armoury/src/main.cpp similarity index 100% rename from mdlviewer/src/main.cpp rename to armoury/src/main.cpp diff --git a/mdlviewer/src/mainwindow.cpp b/armoury/src/mainwindow.cpp similarity index 75% rename from mdlviewer/src/mainwindow.cpp rename to armoury/src/mainwindow.cpp index 85dd0b6..c588331 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/armoury/src/mainwindow.cpp @@ -23,26 +23,9 @@ #include "filecache.h" MainWindow::MainWindow(GameData* in_data) : data(*in_data), cache(FileCache{*in_data}) { - setWindowTitle("mdlviewer"); + setWindowTitle("Armoury Editor"); setMinimumSize(QSize(800, 600)); - auto fileMenu = menuBar()->addMenu("File"); - - // TODO: move to a dedicated mdlview? - /*auto openMDLFile = fileMenu->addAction("Open MDL..."); - connect(openMDLFile, &QAction::triggered, [=] { - auto fileName = QFileDialog::getOpenFileName(nullptr, - "Open MDL File", - "~", - "FFXIV Model File (*.mdl)"); - - auto buffer = physis_read_file(fileName.toStdString().c_str()); - - loadedGear.model = physis_mdl_parse(buffer.size, buffer.data); - - reloadGearAppearance(); - });*/ - auto toolsMenu = menuBar()->addMenu("Tools"); auto cmpEditorMenu = toolsMenu->addAction("CMP Editor"); @@ -61,7 +44,7 @@ MainWindow::MainWindow(GameData* in_data) : data(*in_data), cache(FileCache{*in_ helpMenu->addSeparator(); - auto aboutNovusAction = helpMenu->addAction("About mdlviewer"); + auto aboutNovusAction = helpMenu->addAction("About Armoury Editor"); aboutNovusAction->setIcon(QIcon::fromTheme("help-about")); connect(aboutNovusAction, &QAction::triggered, this, [this] { auto window = new AboutWindow(this); diff --git a/mdlviewer/src/quaternionedit.cpp b/armoury/src/quaternionedit.cpp similarity index 100% rename from mdlviewer/src/quaternionedit.cpp rename to armoury/src/quaternionedit.cpp diff --git a/mdlviewer/src/singlegearview.cpp b/armoury/src/singlegearview.cpp similarity index 100% rename from mdlviewer/src/singlegearview.cpp rename to armoury/src/singlegearview.cpp diff --git a/mdlviewer/src/vec3edit.cpp b/armoury/src/vec3edit.cpp similarity index 100% rename from mdlviewer/src/vec3edit.cpp rename to armoury/src/vec3edit.cpp