X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fscene.cpp;h=3933599ba5c63f13307d1c755ba0cd9323842a1b;hb=5c5d094255ae5b0a07f99392a5a099ad9c8e8e38;hp=6c3d2910706db98d6f2ecd7ed67b3dd771c372e8;hpb=b6fd887102ab8e4109fa2edd40b9e51f80f88410;p=libs%2Fgl.git diff --git a/source/scene.cpp b/source/scene.cpp index 6c3d2910..3933599b 100644 --- a/source/scene.cpp +++ b/source/scene.cpp @@ -15,12 +15,6 @@ Scene::~Scene() delete *i; } -void Scene::render(const Tag &tag) const -{ - Renderer renderer(0); - render(renderer, tag); -} - bool Scene::setup_frustum(const Renderer &renderer) const { const Camera *camera = renderer.get_camera(); @@ -66,13 +60,13 @@ bool Scene::frustum_cull(const Renderable &renderable) const return false; Vector4 center = culling_matrix*(*matrix*compose(bsphere->get_center(), 1.0f)); - Vector4 x_axis = *matrix*Vector4(1.0f, 0.0f, 0.0f, 0.0f); - float radius_sq = bsphere->get_radius()*inner_product(x_axis, x_axis); + 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) { float distance = inner_product(center, frustum_edges[i]); - if(distance*distance>radius_sq) + if(distance>0 && distance*distance>radius_sq) return true; }