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

diff --git a/source/mesh.h b/source/mesh.h
index 4af66a39..190d6f9b 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,44 +1,65 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "batch.h"
 #include "vertexarray.h"
+#include "windingtest.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
+class Renderer;
+
 class Mesh
 {
+	friend class MeshBuilder;
+
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::ObjectLoader<Mesh>
 	{
 	public:
 		Loader(Mesh &);
 	private:
-		Mesh &mesh;
-
 		void vertices(VertexFormat);
 		void batch(PrimitiveType);
+		void winding(FaceWinding);
 	};
 
+private:
+	VertexArray vertices;
+	std::list<Batch> batches;
+	Buffer *ibuf;
+	bool defer_ibuf;
+	const WindingTest *winding;
+
+public:
 	Mesh();
-	Mesh(VertexFormat f);
-	RefPtr<VertexArrayBuilder> modify_vertices() { return vertices.modify(); }
-	void add_batch(const Batch &b);
+	Mesh(const VertexFormat &f);
+	~Mesh();
+
+	void clear();
+	void use_buffers(bool);
+
 	const VertexArray &get_vertices() const { return vertices; }
+	unsigned get_n_vertices() const;
+	float *modify_vertex(unsigned);
+
+	void add_batch(const Batch &b);
 	const std::list<Batch> &get_batches() { return batches; }
+
+	void set_winding(const WindingTest *);
+
 	void draw() const;
-private:
-	VertexArray vertices;
-	std::list<Batch> batches;
+	void draw(Renderer &) const;
 };
 
 } // namespace GL