josh/JGL
1
0
Fork 1
Code Issues 14 Pull Requests Actions Packages Projects Releases 58 Wiki Activity

Fixed broken migration

Browse Source
This commit is contained in:
josh
2024-02-21 23:42:55 -05:00
parent d1d2493435
commit 868f52464e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -26,7 +26,7 @@ CPMAddPackage(
CPMAddPackage( CPMAddPackage(
NAME ReWindow 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( CPMAddPackage(

10
main.cpp
View File

@@ -53,7 +53,9 @@ class JGLDemoWindow : public ReWindow::RWindow
public: public:
LearnOpenGL::Shader shader; 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) int main(int argc, char** argv)
{ {
auto* window = new JGLDemoWindow(); auto* window = new JGLDemoWindow("JGL Demo Window", 1280, 720);
window->setRenderer(RenderingAPI::OPENGL);
window->init(RenderingAPI::OPENGL, "Window", 1280, 720, false); window->Open();
window->initGL(); window->initGL();
window->setResizable(true); window->setResizable(true);
while (window->isAlive()) while (window->isAlive())

2
src/JGL/JGL.cpp
View File

@@ -4,9 +4,7 @@
#include <glad/glad.h> #include <glad/glad.h>
#include <JGL/JGL.h> #include <JGL/JGL.h>
#include <GL/glut.h>
#include <J3ML/LinearAlgebra/Transform2D.h> #include <J3ML/LinearAlgebra/Transform2D.h>
#include <rewindow/types/window.h>
#include <freetype2/ft2build.h> #include <freetype2/ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include <JGL/Color3.h> #include <JGL/Color3.h>