X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.h;h=1ee58a6227ea52427f93113bf9e631582f076467;hp=70370633fd0425cf88222ceab22b40d012604a35;hb=b0059bd068c99dadfc922584911fcb25a21b737b;hpb=90e99be82f2bb48ed950fa067b1da8404c86b152

diff --git a/source/mesh.h b/source/mesh.h
index 70370633..1ee58a62 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -12,6 +12,7 @@ namespace GL {
 
 class Buffer;
 class Renderer;
+class VertexSetup;
 
 /**
 Raw mesh data, consisting of a VertexArray and one or more Batches.  Though a
@@ -55,7 +56,7 @@ private:
 	std::vector<Batch> batches;
 	Buffer *vbuf;
 	Buffer *ibuf;
-	unsigned vao_id;
+	VertexSetup *vtx_setup;
 	bool defer_buffers;
 	mutable bool dirty;
 	bool disallow_rendering;
@@ -73,10 +74,10 @@ public:
 	void use_buffers(bool);
 private:
 	void create_buffers();
-	void setup_vao() const;
 
 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 +89,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. */