terrain working - no culling

[demo] / src / renderer.cc

diff --git a/src/renderer.cc b/src/renderer.cc
index 10dd766..816e924 100644 (file)
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -36,38 +36,25 @@ Renderer::~Renderer()
 
 bool Renderer::create()
 {
-       if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
-               return false;
+       //debug
+       if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
+               fprintf(stderr, "Failed to load debug shaders.\n");
        }
 
-       /* getting material uniform locations: diffuse, specular, specular exponent (strength) */
-
-       if((diff_loc = sprog->get_uniform_location("diffuse")) == -1) {
-               fprintf(stderr, "Invalid uniform location: can't find \"diffuse\".\n");
+       if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
                return false;
        }
 
-       if((spec_loc = sprog->get_uniform_location("specular")) == -1) {
-               fprintf(stderr, "Invalid uniform location: can't find \"specular\".\n");
-               return false;
-       }
+       /* getting material uniform locations: diffuse, specular, specular exponent (strength) */
 
-       if((shin_loc = sprog->get_uniform_location("shininess")) == -1) {
-               fprintf(stderr, "Invalid uniform location: can't find \"shininess\".\n");
-               return false;
-       }
+       diff_loc = sprog->get_uniform_location("diffuse");
+       spec_loc = sprog->get_uniform_location("specular");
+       shin_loc = sprog->get_uniform_location("shininess");
 
        /* uniform locations for matrices */
 
-       if((mmviewproj_loc = sprog->get_uniform_location("mmviewproj")) == -1) {
-               fprintf(stderr, "Invalid uniform location: can't find \"mmviewproj\".\n");
-               return false;
-       }
-
-       if((mview_loc = sprog->get_uniform_location("mview")) == -1) {
-               fprintf(stderr, "Invalid uniform location: can't find \"mview\".\n");
-               return false;
-       }
+       mmviewproj_loc = sprog->get_uniform_location("mmviewproj");
+       mview_loc = sprog->get_uniform_location("mview");
 
        return true;
 }
@@ -77,6 +64,10 @@ void Renderer::draw() const
        if(!camera || !scene)
                return;
 
+       if(skytex) {
+               draw_skybox();
+       }
+
        if(!sprog->link())
                return;
 
@@ -93,9 +84,14 @@ void Renderer::draw_object(Object *object) const
 
        /* setting uniforms for material */
 
-       sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z, 1);
-       sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z, 1);
-       sprog->set_uniformf(shin_loc, m->shininess);
+       if(diff_loc != -1)
+               sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z, 1);
+
+       if(spec_loc != -1)
+               sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z, 1);
+
+       if(shin_loc != -1)
+               sprog->set_uniformf(shin_loc, m->shininess);
 
        /* texture */
 
@@ -105,13 +101,28 @@ void Renderer::draw_object(Object *object) const
        /* setting uniforms for matrices */
 
        Mat4 mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
-       sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
+       if(mmviewproj_loc != -1)
+               sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
 
        Mat4 mview = object->transform * camera->get_view_matrix();
-       sprog->set_uniform_matrix(mview_loc, mview);
+       if(mview_loc != -1)
+               sprog->set_uniform_matrix(mview_loc, mview);
 
-       object->mesh->update_vertex_data();
        object->mesh->draw();
+
+       /* debug
+       if(nprog) {
+               int loc = nprog->get_uniform_location("mmviewproj");
+               if(loc != -1) {
+                       nprog->set_uniform_matrix(loc, mmviewproj);
+               }
+               nprog->use();
+               object->mesh->draw_normals(1.0);
+       }
+       */
+
+       // if(m->dtex)
+       //      m->dtex->unbind();
 }
 
 void Renderer::set_sky_tex(Texture *stex)
@@ -123,7 +134,7 @@ void Renderer::set_sky_tex(Texture *stex)
        if(!skyprog) {
                if(!(skyprog = sdr_man->create_shader_program("sky.v.glsl", "sky.f.glsl")))
                        return;
-               if((viewproj_loc = skyprog->get_uniform_location("viewproj") == -1))
+               if((viewproj_loc = skyprog->get_uniform_location("mviewproj") == -1))
                        return;
        }
        skytex = stex;
@@ -134,11 +145,14 @@ void Renderer::set_diffuse_sky_tex(Texture *dstex)
        dskytex = dstex;
 }
 
-void Renderer::draw_skybox()
+void Renderer::draw_skybox() const
 {
        if(!skymesh || !skytex)
                return;
 
+       gfx_zbuffer(false);
+       gfx_cull_face(GFX_CULL_NONE);
+
        skytex->bind();
        skyprog->use();
 
@@ -147,4 +161,7 @@ void Renderer::draw_skybox()
        skyprog->set_uniform_matrix(viewproj_loc, mviewproj);
 
        skymesh->draw();
+
+       gfx_cull_face(GFX_CULL_BACK);
+       gfx_zbuffer(true);
 }
\ No newline at end of file