redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-26 05:37:46 +00:00
Code Activity

Remove more mentions of the standalone window function

Browse source
This commit is contained in:
Joshua Goins 2023-12-09 14:57:30 -05:00
parent c7b6dd076c
commit 6ab6ad4732
1 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
parts/mdl/mdlpart.cpp
View file

@ -20,7 +20,6 @@
#include "imgui.h" #include "imgui.h"
#include "tiny_gltf.h" #include "tiny_gltf.h"
#ifndef USE_STANDALONE_WINDOW
class VulkanWindow : public QWindow class VulkanWindow : public QWindow
{ {
public: public:
@ -143,11 +142,6 @@ private:
QVulkanInstance *m_instance; QVulkanInstance *m_instance;
MDLPart *part; MDLPart *part;
}; };
#else
#include "equipment.h"
#include "standalonewindow.h"
#endif
MDLPart::MDLPart(GameData *data, FileCache &cache) MDLPart::MDLPart(GameData *data, FileCache &cache)
: data(data) : data(data)
@ -161,7 +155,6 @@ MDLPart::MDLPart(GameData *data, FileCache &cache)
renderer = new Renderer(); renderer = new Renderer();
#ifndef USE_STANDALONE_WINDOW
auto 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);
@ -173,16 +166,6 @@ MDLPart::MDLPart(GameData *data, FileCache &cache)
auto widget = QWidget::createWindowContainer(vkWindow); auto widget = QWidget::createWindowContainer(vkWindow);
viewportLayout->addWidget(widget); viewportLayout->addWidget(widget);
#else
standaloneWindow = new StandaloneWindow(renderer);
renderer->initSwapchain(standaloneWindow->getSurface(renderer->instance), 640, 480);
QTimer *timer = new QTimer();
connect(timer, &QTimer::timeout, this, [this] {
standaloneWindow->render();
});
timer->start(1000);
#endif
connect(this, &MDLPart::modelChanged, this, &MDLPart::reloadRenderer); connect(this, &MDLPart::modelChanged, this, &MDLPart::reloadRenderer);
connect(this, &MDLPart::skeletonChanged, this, &MDLPart::reloadBoneData); connect(this, &MDLPart::skeletonChanged, this, &MDLPart::reloadBoneData);
@ -482,11 +465,7 @@ void MDLPart::reloadRenderer()
{ {
reloadBoneData(); reloadBoneData();
#ifndef USE_STANDALONE_WINDOW
vkWindow->models = models; vkWindow->models = models;
#else
standaloneWindow->models = models;
#endif
} }
void MDLPart::reloadBoneData() void MDLPart::reloadBoneData()