X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=6181d5fb9bc1b9126248d2e786f826a77c7c92bd;hb=8aea0f65f9ab7d603e47cf4479388af246cc8400;hp=190d6f9bce80f7ad74af3b7dc3941f9e69fbfcc2;hpb=635d00bc1a9ba43ef1224681a14d0710a098cf87;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index 190d6f9b..6181d5fb 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
@@ -19,6 +12,11 @@ namespace GL {
 class Buffer;
 class Renderer;
 
+/**
+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
 {
 	friend class MeshBuilder;
@@ -29,7 +27,7 @@ public:
 	public:
 		Loader(Mesh &);
 	private:
-		void vertices(VertexFormat);
+		void vertices(const std::vector<VertexComponent> &);
 		void batch(PrimitiveType);
 		void winding(FaceWinding);
 	};
@@ -37,8 +35,9 @@ public:
 private:
 	VertexArray vertices;
 	std::list<Batch> batches;
+	Buffer *vbuf;
 	Buffer *ibuf;
-	bool defer_ibuf;
+	bool defer_buffers;
 	const WindingTest *winding;
 
 public:
@@ -48,7 +47,10 @@ public:
 
 	void clear();
 	void use_buffers(bool);
+private:
+	void create_buffers();
 
+public:
 	const VertexArray &get_vertices() const { return vertices; }
 	unsigned get_n_vertices() const;
 	float *modify_vertex(unsigned);