X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=54ff28031d369affe732031d5a5f6c4d6a3afa01;hb=e65e7dabfc1d3b2c87345df75fc942fb1fe47581;hp=db0163e17ef3521ef471109758b9d846c6649782;hpb=f3ee640033ec6367915b51a3beaf2330f39d75ac;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index db0163e1..54ff2803 100644
--- 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;
@@ -71,12 +71,12 @@ public:
 	~Mesh();
 
 	void clear();
-	void use_buffers(bool);
 private:
 	void create_buffers();
 
 public:
 	const VertexArray &get_vertices() const { return vertices; }
+	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);
@@ -88,6 +88,7 @@ public:
 
 	void draw() const;
 	void draw(Renderer &) const;
+	void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
 
 	/** Binds the mesh for rendering.  The vertex array is applied using generic
 	attributes only.  Uses vertex array object if possible. */