X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.cpp;h=e6c62e802f8c9672fafce477d3eae50c9f2efaac;hp=6c3d2910706db98d6f2ecd7ed67b3dd771c372e8;hb=8bc776f177c7cf9d0c6fd9590273f086d38c23ca;hpb=b6fd887102ab8e4109fa2edd40b9e51f80f88410

diff --git a/source/scene.cpp b/source/scene.cpp
index 6c3d2910..e6c62e80 100644
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -11,16 +11,10 @@ namespace GL {
 
 Scene::~Scene()
 {
-	for(list<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
+	for(vector<Renderable *>::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
 		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();
@@ -46,7 +40,7 @@ bool Scene::setup_frustum(const Renderer &renderer) const
 		frustum_edges[0] = Vector4(0, 1/s, y/s, 0);
 		frustum_edges[1] = Vector4(0, -1/s, y/s, 0);
 
-		float x = y*camera->get_aspect();
+		float x = y*camera->get_aspect_ratio();
 		s = sqrt(x*x+1);
 		frustum_edges[2] = Vector4(1/s, 0, x/s, 0);
 		frustum_edges[3] = Vector4(-1/s, 0, x/s, 0);
@@ -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);
+	Vector3 x_axis = (matrix->column(0)*bsphere->get_radius()).slice<3>(0);
+	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;
 	}
 
@@ -81,16 +75,37 @@ bool Scene::frustum_cull(const Renderable &renderable) const
 
 
 Scene::Loader::Loader(Scene &s, Collection &c):
-	DataFile::CollectionObjectLoader<Scene>(s, &c)
+	DataFile::CollectionObjectLoader<Scene>(s, &c),
+	content(0)
+{
+	init();
+}
+
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
+	DataFile::CollectionObjectLoader<Scene>(s, &c),
+	content(&m)
+{
+	init();
+}
+
+void Scene::Loader::init()
 {
 	add("object", &Loader::object);
+	add("object", &Loader::object_tagged);
 }
 
 void Scene::Loader::object(const string &n)
+{
+	object_tagged(n, string());
+}
+
+void Scene::Loader::object_tagged(const string &n, const string &t)
 {
 	RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
 	load_sub(*anob);
 	obj.add(*anob);
+	if(content && !t.empty())
+		(*content)[t] = anob.get();
 	obj.owned_data.push_back(anob.release());
 }