redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-21 19:57:44 +00:00
Code Activity

Fix standalone window compilation

Browse source
This commit is contained in:
Joshua Goins 2022-04-16 16:38:48 -04:00
parent 0ce540bb5b
commit 7a9c752f94
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libxiv

@ -1 +1 @@
Subproject commit 8139f399fdcfd8b57f5a399ee2aa2d92baa7bf4a Subproject commit d0e016e5684ab66c29a1bbe688f05fc33b08dad0

10
mdlviewer/src/mainwindow.cpp
View file

@ -193,7 +193,13 @@ MainWindow::MainWindow(GameData& data) : data(data) {
"model.fbx", "model.fbx",
tr("FBX Files (*.fbx)")); tr("FBX Files (*.fbx)"));
exportModel(vkWindow->models[0].model, fileName); Model model;
#ifdef USE_STANDALONE_WINDOW
model = standaloneWindow->models[0].model;
#else
model = vkWindow->models[0].model;
#endif
exportModel(model, fileName);
}); });
controlLayout->addWidget(exportButton); controlLayout->addWidget(exportButton);
@ -226,7 +232,7 @@ void MainWindow::refreshModel() {
#ifndef USE_STANDALONE_WINDOW #ifndef USE_STANDALONE_WINDOW
vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod)); vkWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod));
#else #else
standaloneWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"))); standaloneWindow->models.push_back(renderer->addModel(parseMDL("top.mdl"), currentLod));
#endif #endif
} }
} }