From 8e9fd7fe15c7452d0790726c966d0e0a7766ad1d Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 6 Jul 2023 17:37:49 -0400 Subject: [PATCH] Remove bone editor comments, add cmp editor action --- mdlviewer/src/mainwindow.cpp | 54 +++++++----------------------------- 1 file changed, 10 insertions(+), 44 deletions(-) diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp index b1bb8ea..862ca1a 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/mdlviewer/src/mainwindow.cpp @@ -15,21 +15,7 @@ #include #include -void addItem(physis_Skeleton& skeleton, physis_Bone& bone, QTreeWidget* widget, QTreeWidgetItem* parent_item = nullptr) { - auto item = new QTreeWidgetItem(); - item->setText(0, bone.name); - - if(parent_item == nullptr) { - widget->addTopLevelItem(item); - } else { - parent_item->addChild(item); - } - - for(int i = 0; i < skeleton.num_bones; i++) { - if(skeleton.bones[i].parent_bone != nullptr && strcmp(skeleton.bones[i].parent_bone->name, bone.name) == 0) - addItem(skeleton, skeleton.bones[i], widget, item); - } -} +#include "cmpeditor.h" MainWindow::MainWindow(GameData* in_data) : data(*in_data) { setWindowTitle("mdlviewer"); @@ -52,6 +38,14 @@ MainWindow::MainWindow(GameData* in_data) : data(*in_data) { reloadGearAppearance(); });*/ + auto toolsMenu = menuBar()->addMenu("Tools"); + + auto cmpEditorMenu = toolsMenu->addAction("CMP Editor"); + connect(cmpEditorMenu, &QAction::triggered, [=] { + auto cmpEditor = new CmpEditor(in_data); + cmpEditor->show(); + }); + auto dummyWidget = new QWidget(); setCentralWidget(dummyWidget); @@ -77,7 +71,7 @@ MainWindow::MainWindow(GameData* in_data) : data(*in_data) { } auto exh = physis_gamedata_read_excel_sheet_header(&data, "Item"); - auto exd = physis_gamedata_read_excel_sheet(&data, "Item", &exh, Language::English, 1); + auto exd = physis_gamedata_read_excel_sheet(&data, "Item", exh, Language::English, 1); for(int i = 0; i < exd.row_count; i++) { const auto row = exd.row_data[i]; @@ -118,34 +112,6 @@ MainWindow::MainWindow(GameData* in_data) : data(*in_data) { } }); - // TODO: reintroduce into SingleGearView - /*auto boneListWidget = new QTreeWidget(); - for(auto& bone : extraBone) { - bone.inversePose = glm::inverse(bone.inversePose); - } - - addItem(skeleton, *skeleton.root_bone, boneListWidget); - - boneListWidget->setMaximumWidth(200); - - connect(boneListWidget, &QTreeWidget::itemClicked, [this](QTreeWidgetItem* item, int column) { - for(int i = 0; i < skeleton.num_bones; i++) { - if(strcmp(skeleton.bones[i].name, item->text(column).toStdString().c_str()) == 0) { - currentScale = glm::make_vec3(skeleton.bones[i].scale); - currentEditedBone = &skeleton.bones[i]; - } - } - }); - - layout->addWidget(boneListWidget); - - Vector3Edit* scaleEdit = new Vector3Edit(currentScale); - connect(scaleEdit, &Vector3Edit::onValueChanged, [this] { - memcpy(currentEditedBone->scale, glm::value_ptr(currentScale), sizeof(float) * 3); - reloadGearAppearance(); - }); - layout->addWidget(scaleEdit);*/ - fullModelViewer = new FullModelViewer(&data); fullModelViewer->show(); } \ No newline at end of file