Fix issues. :(
This commit is contained in:
parent
81b396358f
commit
2fa5b6c292
|
|
@ -1,3 +1,5 @@
|
|||
include_directories(${CMAKE_BINARY_DIR})
|
||||
|
||||
if(COMPILE_PLAYER OR COMPILE_STUDIO)
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets)
|
||||
add_subdirectory(Common)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ add_subdirectory(${DEPENDENCIES_DIR}/GLAD ${CMAKE_BINARY_DIR}/Dependencies/GLAD)
|
|||
|
||||
project(Common)
|
||||
|
||||
set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets glad)
|
||||
set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets GLAD)
|
||||
|
||||
qt_standard_project_setup()
|
||||
qt_add_library(Common STATIC
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
#pragma once
|
||||
|
||||
#include <glad/glad.h>
|
||||
|
||||
#include <QOpenGLWidget>
|
||||
#include <QElapsedTimer>
|
||||
#include <glad/glad.h>
|
||||
|
||||
#include <GL/Adorn.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ class MainWindow : public QMainWindow
|
|||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent* event);
|
||||
}
|
||||
};
|
||||
|
|
@ -18,4 +18,4 @@ class MainWindow : public QMainWindow
|
|||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent* event);
|
||||
}
|
||||
};
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
#include <MainWindow.hpp>
|
||||
#include <QGridLayout>
|
||||
#include "Resources/StudioResources.hpp"
|
||||
|
||||
MainWindow::MainWindow()
|
||||
{
|
||||
|
|
@ -8,8 +10,8 @@ MainWindow::MainWindow()
|
|||
QWidget* content_widget = new QWidget();
|
||||
QGridLayout* grid = new QGridLayout();
|
||||
|
||||
this->graphics_widget = new GL::Widget();
|
||||
grid->addWidget(this->graphics_widget, 0, 0, 1, 1);
|
||||
this->widget = new GL::Widget();
|
||||
grid->addWidget(this->widget, 0, 0, 1, 1);
|
||||
content_widget->setLayout(grid);
|
||||
|
||||
setWindowTitle(QString("RNR Studio"));
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ int main(int argc, char** argv)
|
|||
while (running)
|
||||
{
|
||||
app.processEvents();
|
||||
window.graphics_widget->update();
|
||||
window.widget->update();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include <Network/Guid.hpp>
|
||||
#include <Network/GUID.hpp>
|
||||
|
||||
namespace RNR
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue