X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Finstancearray.h;h=0965499fe66f98de6268619a189f80d253d91800;hp=6a598b5854f3183e290896eb052708f32c0f98a6;hb=8544116298d7a1be176f52be48c9952529f5c446;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1

diff --git a/source/render/instancearray.h b/source/render/instancearray.h
index 6a598b58..0965499f 100644
--- a/source/render/instancearray.h
+++ b/source/render/instancearray.h
@@ -4,6 +4,8 @@
 #include <vector>
 #include "programdata.h"
 #include "renderable.h"
+#include "vertexarray.h"
+#include "vertexsetup.h"
 
 namespace Msp {
 namespace GL {
@@ -11,8 +13,6 @@ namespace GL {
 class Buffer;
 class Object;
 class ObjectInstance;
-class VertexArray;
-class VertexSetup;
 
 /**
 Renders multiple instances of an Object in an efficient manner.  If instanced
@@ -39,11 +39,11 @@ public:
 private:
 	const Object &object;
 	std::vector<ObjectInstance *> instances;
-	VertexArray *instance_data;
-	Buffer *instance_buffer;
-	VertexSetup *vtx_setup;
-	int matrix_location;
-	unsigned matrix_offset;
+	VertexArray instance_data;
+	Buffer *instance_buffer = 0;
+	VertexSetup vtx_setup;
+	int matrix_location = -1;
+	unsigned matrix_offset = 0;
 
 public:
 	InstanceArray(const Object &);