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

diff --git a/source/mesh.h b/source/mesh.h
index 70370633..b4ba0c45 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 {
@@ -18,7 +19,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: public Bindable<Mesh>, public Resource
+class Mesh: public Resource
 {
 	friend class MeshBuilder;
 
@@ -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;
@@ -70,13 +71,12 @@ public:
 	~Mesh();
 
 	void clear();
-	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);
@@ -86,14 +86,8 @@ public:
 
 	void set_winding(const WindingTest *);
 
-	void draw() const;
 	void draw(Renderer &) const;
-
-	/** Binds the mesh for rendering.  The vertex array is applied using generic
-	attributes only.  Uses vertex array object if possible. */
-	void bind() const;
-
-	static void unbind();
+	void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
 
 	virtual int get_load_priority() const { return 1; }
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);