X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=044e70843d345aa06b960cfdb3697c93a9053584;hb=7e9e15a12fb398798f2719545cc8553354c1e389;hp=e3753f8b867ce1516f66b680d5cc488142430209;hpb=16f6f15328b3a6eec87b1b5e5822368966d44a38;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index e3753f8b..044e7084 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -8,25 +8,25 @@ 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"
 
 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);
 	};
@@ -34,16 +34,21 @@ public:
 private:
 	VertexArray vertices;
 	std::list<Batch> batches;
+	Buffer *ibuf;
 
 public:
 	Mesh();
-	Mesh(VertexFormat f);
+	Mesh(const VertexFormat &f);
 
 	void use_vertex_buffer(bool);
 	const VertexArray &get_vertices() const { return vertices; }
+	float *get_vertex(unsigned);
 	void add_batch(const Batch &b);
 	const std::list<Batch> &get_batches() { return batches; }
+	void clear();
 	void draw() const;
+private:
+	void update_index_buffer();
 };
 
 } // namespace GL