Drop Renderable::has_pass; renderables are now expected to ignore unknown passes

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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 955ad1ddd7f0d9ac2f9ee2508c8bad3bdd49d88b..602cbc24d80a50989a4faee48db6e0319bda9cdc 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -8,6 +8,9 @@ Distributed under the LGPL
 #ifndef MSP_GL_OBJETCINSTANCE_H_
 #define MSP_GL_OBJETCINSTANCE_H_
 
+#include <string>
+#include "renderable.h"
+
 namespace Msp {
 namespace GL {
 
@@ -18,27 +21,33 @@ class ProgramData;
 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.
+
+The finish_render function generally should clean up everything done by
+setup_render, unless the rendering sequence is known to allow otherwise.
 */
-class ObjectInstance
+class ObjectInstance: public Renderable
 {
 protected:
        const Object &object;
 
 public:
        ObjectInstance(const Object &);
-       void render() const;
+
+       const Object &get_object() const { return object; }
+
+       virtual void render(const Tag &tag=Tag()) const;
 
        /**
        Hook function, called from Object just before rendering the mesh.
        */
-       virtual void setup_render() const { }
+       virtual void setup_render(const Tag &) const { }
 
        /**
        Hook function, called from Object right after rendering the mesh.
        */
-       virtual void finish_render() const { }
+       virtual void finish_render(const Tag &) const { }
 
-       virtual unsigned get_detail_level() const { return 0; }
+       virtual unsigned get_level_of_detail() const { return 0; }
 };
 
 } // namespace GL