From 851a26c4459d3935833a7e5c978466dacaa49a86 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Tue, 23 Apr 2019 23:30:36 +0200 Subject: [PATCH] Minor cleanup --- src/RuntimeModuleManager.cc | 2 +- src/main.cc | 4 +++- src/modules/RenderModule.cc | 8 +++++--- src/modules/RenderUtils.cc | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/RuntimeModuleManager.cc b/src/RuntimeModuleManager.cc index 46504d2..c8932ea 100644 --- a/src/RuntimeModuleManager.cc +++ b/src/RuntimeModuleManager.cc @@ -143,7 +143,7 @@ void RuntimeModuleManager::UnloadModules() { } } - gLog ("Writting state to file %s", state_file); + gLog ("Writing state to file %s", state_file); gWriteSerializer->Close(); } diff --git a/src/main.cc b/src/main.cc index c575026..da0ca5b 100644 --- a/src/main.cc +++ b/src/main.cc @@ -333,7 +333,9 @@ int main(void) } } - module_manager.UnregisterModules(); + gLog ("Exiting application"); + + module_manager.UnregisterModules(); gRenderer = nullptr; diff --git a/src/modules/RenderModule.cc b/src/modules/RenderModule.cc index f8c57a8..9281b5b 100644 --- a/src/modules/RenderModule.cc +++ b/src/modules/RenderModule.cc @@ -131,6 +131,7 @@ static void module_finalize(struct module_state *state) { assert (state->renderer != nullptr); delete state->renderer; + gVertexArray.Cleanup(); free(state); } @@ -563,7 +564,7 @@ void Renderer::CheckRenderBuffers() { if (mSceneAreaWidth != mRenderOutput.mWidth || mSceneAreaHeight != mRenderOutput.mHeight || mForwardRenderingTarget.mFlags != required_render_flags ) { - mRenderOutput.Resize(mSceneAreaWidth, mSceneAreaHeight, required_render_flags); + mRenderOutput.Resize(mSceneAreaWidth, mSceneAreaHeight, RenderTarget::EnableColor); mForwardRenderingTarget.Resize(mSceneAreaWidth, mSceneAreaHeight, required_render_flags); mDeferredLightingTarget.Resize(mSceneAreaWidth, mSceneAreaHeight, RenderTarget::EnableColor @@ -696,7 +697,7 @@ void Renderer::RenderGl() { DebugDrawFrame( mSimpleProgram, - TranslateMat44(0.0f, 0.002f, 0.0f) + TranslateMat44(1.0f, 0.002f, 0.0f) * mCamera.mViewMatrix * mCamera.mProjectionMatrix ); @@ -750,7 +751,8 @@ void Renderer::RenderGl() { program->SetVec4("uShadowSplitBias", mLight.mSplitBias); program->SetFloat("uShowCascadesAlpha", mLight.mShowCascadesAlpha); - program->SetMat44Array("uViewToLightMatrix", cNumSplits, light_matrices); + + program->SetMat44Array("uViewToLightMatrix", cNumSplits, light_matrices); program->SetMat44("uLightSpaceMatrix", mLight.mLightSpaceMatrix); } diff --git a/src/modules/RenderUtils.cc b/src/modules/RenderUtils.cc index b229bc6..49ddfaa 100644 --- a/src/modules/RenderUtils.cc +++ b/src/modules/RenderUtils.cc @@ -594,6 +594,9 @@ void VertexArray::Initialize(const int& size, GLenum usage) { } void VertexArray::Cleanup() { + gLog ("deleting vertex buffer: %d", mVertexBuffer); + int is_buffer = glIsBuffer(mVertexBuffer); + gLog ("is buffer %d", is_buffer); glDeleteBuffers(1, &mVertexBuffer); mVertexBuffer = -1; glDeleteVertexArrays(1, &mVertexArrayId);