Drop support for Renderables that don't accept a Renderer

The Renderer class is the way of the future and should be used whenever
possible.

diff --git a/source/renderable.cpp b/source/renderable.cpp
index a41794c6561d8a54947c20d38990db7914f876ad..568df05b01a366124d296ec8503e65fa53395c15 100644 (file)
--- a/source/renderable.cpp
+++ b/source/renderable.cpp
@@ -10,11 +10,5 @@ void Renderable::render(const Tag &) const
        throw invalid_operation("Renderable::render");
 }
 
-void Renderable::render(Renderer &renderer, const Tag &tag) const
-{
-       renderer.escape();
-       render(tag);
-}
-
 } // namespace Msp
 } // namespace GL

diff --git a/source/renderable.h b/source/renderable.h
index c055cefa65b989047ff0b324ab53259204ac77c1..78879a3d8030fb15fcd41136c16ec7c831541972 100644 (file)
--- a/source/renderable.h
+++ b/source/renderable.h
@@ -9,6 +9,10 @@ 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:
@@ -20,7 +24,7 @@ public:
        virtual long get_instance_key() const { return 0; }
 
        virtual void render(const Tag & = Tag()) const;
-       virtual void render(Renderer &, const Tag & = Tag()) const;
+       virtual void render(Renderer &, const Tag & = Tag()) const = 0;
 };
 
 } // namespace Msp