X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmesh.h;h=9ad924f2a246fe00932dc2744531aa94e7b2d3be;hb=083578c2ca0aabfa60e8872e23d53e9101795dff;hp=2a5ce47476a61807cccec7c4566ec5eb3ade322d;hpb=e92458a4a0e6191bff549a8b316dbbbd7c56e90f;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index 2a5ce474..9ad924f2 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,33 +1,32 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  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 "meshbuilder.h"
 #include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
+
 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);
 	};
@@ -35,14 +34,24 @@ public:
 private:
 	VertexArray vertices;
 	std::list<Batch> batches;
+	Buffer *ibuf;
+	bool defer_ibuf;
 
 public:
 	Mesh();
-	Mesh(VertexFormat f);
-	RefPtr<MeshBuilder> modify();
+	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 draw() const;
 };