X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=730b724c9e81a9eee6072cac1d4762b503dbd6fc;hb=126ac7ca4053b765eab1473d2865bce728ef2428;hp=625cebe267e681aefe3d7949dc0b60f889c250ed;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index 625cebe2..730b724c 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -12,7 +12,12 @@ namespace GL {
 class Buffer;
 class Renderer;
 
-class Mesh
+/**
+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: public Bindable<Mesh>
 {
 	friend class MeshBuilder;
 
@@ -22,7 +27,7 @@ public:
 	public:
 		Loader(Mesh &);
 	private:
-		void vertices(VertexFormat);
+		void vertices(const std::vector<VertexComponent> &);
 		void batch(PrimitiveType);
 		void winding(FaceWinding);
 	};
@@ -30,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:
@@ -41,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);
 
@@ -53,6 +66,10 @@ public:
 
 	void draw() const;
 	void draw(Renderer &) const;
+
+	void bind() const;
+
+	static void unbind();
 };
 
 } // namespace GL