X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderable.h;h=e90ab0243ee140173256ee3f2a6a1ba904fce7cc;hb=5c5d094255ae5b0a07f99392a5a099ad9c8e8e38;hp=b53fa9ac839307347bb614db7052dcfbe5a7a8cb;hpb=db498c7e634fa999cf4b4a8b67c49813009b1790;p=libs%2Fgl.git

diff --git a/source/renderable.h b/source/renderable.h
index b53fa9ac..e90ab024 100644
--- a/source/renderable.h
+++ b/source/renderable.h
@@ -2,6 +2,7 @@
 #define MSP_GL_RENDERABLE_H_
 
 #include <string>
+#include <msp/geometry/boundingsphere.h>
 #include "tag.h"
 
 namespace Msp {
@@ -11,8 +12,8 @@ class Matrix;
 class Renderer;
 
 /**
-Base class for renderable objects.  All Renderables must support rendering with
-a Renderer, and may optionally provide support for standalone rendering.
+Base class for renderable objects.  Rendering is performed with the help of a
+Renderer object.
 
 The render methods take a Tag to identify a render pass.  It is most commonly
 used together with Techniques and Pipelines to implement multipass rendering.
@@ -38,18 +39,18 @@ public:
 	matrix exists. */
 	virtual const Matrix *get_matrix() const { return 0; }
 
+	/** Returns a bounding sphere that completely encloses the Renderable.  The
+	bounding sphere is expressed in the renderable's coordinates.  Null is
+	returned if the bounding sphere cannot be determined. */
+	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return 0; }
+
 	/** Called when starting to render a new frame. */
-	virtual void setup_frame() const { }
+	virtual void setup_frame(Renderer &) { }
 
 	/** Called when a complete frame has been rendered. */
-	virtual void finish_frame() const { }
-
-	/** Renders the renderable without a renderer.  This can be convenient in
-	some simple cases, but most renderables don't need to implement this
-	method. */
-	virtual void render(const Tag & = Tag()) const;
+	virtual void finish_frame() { }
 
-	/** Renders the renderable.  Implementors should take care to return the
+	/** Renders the Renderable.  Implementors should take care to return the
 	renderer to the state it was in, for example by using Renderer::Push. */
 	virtual void render(Renderer &, const Tag & = Tag()) const = 0;
 };