Remove the culler abstraction and move frustum culling to Scene

[libs/gl.git] / source / zsortedscene.cpp

diff --git a/source/zsortedscene.cpp b/source/zsortedscene.cpp
index da406b7ef0074f19a0e125c328d93595ed43d03d..c9bce6798a83959e8568dde9454b80b2ff28b2b0 100644 (file)
--- a/source/zsortedscene.cpp
+++ b/source/zsortedscene.cpp
@@ -36,15 +36,15 @@ void ZSortedScene::render(Renderer &renderer, const Tag &tag) const
        float radius_factor = 1.0f-reference;
        float sign = order*2.0f-1.0f;
 
-       setup_cullers(renderer);
+       setup_frustum(renderer);
        for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               if(!cull(renderer, **i))
+               if(!frustum_cull(renderer, **i))
                {
                        float z = 0;
                        if(const Matrix *model_matrix = (*i)->get_matrix())
                        {
                                if(const Geometry::BoundingSphere<float, 3> *bsphere = (*i)->get_bounding_sphere())
-                                       z = (view_matrix**model_matrix*Vector4(bsphere->get_center(), 1.0f)).z+bsphere->get_radius()*radius_factor;
+                                       z = (view_matrix**model_matrix*compose(bsphere->get_center(), 1.0f)).z+bsphere->get_radius()*radius_factor;
                                else
                                        z = (view_matrix**model_matrix*Vector4(0.0f, 0.0f, 0.0f, 1.0f)).z;
                        }