X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=e59949a3683f938797251a4a5d3f34a7ebbddc46;hp=c213f0a987218f579fbc4991fc6722bece0e083a;hb=463746f62d9b48f9fbbba3b2fcf7354067873e94;hpb=ff458d6c6118f3864a7b8494a06472d8b0ebe06a diff --git a/source/renderer.cpp b/source/renderer.cpp index c213f0a9..e59949a3 100644 --- a/source/renderer.cpp +++ b/source/renderer.cpp @@ -35,7 +35,10 @@ Renderer::Renderer(const Camera *c): if(c) set_camera(*c); else + { standard_shdata.uniform("projection_matrix", Matrix()); + standard_shdata.uniform("eye_world_matrix", Matrix()); + } } Renderer::~Renderer() @@ -54,6 +57,7 @@ void Renderer::set_camera(const Camera &c) { state->camera = &c; standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix()); changed |= STANDARD_SHDATA|LEGACY_PROJECTION; set_matrix(state->camera->get_view_matrix()); } @@ -179,9 +183,15 @@ void Renderer::pop_state() if(camera_changed) { if(state->camera) + { standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix()); + } else + { standard_shdata.uniform("projection_matrix", Matrix()); + standard_shdata.uniform("eye_world_matrix", Matrix()); + } changed |= STANDARD_SHDATA|LEGACY_PROJECTION; } /* This actually should compare the relevant matrices rather than check for