X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.h;h=e9feb675a0635ee67127b5b4cd0f426617be7855;hp=6181d5fb9bc1b9126248d2e786f826a77c7c92bd;hb=0807680edd94a7f14560831db4dd52e4e48d0d19;hpb=99b3477d16295c9b90daa0a397bfc375dd3aac4d

diff --git a/source/mesh.h b/source/mesh.h
index 6181d5fb..e9feb675 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -3,6 +3,7 @@
 
 #include <msp/datafile/objectloader.h>
 #include "batch.h"
+#include "resource.h"
 #include "vertexarray.h"
 #include "windingtest.h"
 
@@ -17,7 +18,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>, public Resource
 {
 	friend class MeshBuilder;
 
@@ -33,25 +34,50 @@ public:
 	};
 
 private:
+	class AsyncLoader: public Resource::AsyncLoader
+	{
+	private:
+		Mesh &mesh;
+		IO::Seekable &io;
+		Bufferable::AsyncUpdater *vertex_updater;
+		Bufferable::AsyncUpdater *index_updater;
+		unsigned phase;
+
+	public:
+		AsyncLoader(Mesh &, IO::Seekable &);
+		~AsyncLoader();
+
+		virtual bool needs_sync() const;
+		virtual bool process();
+	};
+
 	VertexArray vertices;
 	std::list<Batch> batches;
 	Buffer *vbuf;
 	Buffer *ibuf;
+	unsigned vao_id;
 	bool defer_buffers;
+	mutable bool dirty;
+	bool disallow_rendering;
 	const WindingTest *winding;
 
 public:
-	Mesh();
-	Mesh(const VertexFormat &f);
+	Mesh(ResourceManager * = 0);
+	Mesh(const VertexFormat &, ResourceManager * = 0);
+private:
+	void init(ResourceManager *);
+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 Buffer *get_index_buffer() const { return ibuf; }
 	unsigned get_n_vertices() const;
 	float *modify_vertex(unsigned);
 
@@ -62,6 +88,17 @@ public:
 
 	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();
+
+	virtual int get_load_priority() const { return 1; }
+	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
+	virtual UInt64 get_data_size() const;
+	virtual void unload();
 };
 
 } // namespace GL