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

diff --git a/source/mesh.h b/source/mesh.h
index 2de418ae..57c87b7e 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -19,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);
@@ -52,13 +55,18 @@ private:
 		virtual bool process();
 	};
 
+	enum BufferMask
+	{
+		VERTEX_BUFFER = 1,
+		INDEX_BUFFER = 2
+	};
+
 	VertexArray vertices;
 	std::vector<Batch> batches;
 	Buffer *vbuf;
 	Buffer *ibuf;
 	VertexSetup vtx_setup;
-	bool defer_buffers;
-	mutable bool dirty;
+	mutable unsigned short dirty;
 	bool disallow_rendering;
 	const WindingTest *winding;
 
@@ -72,7 +80,7 @@ public:
 
 	void clear();
 private:
-	void create_buffers();
+	void check_buffers(unsigned);
 
 public:
 	const VertexArray &get_vertices() const { return vertices; }
@@ -88,13 +96,11 @@ public:
 
 	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;