Do not clear previous assignments on assignment to array subscript

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

diff --git a/source/objectinstance.h b/source/objectinstance.h
index 6a8749766f39ca08223c07d8971435c3abe1eebb..906ba2f32785093237c8dbf108e500a655fe3454 100644 (file)
--- a/source/objectinstance.h
+++ b/source/objectinstance.h
@@ -3,22 +3,20 @@
 
 #include <string>
 #include "object.h"
-#include "renderable.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-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;
@@ -36,7 +34,7 @@ public:
 
        /** 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