1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-22 12:07:45 +00:00

Add race selection combo box to mdlviewer

This commit is contained in:
Joshua Goins 2022-04-12 12:39:33 -04:00
parent 98edd9e57d
commit 2f4f212c86
2 changed files with 82 additions and 34 deletions

View file

@ -4,14 +4,58 @@
#include "renderer.hpp"
enum class Slot {
Body,
Legs
};
enum class Race {
HyurMidlanderMale,
HyurMidlanderFemale
};
inline std::map<Race, std::string_view> raceNames = {
{Race::HyurMidlanderMale, "Hyur Midlander Male"},
{Race::HyurMidlanderFemale, "Hyur Midlander Female"}
};
inline std::unordered_map<Race, std::string_view> raceIDs = {
{Race::HyurMidlanderMale, "0101"},
{Race::HyurMidlanderFemale, "0201"}
};
struct ModelInfo {
};
struct GearInfo {
std::string name;
Slot slot;
ModelInfo modelInfo;
};
inline std::unordered_map<Slot, std::string_view> slotToName = {
{Slot::Body, "top"},
{Slot::Legs, "dwn"}
};
class GameData;
class VulkanWindow;
class MainWindow : public QMainWindow {
public:
MainWindow(GameData& data);
void refreshModel();
private:
std::vector<GearInfo> gears;
std::vector<GearInfo*> loadedGears;
Race currentRace;
GameData& data;
Renderer* renderer;
VulkanWindow* vkWindow;
};

View file

@ -7,6 +7,7 @@
#include <QVulkanWindow>
#include <QLineEdit>
#include <QResizeEvent>
#include <QComboBox>
#include "gamedata.h"
#include "exhparser.h"
@ -62,26 +63,6 @@ private:
QVulkanInstance* m_instance;
};
struct ModelInfo {
};
enum class Slot {
Body,
Legs
};
struct GearInfo {
std::string name;
Slot slot;
ModelInfo modelInfo;
};
std::unordered_map<Slot, std::string_view> slotToName = {
{Slot::Body, "top"},
{Slot::Legs, "dwn"}
};
MainWindow::MainWindow(GameData& data) : data(data) {
setWindowTitle("mdlviewer");
setMinimumSize(QSize(640, 480));
@ -92,8 +73,6 @@ MainWindow::MainWindow(GameData& data) : data(data) {
auto layout = new QHBoxLayout();
dummyWidget->setLayout(layout);
std::vector<GearInfo> gears;
// smallclothes body
{
GearInfo info = {};
@ -122,26 +101,51 @@ MainWindow::MainWindow(GameData& data) : data(data) {
renderer = new Renderer();
QVulkanInstance* inst = new QVulkanInstance();
auto inst = new QVulkanInstance();
inst->setVkInstance(renderer->instance);
inst->setFlags(QVulkanInstance::Flag::NoDebugOutputRedirect);
inst->create();
VulkanWindow* vkWindow = new VulkanWindow(renderer, inst);
vkWindow = new VulkanWindow(renderer, inst);
vkWindow->setVulkanInstance(inst);
auto widget = QWidget::createWindowContainer(vkWindow);
layout->addWidget(widget);
connect(listWidget, &QListWidget::itemClicked, [this, &data, vkWindow, gears](QListWidgetItem* item) {
for(auto gear : gears) {
if(gear.name == item->text().toStdString()) {
QString resolvedModelPath = QString("chara/equipment/e0000/model/c0201e0000_%1.mdl");
resolvedModelPath = resolvedModelPath.arg(slotToName[gear.slot].data());
auto viewportLayout = new QVBoxLayout();
viewportLayout->addWidget(widget);
layout->addLayout(viewportLayout);
data.extractFile(resolvedModelPath.toStdString(), "top.mdl");
vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl")));
}
QComboBox* raceCombo = new QComboBox();
for(auto [race, raceName] : raceNames) {
raceCombo->addItem(raceName.data());
}
raceCombo->setCurrentIndex(0);
connect(raceCombo, qOverload<int>(&QComboBox::currentIndexChanged), [this](int index) {
currentRace = (Race)index;
refreshModel();
});
viewportLayout->addWidget(raceCombo);
connect(listWidget, &QListWidget::itemClicked, [this](QListWidgetItem* item) {
for(auto& gear : gears) {
if(gear.name == item->text().toStdString())
loadedGears = {&gear};
}
refreshModel();
});
}
void MainWindow::refreshModel() {
vkWindow->models.clear();
for(auto gear : loadedGears) {
QString resolvedModelPath = QString("chara/equipment/e0000/model/c%1e0000_%2.mdl");
resolvedModelPath = resolvedModelPath.arg(raceIDs[currentRace].data(), slotToName[gear->slot].data());
data.extractFile(resolvedModelPath.toStdString(), "top.mdl");
vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl")));
}
}