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:
parent
98edd9e57d
commit
2f4f212c86
2 changed files with 82 additions and 34 deletions
|
@ -4,14 +4,58 @@
|
||||||
|
|
||||||
#include "renderer.hpp"
|
#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 GameData;
|
||||||
|
class VulkanWindow;
|
||||||
|
|
||||||
class MainWindow : public QMainWindow {
|
class MainWindow : public QMainWindow {
|
||||||
public:
|
public:
|
||||||
MainWindow(GameData& data);
|
MainWindow(GameData& data);
|
||||||
|
|
||||||
|
void refreshModel();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
std::vector<GearInfo> gears;
|
||||||
|
std::vector<GearInfo*> loadedGears;
|
||||||
|
|
||||||
|
Race currentRace;
|
||||||
|
|
||||||
GameData& data;
|
GameData& data;
|
||||||
|
|
||||||
Renderer* renderer;
|
Renderer* renderer;
|
||||||
|
VulkanWindow* vkWindow;
|
||||||
};
|
};
|
|
@ -7,6 +7,7 @@
|
||||||
#include <QVulkanWindow>
|
#include <QVulkanWindow>
|
||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QResizeEvent>
|
#include <QResizeEvent>
|
||||||
|
#include <QComboBox>
|
||||||
|
|
||||||
#include "gamedata.h"
|
#include "gamedata.h"
|
||||||
#include "exhparser.h"
|
#include "exhparser.h"
|
||||||
|
@ -62,26 +63,6 @@ private:
|
||||||
QVulkanInstance* m_instance;
|
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) {
|
MainWindow::MainWindow(GameData& data) : data(data) {
|
||||||
setWindowTitle("mdlviewer");
|
setWindowTitle("mdlviewer");
|
||||||
setMinimumSize(QSize(640, 480));
|
setMinimumSize(QSize(640, 480));
|
||||||
|
@ -92,8 +73,6 @@ MainWindow::MainWindow(GameData& data) : data(data) {
|
||||||
auto layout = new QHBoxLayout();
|
auto layout = new QHBoxLayout();
|
||||||
dummyWidget->setLayout(layout);
|
dummyWidget->setLayout(layout);
|
||||||
|
|
||||||
std::vector<GearInfo> gears;
|
|
||||||
|
|
||||||
// smallclothes body
|
// smallclothes body
|
||||||
{
|
{
|
||||||
GearInfo info = {};
|
GearInfo info = {};
|
||||||
|
@ -122,26 +101,51 @@ MainWindow::MainWindow(GameData& data) : data(data) {
|
||||||
|
|
||||||
renderer = new Renderer();
|
renderer = new Renderer();
|
||||||
|
|
||||||
QVulkanInstance* inst = new QVulkanInstance();
|
auto inst = new QVulkanInstance();
|
||||||
inst->setVkInstance(renderer->instance);
|
inst->setVkInstance(renderer->instance);
|
||||||
inst->setFlags(QVulkanInstance::Flag::NoDebugOutputRedirect);
|
inst->setFlags(QVulkanInstance::Flag::NoDebugOutputRedirect);
|
||||||
inst->create();
|
inst->create();
|
||||||
|
|
||||||
VulkanWindow* vkWindow = new VulkanWindow(renderer, inst);
|
vkWindow = new VulkanWindow(renderer, inst);
|
||||||
vkWindow->setVulkanInstance(inst);
|
vkWindow->setVulkanInstance(inst);
|
||||||
|
|
||||||
auto widget = QWidget::createWindowContainer(vkWindow);
|
auto widget = QWidget::createWindowContainer(vkWindow);
|
||||||
layout->addWidget(widget);
|
|
||||||
|
|
||||||
connect(listWidget, &QListWidget::itemClicked, [this, &data, vkWindow, gears](QListWidgetItem* item) {
|
auto viewportLayout = new QVBoxLayout();
|
||||||
for(auto gear : gears) {
|
viewportLayout->addWidget(widget);
|
||||||
if(gear.name == item->text().toStdString()) {
|
layout->addLayout(viewportLayout);
|
||||||
QString resolvedModelPath = QString("chara/equipment/e0000/model/c0201e0000_%1.mdl");
|
|
||||||
resolvedModelPath = resolvedModelPath.arg(slotToName[gear.slot].data());
|
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");
|
data.extractFile(resolvedModelPath.toStdString(), "top.mdl");
|
||||||
vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl")));
|
vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue