X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmesh.h;h=57c87b7e42986ac31f94092612c373159b633a7a;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=e9feb675a0635ee67127b5b4cd0f426617be7855;hpb=574abfb7aeb77436714ea06bf82713cb3d85204e;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index e9feb675..57c87b7e 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,15 +19,18 @@ 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;
 
 public:
 	class Loader: public DataFile::ObjectLoader<Mesh>
 	{
+	private:
+		bool allow_gl_calls;
+
 	public:
-		Loader(Mesh &);
+		Loader(Mesh &, bool = true);
 	private:
 		void vertices(const std::vector<VertexComponent> &);
 		void batch(PrimitiveType);
@@ -51,13 +55,18 @@ private:
 		virtual bool process();
 	};
 
+	enum BufferMask
+	{
+		VERTEX_BUFFER = 1,
+		INDEX_BUFFER = 2
+	};
+
 	VertexArray vertices;
-	std::list<Batch> batches;
+	std::vector<Batch> batches;
 	Buffer *vbuf;
 	Buffer *ibuf;
-	unsigned vao_id;
-	bool defer_buffers;
-	mutable bool dirty;
+	VertexSetup vtx_setup;
+	mutable unsigned short dirty;
 	bool disallow_rendering;
 	const WindingTest *winding;
 
@@ -70,31 +79,28 @@ public:
 	~Mesh();
 
 	void clear();
-	void use_buffers(bool);
 private:
-	void create_buffers();
-	void setup_vao() const;
+	void check_buffers(unsigned);
 
 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);
 
 	void add_batch(const Batch &b);
-	const std::list<Batch> &get_batches() { return batches; }
+	const std::vector<Batch> &get_batches() const { return batches; }
 
 	void set_winding(const WindingTest *);
 
-	void draw() const;
 	void draw(Renderer &) const;
+	void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
+private:
+	void draw(Renderer &, const VertexSetup *, unsigned) const;
+	void resize_buffers() 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();
-
+public:
 	virtual int get_load_priority() const { return 1; }
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
 	virtual UInt64 get_data_size() const;