X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Finstancescene.cpp;h=b533bae5fac75e843bf23604004e7169676a0513;hp=adaebbba3ef364b34522df0a49dad2802c990b2f;hb=bb162b9edd4b8c0e9faeed75da4148f5b9735450;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb

diff --git a/source/instancescene.cpp b/source/instancescene.cpp
index adaebbba..b533bae5 100644
--- a/source/instancescene.cpp
+++ b/source/instancescene.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "object.h"
 #include "objectinstance.h"
 #include "instancescene.h"
@@ -13,39 +6,51 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
-void InstanceScene::add(const Renderable &r)
+void InstanceScene::add(Renderable &r)
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
-		objects[&oi->get_object()].insert(oi);
-	else
-		renderables.insert(&r);
+	renderables[r.get_instance_key()].insert(&r);
 }
 
-void InstanceScene::remove(const Renderable &r)
+void InstanceScene::remove(Renderable &r)
 {
-	if(const ObjectInstance *oi = dynamic_cast<const ObjectInstance *>(&r))
+	InstanceMap::iterator i = renderables.find(r.get_instance_key());
+	if(i!=renderables.end())
 	{
-		ObjectMap::iterator i = objects.find(&oi->get_object());
-		if(i!=objects.end())
-		{
-			i->second.erase(oi);
-			if(i->second.empty())
-				objects.erase(i);
-		}
+		i->second.erase(&r);
+		if(i->second.empty())
+			renderables.erase(i);
 	}
-	else
-		renderables.erase(&r);
 }
 
-void InstanceScene::render(Renderer &renderer, const Tag &tag) const
+void InstanceScene::setup_frame(Renderer &renderer)
+{
+	for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+			(*j)->setup_frame(renderer);
+}
+
+void InstanceScene::finish_frame()
 {
-	// XXX Check that the object has this pass to avoid some unnecessary function calls
-	for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		for(InstanceSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
-			(*j)->render(renderer, tag);
+	for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+			(*j)->finish_frame();
+}
 
-	for(RenderableSet::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(renderer, tag);
+void InstanceScene::render(Renderer &renderer, const Tag &tag) const
+{
+	if(setup_frustum(renderer))
+	{
+		for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+			for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+				if(!frustum_cull(**j))
+					renderer.render(**j, tag);
+	}
+	else
+	{
+		for(InstanceMap::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+			for(RenderableSet::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
+				renderer.render(**j, tag);
+	}
 }
 
 } // namespace GL