X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Finstancearray.h;h=e6f8690c68cd5b2000d25f9bb7d770f063fcc1f4;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hp=4d7d3475bbaa500d405ef05b6e3868402f9a2921;hpb=96cfb8224fe73afd04289a5d1c7780170f479e25;p=libs%2Fgl.git

diff --git a/source/render/instancearray.h b/source/render/instancearray.h
index 4d7d3475..e6f8690c 100644
--- a/source/render/instancearray.h
+++ b/source/render/instancearray.h
@@ -2,6 +2,7 @@
 #define MSP_GL_INSTANCEARRAY_H_
 
 #include <vector>
+#include <msp/core/noncopyable.h>
 #include "programdata.h"
 #include "renderable.h"
 #include "vertexarray.h"
@@ -13,16 +14,18 @@ namespace GL {
 class Buffer;
 class Object;
 class ObjectInstance;
-class VertexArray;
-class VertexSetup;
 
 /**
-Renders multiple instances of an Object in an efficient manner.  If instanced
-rendering is supported, only one draw call per Batch needs to be issued.
+Renders multiple instances of an Object in an efficient manner.
 
-Changing the Mesh of the Object while an InstanceArray exists is not supported.
+The instance specific transform is passed to the shader in an attribute with
+the name instance_transform.  The attribute should have the type vec4[3].  Each
+elements of the array corresponds to a row of the transform matrix.
+
+If the Mesh or Technique of the Object is changed during the lifetime of the
+InstanceArray, behaviour is undefined.
 */
-class InstanceArray: public Renderable
+class InstanceArray: public Renderable, public NonCopyable
 {
 public:
 	template<typename T>
@@ -42,10 +45,10 @@ private:
 	const Object &object;
 	std::vector<ObjectInstance *> instances;
 	VertexArray instance_data;
-	Buffer *instance_buffer;
+	Buffer *instance_buffer = 0;
 	VertexSetup vtx_setup;
-	int matrix_location;
-	unsigned matrix_offset;
+	int matrix_location = -1;
+	unsigned matrix_offset = 0;
 
 public:
 	InstanceArray(const Object &);
@@ -53,6 +56,8 @@ public:
 
 	void set_matrix_attribute(const std::string &);
 
+	/** Adds a new instance to the array.  The instance class must have a
+	constructor taking a const reference to Object as its sole parameter. */
 	template<typename T = ObjectInstance>
 	T &append();
 private: