Merge remote-tracking branch 'origin/master'
All checks were successful
Run ReCI Build Test / Explore-Gitea-Actions (push) Successful in 1m24s
All checks were successful
Run ReCI Build Test / Explore-Gitea-Actions (push) Successful in 1m24s
This commit is contained in:
3
main.cpp
3
main.cpp
@@ -157,6 +157,7 @@ public:
|
|||||||
|
|
||||||
Vector3 textAngle = {0,0,0};
|
Vector3 textAngle = {0,0,0};
|
||||||
void display() {
|
void display() {
|
||||||
|
JGL::Update(getSize());
|
||||||
textAngle.y += 2.0f;
|
textAngle.y += 2.0f;
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
@@ -251,7 +252,7 @@ int main(int argc, char** argv) {
|
|||||||
window->setRenderer(RenderingAPI::OPENGL);
|
window->setRenderer(RenderingAPI::OPENGL);
|
||||||
window->Open();
|
window->Open();
|
||||||
window->initGL();
|
window->initGL();
|
||||||
window->setResizable(false);
|
window->setResizable(true);
|
||||||
|
|
||||||
while (window->isAlive()) {
|
while (window->isAlive()) {
|
||||||
window->pollEvents();
|
window->pollEvents();
|
||||||
|
@@ -34,6 +34,7 @@ namespace JGL {
|
|||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
glPushMatrix();
|
glPushMatrix();
|
||||||
glLoadIdentity();
|
glLoadIdentity();
|
||||||
|
glViewport(0, 0, wS.x, wS.y);
|
||||||
glOrtho(0, wS.x, wS.y, 0, -1, 1);
|
glOrtho(0, wS.x, wS.y, 0, -1, 1);
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
glPushMatrix();
|
glPushMatrix();
|
||||||
|
Reference in New Issue
Block a user