Add a class to unify loading coordinate transforms

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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 6094517b6d5c062ca220b14e686e5dade8802335..906ba2f32785093237c8dbf108e500a655fe3454 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -2,23 +2,21 @@
 #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,12 +27,14 @@ 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;
 
        /** Hook function, called from Object just before rendering the mesh.
        Renderer state will have been pushed before this is called. */
-       virtual void setup_render(Renderer &, const Tag &) const { }
+       virtual void setup_render(Renderer &, const Tag &) const;
 
        /** Hook function, called from Object right after rendering the mesh.  Since
        Object takes care of pushing Renderer state, this rarely needs to do