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 0fbcf3830331cd893dbd5bc4b0f6f46dc72a9381..80a73cba61e2caf6ac53281af7bb7ded14c303e8 100644 (file)
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include "renderable.h"
-#include "renderpass.h"
+#include "rendermethod.h"
 #include "resourceobserver.h"
 
 namespace Msp {
@@ -37,7 +37,7 @@ private:
                LevelOfDetail &lod;
 
        public:
-               LodLoader(Object &, unsigned, Collection *);
+               LodLoader(Object &, unsigned, Collection &);
 
        private:
                void mesh(const std::string &);
@@ -50,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);
@@ -118,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 &);