X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fscene.h;h=e6de1c23e6becb3a94103a06e7d905832173534e;hp=9766ab21a0292a4a217e76c086fcefae4d77a4a8;hb=b8b06a0ff96763ba7e188d9fcacbd8c0e3dcd515;hpb=a8c4b199788c87f0a22b8c8df1509905b6fb488b

diff --git a/source/scene.h b/source/scene.h
index 9766ab21..e6de1c23 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -8,21 +8,21 @@ Distributed under the LGPL
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
+#include <map>
 #include <set>
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
+class Object;
+class ObjectInstance;
+
 class Scene: public Renderable
 {
 private:
-	struct Compare
-	{
-		bool operator()(const Renderable *, const Renderable *) const;
-	};
-
-	std::set<const Renderable *, Compare> renderables;
+	std::map<const Object *, std::set<const ObjectInstance *> > objects;
+	std::set<const Renderable *> renderables;
 
 public:
 	void add(const Renderable &);