Add a loader to InstanceArray and make them loadable in scenes

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

diff --git a/source/render/scene.h b/source/render/scene.h
index 692dcd0dfc6c7ebf88e0e8c7f0b26d7c0aae4b33..512b020b8e3b29d5b930baff4c7bc29cc58cfb5d 100644 (file)
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -40,6 +40,7 @@ protected:
        private:
                Loader(Scene &, Collection &, ContentMap *);
 
+               void array(const std::string &);
                void object(const std::string &);
                void object_tagged(const std::string &, const std::string &);
                void scene(const std::string &);
@@ -60,23 +61,14 @@ public:
 
 protected:
        mutable Matrix culling_matrix;
-       mutable Vector4 frustum_edges[6];
 
        Scene() = default;
-private:
-       Scene(const Scene &);
-       Scene &operator=(const Scene &);
 public:
        virtual ~Scene() = default;
 
        virtual void add(Renderable &) = 0;
        virtual void remove(Renderable &) = 0;
 
-protected:
-       bool setup_frustum(const Renderer &) const;
-       bool frustum_cull(const Renderable &) const;
-
-public:
        template<typename T>
        static void register_type(const std::string &);
 private: