quick backup

[demo] / src / renderer.cc

diff --git a/src/renderer.cc b/src/renderer.cc
index 816e924..fd18d55 100644 (file)
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -14,6 +14,8 @@
 #include "shader_manager.h"
 #include "texture.h"
 
+#undef DRAW_NORMALS
+
 /* skybox */
 
 static Mesh *skymesh; /* it will be used by many renderers => no destroy */
@@ -28,6 +30,8 @@ Renderer::Renderer()
 
        skytex = 0;
        dskytex = 0;
+
+       fog_density = 0;
 }
 
 Renderer::~Renderer()
@@ -37,9 +41,9 @@ Renderer::~Renderer()
 bool Renderer::create()
 {
        //debug
-       if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
-               fprintf(stderr, "Failed to load debug shaders.\n");
-       }
+       // if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
+       //      fprintf(stderr, "Failed to load debug shaders.\n");
+       // }
 
        if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
                return false;
@@ -50,11 +54,24 @@ bool Renderer::create()
        diff_loc = sprog->get_uniform_location("diffuse");
        spec_loc = sprog->get_uniform_location("specular");
        shin_loc = sprog->get_uniform_location("shininess");
+       fog_loc = sprog->get_uniform_location("fog_density");
 
        /* uniform locations for matrices */
 
        mmviewproj_loc = sprog->get_uniform_location("mmviewproj");
        mview_loc = sprog->get_uniform_location("mview");
+       mmod_loc = sprog->get_uniform_location("mmod");
+
+       /* skybox, irradiance map uniforms */
+
+       stex_loc = sprog->get_uniform_location("stex");
+       dstex_loc = sprog->get_uniform_location("dstex");
+
+       if(stex_loc != -1)
+               sprog->set_uniformi(stex_loc, 0);
+
+       if(dstex_loc != -1)
+               sprog->set_uniformi(dstex_loc, 1);
 
        return true;
 }
@@ -66,6 +83,10 @@ void Renderer::draw() const
 
        if(skytex) {
                draw_skybox();
+
+               if(dskytex) {
+                       dskytex->bind(1);
+               }
        }
 
        if(!sprog->link())
@@ -93,10 +114,13 @@ void Renderer::draw_object(Object *object) const
        if(shin_loc != -1)
                sprog->set_uniformf(shin_loc, m->shininess);
 
+       if(fog_loc != -1)
+               sprog->set_uniformf(fog_loc, fog_density);
+
        /* texture */
 
        if(m->dtex)
-               m->dtex->bind();
+               m->dtex->bind(0);
 
        /* setting uniforms for matrices */
 
@@ -108,9 +132,14 @@ void Renderer::draw_object(Object *object) const
        if(mview_loc != -1)
                sprog->set_uniform_matrix(mview_loc, mview);
 
+       Mat4 mmod = object->transform.upper3x3();
+       if(mmod_loc != -1)
+               sprog->set_uniform_matrix(mmod_loc, mmod);
+
        object->mesh->draw();
 
-       /* debug
+       // debug
+#ifdef DRAW_NORMALS
        if(nprog) {
                int loc = nprog->get_uniform_location("mmviewproj");
                if(loc != -1) {
@@ -119,10 +148,7 @@ void Renderer::draw_object(Object *object) const
                nprog->use();
                object->mesh->draw_normals(1.0);
        }
-       */
-
-       // if(m->dtex)
-       //      m->dtex->unbind();
+#endif
 }
 
 void Renderer::set_sky_tex(Texture *stex)