derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement Json loading for screens and fix a bug in widget-creation

Browse Source
This commit is contained in:
Derek Christ
2021-01-16 16:49:26 +01:00
parent 2c183dc099
commit 938450ce75
13 changed files with 118 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Controller.cpp
View File

@@ -39,7 +39,7 @@ Controller::Controller()
// Show loading screen...
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
menu->showLoadingScreen();
menu->showScreenByName("loadingScreen");
glfwSwapBuffers(gameWindow->getGLFWwindow());
world = new World(shaderPrograms);
@@ -135,8 +135,6 @@ void Controller::run()
camera->lookForward();
camera->updateVPM();
glViewport(0, 0, gameWindow->getWindowWidth(), gameWindow->getWindowHeight());
world->getSkybox()->draw(camera->getView(), camera->getProj());
world->draw(camera->getViewProj(), camera->getPosition());
@@ -146,7 +144,6 @@ void Controller::run()
#ifdef _DEBUG
renderImGui(world, world->getPointLights()[0], &lightColor, &rotateEntity, &rotateLightSource, getShaderProgramByName("postProcessingProgram"), &intensity, &drawShadows);
#endif
glfwSwapBuffers(gameWindow->getGLFWwindow());
// Update window size