Fix various issues with constant condition elimination

[libs/gl.git] / source / scene.h

diff --git a/source/scene.h b/source/scene.h
index 9e90b1284a014e90aa9a03191172b7137c80e35b..639a467fa849cb526c19ac31744b957f820af7ea 100644 (file)
--- a/source/scene.h
+++ b/source/scene.h
@@ -21,13 +21,23 @@ public:
        class Loader: public DataFile::CollectionObjectLoader<Scene>
        {
        public:
-               Loader(Scene &, Collection &);
+               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];