Drop Id tags and copyright notices from files

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

diff --git a/source/object.h b/source/object.h
index 4655695b355583d40598a7186eeab915c497d016..a574fb645ddd2b20fbbce4f9c32fffa0de8d57f9 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_OBJECT_H_
 #define MSP_GL_OBJECT_H_
 
@@ -44,11 +37,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 &);
        };
 
@@ -57,6 +50,7 @@ public:
 
        void set_mesh(const Mesh *m) { set_mesh(0, m); }
        void set_mesh(unsigned, const Mesh *);
+       const Mesh *get_mesh(unsigned = 0) const;
        void set_technique(const Technique *);
        const Technique *get_technique() const { return technique.get(); }
 
@@ -65,33 +59,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;
-
-       /**
-       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;
+       virtual void render(Renderer &, const ObjectInstance &, const Tag & = Tag()) const;
 
-               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