From df336012c33f2993bdb80177a1f874ef81e7505f Mon Sep 17 00:00:00 2001 From: Eleni Maria Stea Date: Wed, 26 Jul 2017 17:53:23 +0300 Subject: [PATCH] ran astyle, added delete scene --- src/camera.cc | 2 +- src/main.cc | 1 + src/opengl/opengl.cc | 2 +- src/renderer.cc | 2 +- src/scene.cc | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/camera.cc b/src/camera.cc index 0f7773e..fd96f78 100644 --- a/src/camera.cc +++ b/src/camera.cc @@ -50,7 +50,7 @@ Mat4 calc_projection_matrix(float fov_deg, float aspect, float n, float f) Mat4 pmat = Mat4( tmp/aspect, 0, 0, 0, 0, tmp, 0, 0, - 0, 0, (f + n) / range, -1, + 0, 0, (f + n) / range, -1, 0, 0, 2 * n * f / range, 0 ); diff --git a/src/main.cc b/src/main.cc index 2727f4b..4ba8df3 100644 --- a/src/main.cc +++ b/src/main.cc @@ -138,6 +138,7 @@ static void cleanup() { delete sdr_man; delete camera; + delete scene; delete rdefault; if(use_vulkan) { diff --git a/src/opengl/opengl.cc b/src/opengl/opengl.cc index 417966d..46363f4 100644 --- a/src/opengl/opengl.cc +++ b/src/opengl/opengl.cc @@ -27,7 +27,7 @@ bool init_opengl() glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE); - + return true; } diff --git a/src/renderer.cc b/src/renderer.cc index a223fa7..8d2c70c 100644 --- a/src/renderer.cc +++ b/src/renderer.cc @@ -94,7 +94,7 @@ void Renderer::draw_object(Object *object) const /* texture */ - if (m->dtex) + if(m->dtex) m->dtex->bind(); /* setting uniforms for matrices */ diff --git a/src/scene.cc b/src/scene.cc index 8adb7df..99c3b01 100644 --- a/src/scene.cc +++ b/src/scene.cc @@ -304,7 +304,8 @@ Material *Scene::find_material(const char *name) return 0; } -Texture *Scene::find_texture(const char *name) { +Texture *Scene::find_texture(const char *name) +{ for(size_t i=0; iname == name) { return textures[i]; -- 1.7.10.4