X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Foccludedscene.cpp;h=644e380d15ab10a25917571fd29d61522040a99f;hp=0d8a5b857698d17d3a67e91e2367d674424eec05;hb=HEAD;hpb=bdcae47bf2f4e49d2d9e4ba15e6f17171ce5fa0c diff --git a/source/render/occludedscene.cpp b/source/render/occludedscene.cpp index 0d8a5b85..cb37a60e 100644 --- a/source/render/occludedscene.cpp +++ b/source/render/occludedscene.cpp @@ -95,10 +95,9 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const float frustum_h = tan(camera->get_field_of_view()/2.0f)*2.0f; // Perform frustum culling and render any major occluders - bool use_frustum = setup_frustum(renderer); for(auto i=occluded_cache.begin(); (i!=occluded_cache.end() && i->renderable); ++i) { - i->in_frustum = (!use_frustum || !frustum_cull(*i->renderable)); + i->in_frustum = camera->is_in_frustum(*i->renderable); if(!i->in_frustum) continue; @@ -143,7 +142,7 @@ void OccludedScene::render(Renderer &renderer, Tag tag) const { QueryPool::Activate activate_query(renderer, queries, i-occluded_cache.begin()); Renderer::Push push2(renderer); - renderer.transform(Matrix(*i->renderable->get_matrix()) + renderer.set_matrix(Matrix(*i->renderable->get_matrix()) .translate(i->bounding_sphere->get_center()) .scale(i->bounding_sphere->get_radius())); bounding_mesh.draw(renderer);