Dont make renderwidget part of uic
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <MainWindow.hpp>
|
#include <MainWindow.hpp>
|
||||||
|
|
||||||
MainWindowController::MainWindowController() noexcept {
|
MainWindowController::MainWindowController() noexcept : vulkanWidget(new RenderWidget(this)) {
|
||||||
view.setupUi(this);
|
view.setupUi(this);
|
||||||
ConnectSignalsToSlots();
|
ConnectSignalsToSlots();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
|
#include <RenderWidget.hpp>
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
|
||||||
@@ -14,6 +15,7 @@ private:
|
|||||||
void ConnectSignalsToSlots() noexcept;
|
void ConnectSignalsToSlots() noexcept;
|
||||||
|
|
||||||
Ui::MainWindow view;
|
Ui::MainWindow view;
|
||||||
|
RenderWidget *vulkanWidget;
|
||||||
bool textPauseToggle = false;
|
bool textPauseToggle = false;
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
VkSurfaceKHR create_surface(VkInstance instance, VkPhysicalDevice) override {
|
VkSurfaceKHR create_surface(VkInstance instance, VkPhysicalDevice) override {
|
||||||
|
window->show();
|
||||||
return QVulkanInstance::surfaceForWindow(window);
|
return QVulkanInstance::surfaceForWindow(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,9 +30,6 @@
|
|||||||
<property name="bottomMargin">
|
<property name="bottomMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<widget class="RenderWidget" name="vulkanWidget"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenuBar" name="menubar">
|
<widget class="QMenuBar" name="menubar">
|
||||||
@@ -122,13 +119,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
|
||||||
<customwidget>
|
|
||||||
<class>Renderer</class>
|
|
||||||
<extends>QWidget</extends>
|
|
||||||
<header>RenderWidget.hpp</header>
|
|
||||||
</customwidget>
|
|
||||||
</customwidgets>
|
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|||||||
Reference in New Issue
Block a user