Bind ProgramData to a Program upon construction

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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 955ad1ddd7f0d9ac2f9ee2508c8bad3bdd49d88b..d665851fbb5d40fb0201d17c255ea8667572a04c 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -1,13 +1,16 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_OBJETCINSTANCE_H_
 #define MSP_GL_OBJETCINSTANCE_H_
 
+#include <string>
+#include "renderable.h"
+
 namespace Msp {
 namespace GL {
 
@@ -19,26 +22,29 @@ Represents a single instance of an Object.  An application can derive another
 class from this and overload the hook functions to specify location and other
 instance-specific parameters for the rendered objects.
 */
-class ObjectInstance
+class ObjectInstance: public Renderable
 {
 protected:
        const Object &object;
 
 public:
        ObjectInstance(const Object &);
-       void render() const;
 
-       /**
-       Hook function, called from Object just before rendering the mesh.
-       */
-       virtual void setup_render() const { }
+       const Object &get_object() const { return object; }
+
+       virtual void render(const Tag &tag = Tag()) const;
+       virtual void render(Renderer &, const Tag & = Tag()) const;
+
+       /** Hook function, called from Object just before rendering the mesh.
+       Renderer state will have been pushed before this is called. */
+       virtual void setup_render(Renderer &, const Tag &) const { }
 
-       /**
-       Hook function, called from Object right after rendering the mesh.
-       */
-       virtual void finish_render() const { }
+       /** Hook function, called from Object right after rendering the mesh.  Since
+       Object takes care of pushing Renderer state, this rarely needs to do
+       anything. */
+       virtual void finish_render(Renderer &, const Tag &) const { }
 
-       virtual unsigned get_detail_level() const { return 0; }
+       virtual unsigned get_level_of_detail() const { return 0; }
 };
 
 } // namespace GL