Bind ProgramData to a Program upon construction

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

diff --git a/source/object.h b/source/object.h
index 4655695b355583d40598a7186eeab915c497d016..52338a1657b7af5cc0f2df7bd1c989ac224ecb42 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -44,11 +44,11 @@ public:
                void init();
 
        private:
-               void mesh();
-               void mesh(unsigned);
+               void mesh_inline();
+               void mesh_inline_lod(unsigned);
                void mesh(const std::string &);
-               void mesh(unsigned, const std::string &);
-               void technique();
+               void mesh_lod(unsigned, const std::string &);
+               void technique_inline();
                void technique(const std::string &);
        };
 
@@ -65,33 +65,17 @@ public:
        */
        virtual void render(const Tag &tag = Tag()) const;
 
+       virtual void render(Renderer &, const Tag & = Tag()) const;
+
        /**
        Renders the object with an instance.  The instance's hook functions are
        called before and after drawing the mesh.  A tag may also be given to render
        a non-default pass.
        */
-       virtual void render(const ObjectInstance &, const Tag &tag = Tag()) const;
+       virtual void render(Renderer &, const ObjectInstance &, const Tag & = Tag()) const;
 
-       /**
-       Renders multiple instances of the object in one go.  This may improve
-       performance, as the object-specific render setup only has to be done once.
-       Each instance's hook functions will be called before and after drawing the
-       mesh.
-       */
-       template<typename Iter>
-       void render(Iter begin, Iter end, const Tag &tag = Tag()) const
-       {
-               const RenderPass *pass = get_pass(tag);
-               if(!pass)
-                       return;
-
-               Bind bind(pass);
-               for(Iter i=begin; i!=end; ++i)
-                       render_instance(**i, tag);
-       }
 private:
        const RenderPass *get_pass(const Tag &) const;
-       void render_instance(const ObjectInstance &, const Tag &) const;
 };
 
 } // namespace GL