Use constructor delegation instead of init functions when possible

[libs/gl.git] / source / render / instancearray.h

diff --git a/source/render/instancearray.h b/source/render/instancearray.h
index 6a598b5854f3183e290896eb052708f32c0f98a6..8f5c73225519a374623c818b6298cdc55a308471 100644 (file)
--- 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;