Remove dynamic allocation from VertexFormat

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

diff --git a/source/scene.cpp b/source/scene.cpp
index 1625ca32c7c74052cdec47cdf10f741d26115f12..b8a74b59be7f3c6be74c85a179994c07345755ae 100644 (file)
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -66,11 +66,15 @@ bool Scene::frustum_cull(const Renderable &renderable) const
                return false;
 
        Vector4 center = culling_matrix*(*matrix*compose(bsphere->get_center(), 1.0f));
-       float radius = bsphere->get_radius();
+       Vector4 x_axis = *matrix*Vector4(bsphere->get_radius(), 0.0f, 0.0f, 0.0f);
+       float radius_sq = inner_product(x_axis, x_axis);
 
        for(unsigned i=0; i<6; ++i)
-               if(inner_product(center, frustum_edges[i])>radius)
+       {
+               float distance = inner_product(center, frustum_edges[i]);
+               if(distance>0 && distance*distance>radius_sq)
                        return true;
+       }
 
        return false;
 }