Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues. :(

This commit is contained in:
floralrainfall 2023-07-08 21:08:32 -04:00
parent 81b396358f
commit 2fa5b6c292
8 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/Client/CMakeLists.txt
View File

@ -1,3 +1,5 @@
include_directories(${CMAKE_BINARY_DIR})
if(COMPILE_PLAYER OR COMPILE_STUDIO) if(COMPILE_PLAYER OR COMPILE_STUDIO)
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets) find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets)
add_subdirectory(Common) add_subdirectory(Common)

2
Projects/Client/Common/CMakeLists.txt
View File

@ -2,7 +2,7 @@ add_subdirectory(${DEPENDENCIES_DIR}/GLAD ${CMAKE_BINARY_DIR}/Dependencies/GLAD)
project(Common) 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_standard_project_setup()
qt_add_library(Common STATIC qt_add_library(Common STATIC

3
Projects/Client/Common/Header/GL/Widget.hpp
View File

@ -1,8 +1,9 @@
#pragma once #pragma once
#include <glad/glad.h>
#include <QOpenGLWidget> #include <QOpenGLWidget>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <glad/glad.h>
#include <GL/Adorn.hpp> #include <GL/Adorn.hpp>

2
Projects/Client/Player/Header/MainWindow.hpp
View File

@ -11,4 +11,4 @@ class MainWindow : public QMainWindow
protected: protected:
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event);
} };

2
Projects/Client/Studio/Header/MainWindow.hpp
View File

@ -18,4 +18,4 @@ class MainWindow : public QMainWindow
protected: protected:
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event);
} };

6
Projects/Client/Studio/Source/MainWindow.cpp
View File

@ -1,4 +1,6 @@
#include <MainWindow.hpp> #include <MainWindow.hpp>
#include <QGridLayout>
#include "Resources/StudioResources.hpp"
MainWindow::MainWindow() MainWindow::MainWindow()
{ {
@ -8,8 +10,8 @@ MainWindow::MainWindow()
QWidget* content_widget = new QWidget(); QWidget* content_widget = new QWidget();
QGridLayout* grid = new QGridLayout(); QGridLayout* grid = new QGridLayout();
this->graphics_widget = new GL::Widget(); this->widget = new GL::Widget();
grid->addWidget(this->graphics_widget, 0, 0, 1, 1); grid->addWidget(this->widget, 0, 0, 1, 1);
content_widget->setLayout(grid); content_widget->setLayout(grid);
setWindowTitle(QString("RNR Studio")); setWindowTitle(QString("RNR Studio"));

2
Projects/Client/Studio/Source/main.cpp
View File

@ -21,6 +21,6 @@ int main(int argc, char** argv)
while (running) while (running)
{ {
app.processEvents(); app.processEvents();
window.graphics_widget->update(); window.widget->update();
} }
} }

2
Projects/Engine/Source/Network/GUID.cpp
View File

@ -1,4 +1,4 @@
#include <Network/Guid.hpp> #include <Network/GUID.hpp>
namespace RNR namespace RNR
{ {