Remove collection-less constructor overloads from most loaders

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

diff --git a/source/render/object.h b/source/render/object.h
index 522d3adc335be01519e8c69df5a9a952c9b7129f..80a73cba61e2caf6ac53281af7bb7ded14c303e8 100644 (file)
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -2,19 +2,16 @@
 #define MSP_GL_OBJECT_H_
 
 #include <vector>
-#include "bindable.h"
 #include "renderable.h"
-#include "renderpass.h"
+#include "rendermethod.h"
 #include "resourceobserver.h"
 
 namespace Msp {
 namespace GL {
 
-class Material;
 class Mesh;
 class ObjectInstance;
 class Technique;
-class Texture;
 
 /**
 Combines a Mesh with a Technique to give it an appearance.  The Technique will
@@ -40,7 +37,7 @@ private:
                LevelOfDetail &lod;
 
        public:
-               LodLoader(Object &, unsigned, Collection *);
+               LodLoader(Object &, unsigned, Collection &);
 
        private:
                void mesh(const std::string &);
@@ -53,10 +50,8 @@ public:
        class Loader: public LodLoader
        {
        public:
-               Loader(Object &);
                Loader(Object &, Collection &);
        private:
-               void init();
                virtual void finish();
 
                void bounding_sphere_hint(float, float, float, float);
@@ -74,7 +69,7 @@ private:
        Geometry::BoundingSphere<float, 3> bounding_sphere;
        bool lod0_watched;
 
-       static Matrix identity_matrix;
+       static const Matrix identity_matrix;
 
 public:
        Object();
@@ -121,7 +116,7 @@ protected:
        virtual void finish_render(Renderer &, Tag) const { }
 
 private:
-       const RenderPass *get_pass(Tag, unsigned) const;
+       const RenderMethod *get_method(Tag, unsigned) const;
 
        virtual void resource_loaded(Resource &);
        virtual void resource_removed(Resource &);