X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Finstancearray.h;h=8f5c73225519a374623c818b6298cdc55a308471;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hp=627051f75b123a973ef878546fddd762708afe59;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/render/instancearray.h b/source/render/instancearray.h
index 627051f7..8f5c7322 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,9 +39,9 @@ public:
 private:
 	const Object &object;
 	std::vector<ObjectInstance *> instances;
-	VertexArray *instance_data;
+	VertexArray instance_data;
 	Buffer *instance_buffer;
-	VertexSetup *vtx_setup;
+	VertexSetup vtx_setup;
 	int matrix_location;
 	unsigned matrix_offset;
 
@@ -59,7 +59,7 @@ private:
 public:
 	void remove(ObjectInstance &);
 
-	virtual void render(Renderer &, const Tag &) const;
+	virtual void render(Renderer &, Tag) const;
 };
 
 template<typename T>