josh/ReJUI
2
0
Fork 0
Code Issues 60 Pull Requests Actions Packages Projects 1 Releases 29 Wiki Activity

pushing

Browse Source
This commit is contained in:
Redacted
2024-12-04 14:30:48 -05:00
parent ff84118b10
commit 465d7052b7
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -38,7 +38,7 @@ CPMAddPackage(
CPMAddPackage(
NAME J3ML
URL https://git.redacted.cc/josh/j3ml/archive/Release-3.4.zip
URL https://git.redacted.cc/josh/j3ml/archive/3.4.3.zip
)
CPMAddPackage(
@@ -48,12 +48,12 @@ CPMAddPackage(
CPMAddPackage(
NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-21.zip
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-26.zip
)
CPMAddPackage(
NAME JGL
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-38.zip
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-41.zip
)
target_include_directories(JUI PUBLIC ${Event_SOURCE_DIR}/include)

30
main.cpp
View File

@@ -256,7 +256,7 @@ public:
void initGL() {
gladLoadGL();
JGL::Update(getSize());
JGL::Update(GetSize());
JGL::InitTextEngine();
glClearColor(0.f, 0.f, 0.f, 0.f);
@@ -277,14 +277,14 @@ public:
JUIDevelopmentTestWindow(const std::string& title, int w, int h) : ReWindow::RWindow(title, w, h) {}
void OnRefresh(float elapsed) override {
Update();
JGL::Update(getSize());
scene->SetViewportSize(getSize());
JGL::Update(GetSize());
scene->SetViewportSize(GetSize());
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
Draw();
this->glSwapBuffers();
this->GLSwapBuffers();
}
@@ -294,23 +294,23 @@ public:
return true;
}
void OnMouseButtonUp(const ReWindow::WindowEvents::MouseButtonUpEvent &) override
void OnMouseButtonUp(const ReWindow::MouseButtonUpEvent &) override
{
}
void OnMouseButtonDown(const ReWindow::WindowEvents::MouseButtonDownEvent &) override
void OnMouseButtonDown(const ReWindow::MouseButtonDownEvent &) override
{
}
void OnMouseMove(const ReWindow::WindowEvents::MouseMoveEvent &) override
void OnMouseMove(const ReWindow::MouseMoveEvent &) override
{
}
void OnKeyDown(const ReWindow::WindowEvents::KeyDownEvent &) override
void OnKeyDown(const ReWindow::KeyDownEvent &) override
{
}
@@ -331,12 +331,12 @@ int main()
ReWindow::Logger::Debug.EnableConsole(false);
auto* window = new JUIDevelopmentTestWindow("Test Window", 800, 600);
window->setRenderer(RenderingAPI::OPENGL);
window->SetRenderer(RenderingAPI::OPENGL);
window->Open();
window->initGL();
window->setFullscreen(false);
window->setVsyncEnabled(false);
window->setResizable(true);
window->SetFullscreen(false);
window->SetVsyncEnabled(false);
window->SetResizable(true);
JGL::Update({800, 600});
@@ -385,9 +385,9 @@ int main()
window->OnKeyUpEvent += [&] (KeyUpEvent e) {};
while (window->isAlive()) {
window->pollEvents();
window->refresh();
while (window->IsAlive()) {
window->PollEvents();
window->Refresh();
}
return 0;
}