Drop support for Renderables that don't accept a Renderer

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

diff --git a/source/renderable.h b/source/renderable.h
index b83fdb0dfc59747400d63434372299188015cec1..78879a3d8030fb15fcd41136c16ec7c831541972 100644 (file)
--- a/source/renderable.h
+++ b/source/renderable.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_RENDERABLE_H_
 #define MSP_GL_RENDERABLE_H_
 
@@ -14,6 +7,12 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class Renderer;
+
+/**
+Base class for renderable objects.  All Renderables must support rendering with
+a Renderer, and may optionally provide support for standalone rendering.
+*/
 class Renderable
 {
 protected:
@@ -21,8 +20,11 @@ protected:
 public:
        virtual ~Renderable() { }
 
-       virtual bool has_pass(const Tag &tag) const =0;
-       virtual void render(const Tag &tag=Tag()) const =0;
+       /** Returns a key used for grouping Renderables in an InstanceScene. */
+       virtual long get_instance_key() const { return 0; }
+
+       virtual void render(const Tag & = Tag()) const;
+       virtual void render(Renderer &, const Tag & = Tag()) const = 0;
 };
 
 } // namespace Msp