X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Foccludedscene.cpp;fp=source%2Frender%2Foccludedscene.cpp;h=bfa9fed76a5b7a19b2bf728fa03c04c80c811554;hb=9a63244c1342337915c4610401a24c09fa72cc3d;hp=143008cdc92af5a5a1a01a1627d7732fc60ebcbe;hpb=73bef37da97b6da0b99227f63235cb52c4e56c44;p=libs%2Fgl.git

diff --git a/source/render/occludedscene.cpp b/source/render/occludedscene.cpp
index 143008cd..bfa9fed7 100644
--- a/source/render/occludedscene.cpp
+++ b/source/render/occludedscene.cpp
@@ -4,6 +4,7 @@
 #include "camera.h"
 #include "occludedscene.h"
 #include "renderer.h"
+#include "resources.h"
 #include "sphere.h"
 
 using namespace std;
@@ -11,19 +12,14 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-OccludedScene::OccludedScene():
-	bounding_mesh((VERTEX3, NORMAL3)),
-	bounding_shader("occluder.glsl"),
+OccludedScene::OccludedScene(Resources &resources):
+	bounding_mesh(resources.get<Mesh>("_occluder.mesh")),
+	bounding_shader(resources.get<Program>("_occluder.glsl")),
 	occluder_min_size(0.25f),
 	cache_dirty(false)
 {
 	static Require req(ARB_occlusion_query);
 	static Require req2(ARB_occlusion_query2);
-
-	/* Use a slightly larger radius to ensure that all parts of the renderable
-	fit inside the icosahedron */
-	IcoSphereBuilder(1.26f, 1).build(bounding_mesh);
-	bounding_mesh.set_winding(&WindingTest::counterclockwise());
 }
 
 OccludedScene::~OccludedScene()