diff --git a/CMakeLists.txt b/CMakeLists.txt index cc8be28..50d2833 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ CPMAddPackage( CPMAddPackage( NAME ReWindow - URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.16.zip + URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.17.zip ) CPMAddPackage( diff --git a/main.cpp b/main.cpp index 360166b..3e83820 100644 --- a/main.cpp +++ b/main.cpp @@ -53,7 +53,9 @@ class JGLDemoWindow : public ReWindow::RWindow public: LearnOpenGL::Shader shader; - JGLDemoWindow() : ReWindow::RWindow() + JGLDemoWindow() : ReWindow::RWindow() {} + JGLDemoWindow(const std::string& title, int width, int height) : + ReWindow::RWindow(title, width, height) { } @@ -122,9 +124,9 @@ public: int main(int argc, char** argv) { - auto* window = new JGLDemoWindow(); - - window->init(RenderingAPI::OPENGL, "Window", 1280, 720, false); + auto* window = new JGLDemoWindow("JGL Demo Window", 1280, 720); + window->setRenderer(RenderingAPI::OPENGL); + window->Open(); window->initGL(); window->setResizable(true); while (window->isAlive()) diff --git a/src/JGL/JGL.cpp b/src/JGL/JGL.cpp index a6fbbe2..547a256 100644 --- a/src/JGL/JGL.cpp +++ b/src/JGL/JGL.cpp @@ -4,9 +4,7 @@ #include #include -#include #include -#include #include #include FT_FREETYPE_H #include