Add a new Placeable base class

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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 3dc5da6a399432bafa62197b01ae0e19d7475f5f..273d348579b4b8a34e71d2ebcb33a73f9394c60b 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -2,23 +2,23 @@
 #define MSP_GL_OBJETCINSTANCE_H_
 
 #include <string>
-#include "renderable.h"
+#include "object.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-class Object;
 class ProgramData;
 
 /**
-Represents a single instance of an Object.  A derived class can overload the
-hook functions to specify a model matrix and other instance-specific parameters
-for the rendered objects.
+Represents a single instance of an Object.  Thanks to being derived from
+Placeable in can be positioned without additional effort.  Other instance
+parameters can be set by overriding the hook functions.
 
 ObjectInstances can benefit from being put in an InstanceScene, which will
 render all instances of the same object consecutively.
 */
-class ObjectInstance: public Renderable
+class ObjectInstance: public PlacedRenderable
 {
 protected:
        const Object &object;
@@ -29,6 +29,8 @@ public:
        const Object &get_object() const { return object; }
        virtual long get_instance_key() const { return reinterpret_cast<long>(&object); }
 
+       virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return object.get_bounding_sphere(); }
+
        virtual void render(const Tag &tag = Tag()) const;
        virtual void render(Renderer &, const Tag & = Tag()) const;
 
@@ -41,7 +43,7 @@ public:
        anything. */
        virtual void finish_render(Renderer &, const Tag &) const { }
 
-       virtual unsigned get_level_of_detail() const { return 0; }
+       virtual unsigned get_level_of_detail(const Renderer &) const { return 0; }
 };
 
 } // namespace GL