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

diff --git a/source/scene.h b/source/scene.h
index e6de1c23..639a467f 100644
--- a/source/scene.h
+++ b/source/scene.h
@@ -1,35 +1,60 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_SCENE_H_
 #define MSP_GL_SCENE_H_
 
-#include <map>
-#include <set>
+#include <vector>
+#include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "renderable.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-class Object;
-class ObjectInstance;
-
+/**
+Scenes are containers for other Renderables.  This is a base class that can't
+be instantiated.  Examples of available Scene types are SimpleScene,
+InstancedScene and OrderedScene.
+*/
 class Scene: public Renderable
 {
+public:
+	class Loader: public DataFile::CollectionObjectLoader<Scene>
+	{
+	public:
+		typedef std::map<std::string, Renderable *> ContentMap;
+
+	private:
+		ContentMap *content;
+
+	public:
+		Loader(Scene &, Collection &);
+		Loader(Scene &, Collection &, ContentMap &);
+	private:
+		void init();
+
+		void object(const std::string &);
+		void object_tagged(const std::string &, const std::string &);
+	};
+
+protected:
+	// XXX If a loaded renderable is removed from the scene it needs to be removed from here as well
+	std::vector<Renderable *> owned_data;
+	mutable Matrix culling_matrix;
+	mutable Vector4 frustum_edges[6];
+
+	Scene() { }
 private:
-	std::map<const Object *, std::set<const ObjectInstance *> > objects;
-	std::set<const Renderable *> renderables;
-
+	Scene(const Scene &);
+	Scene &operator=(const Scene &);
 public:
-	void add(const Renderable &);
-	void remove(const Renderable &);
+	virtual ~Scene();
+
+	virtual void add(Renderable &) = 0;
+	virtual void remove(Renderable &) = 0;
 
-	virtual bool has_pass(const Tag &) const { return true; }
-	virtual void render(const Tag &tag=Tag()) const;
+protected:
+	bool setup_frustum(const Renderer &) const;
+	bool frustum_cull(const Renderable &) const;
 };
 
 } // namespace GL