X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=730b724c9e81a9eee6072cac1d4762b503dbd6fc;hb=e37851b98dde5082ee92570354746f2f92e21940;hp=83f2fb0734d3bf31b16e2756977bb53a78d21214;hpb=43c6495ff3d14a85ee5de169a80fdacf13b7147e;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index 83f2fb07..730b724c 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -17,7 +17,7 @@ Raw mesh data, consisting of a VertexArray and one or more Batches.  Though a
 Mesh can draw itself, it's usually used as part of Renderables rather than on
 its own.
 */
-class Mesh
+class Mesh: public Bindable<Mesh>
 {
 	friend class MeshBuilder;
 
@@ -35,8 +35,11 @@ public:
 private:
 	VertexArray vertices;
 	std::list<Batch> batches;
+	Buffer *vbuf;
 	Buffer *ibuf;
-	bool defer_ibuf;
+	unsigned vao_id;
+	bool defer_buffers;
+	mutable bool dirty;
 	const WindingTest *winding;
 
 public:
@@ -46,8 +49,13 @@ public:
 
 	void clear();
 	void use_buffers(bool);
+private:
+	void create_buffers();
+	void setup_vao() const;
 
+public:
 	const VertexArray &get_vertices() const { return vertices; }
+	const Buffer *get_index_buffer() const { return ibuf; }
 	unsigned get_n_vertices() const;
 	float *modify_vertex(unsigned);
 
@@ -58,6 +66,10 @@ public:
 
 	void draw() const;
 	void draw(Renderer &) const;
+
+	void bind() const;
+
+	static void unbind();
 };
 
 } // namespace GL