Always use VertexSetup in Mesh

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

diff --git a/source/mesh.h b/source/mesh.h
index c09fad6da74ae1ab64fd361b17bb4714d4de34f9..54ff28031d369affe732031d5a5f6c4d6a3afa01 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -5,6 +5,7 @@
 #include "batch.h"
 #include "resource.h"
 #include "vertexarray.h"
+#include "vertexsetup.h"
 #include "windingtest.h"
 
 namespace Msp {
@@ -12,7 +13,6 @@ namespace GL {
 
 class Buffer;
 class Renderer;
-class VertexSetup;
 
 /**
 Raw mesh data, consisting of a VertexArray and one or more Batches.  Though a
@@ -56,7 +56,7 @@ private:
        std::vector<Batch> batches;
        Buffer *vbuf;
        Buffer *ibuf;
-       VertexSetup *vtx_setup;
+       VertexSetup vtx_setup;
        bool defer_buffers;
        mutable bool dirty;
        bool disallow_rendering;
@@ -76,7 +76,7 @@ private:
 
 public:
        const VertexArray &get_vertices() const { return vertices; }
-       const VertexSetup *get_vertex_setup() const { return vtx_setup; }
+       const VertexSetup &get_vertex_setup() const { return vtx_setup; }
        const Buffer *get_index_buffer() const { return ibuf; }
        unsigned get_n_vertices() const;
        float *modify_vertex(unsigned);