Rename RenderPass to RenderMethod

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

diff --git a/source/render/object.h b/source/render/object.h
index 0fbcf3830331cd893dbd5bc4b0f6f46dc72a9381..dea389e4b8ae4d0d841ccbea333341bbc2a40ef9 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 {
@@ -50,10 +50,10 @@ public:
        class Loader: public LodLoader
        {
        public:
-               Loader(Object &);
-               Loader(Object &, Collection &);
+               Loader(Object &o): Loader(o, 0) { }
+               Loader(Object &o, Collection &c): Loader(o, &c) { }
        private:
-               void init();
+               Loader(Object &, Collection *);
                virtual void finish();
 
                void bounding_sphere_hint(float, float, float, float);
@@ -118,7 +118,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 &);