X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=2a5ce47476a61807cccec7c4566ec5eb3ade322d;hb=6a135773515b020ea3f163a11d06150ae5c0e69f;hp=4af66a39e25555a7432d90439045f3ba3d8abb10;hpb=80aac2618536baaa99b92629be6931363c49c4de;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index 4af66a39..2a5ce474 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -10,6 +10,7 @@ Distributed under the LGPL
 
 #include <msp/datafile/loader.h>
 #include "batch.h"
+#include "meshbuilder.h"
 #include "vertexarray.h"
 
 namespace Msp {
@@ -17,6 +18,8 @@ namespace GL {
 
 class Mesh
 {
+	friend class MeshBuilder;
+
 public:
 	class Loader: public DataFile::Loader
 	{
@@ -29,16 +32,18 @@ public:
 		void batch(PrimitiveType);
 	};
 
+private:
+	VertexArray vertices;
+	std::list<Batch> batches;
+
+public:
 	Mesh();
 	Mesh(VertexFormat f);
-	RefPtr<VertexArrayBuilder> modify_vertices() { return vertices.modify(); }
-	void add_batch(const Batch &b);
+	RefPtr<MeshBuilder> modify();
 	const VertexArray &get_vertices() const { return vertices; }
+	void add_batch(const Batch &b);
 	const std::list<Batch> &get_batches() { return batches; }
 	void draw() const;
-private:
-	VertexArray vertices;
-	std::list<Batch> batches;
 };
 
 } // namespace GL