ran astyle, added delete scene
authorEleni Maria Stea <elene.mst@gmail.com>
Wed, 26 Jul 2017 14:53:23 +0000 (17:53 +0300)
committerEleni Maria Stea <elene.mst@gmail.com>
Wed, 26 Jul 2017 14:53:23 +0000 (17:53 +0300)
src/camera.cc
src/main.cc
src/opengl/opengl.cc
src/renderer.cc
src/scene.cc

index 0f7773e..fd96f78 100644 (file)
@@ -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
                    );
 
index 2727f4b..4ba8df3 100644 (file)
@@ -138,6 +138,7 @@ static void cleanup()
 {
        delete sdr_man;
        delete camera;
+       delete scene;
        delete rdefault;
 
        if(use_vulkan) {
index 417966d..46363f4 100644 (file)
@@ -27,7 +27,7 @@ bool init_opengl()
 
        glEnable(GL_DEPTH_TEST);
        glEnable(GL_CULL_FACE);
-       
+
        return true;
 }
 
index a223fa7..8d2c70c 100644 (file)
@@ -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 */
index 8adb7df..99c3b01 100644 (file)
@@ -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; i<textures.size(); i++) {
                if(textures[i]->name == name) {
                        return textures[i];