X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.h;h=1abbefd39746270d6892d83b2fff3f840e22c6de;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=0a4142fea1eebf02f326b9615a4fc5c904ad142b;hpb=76e338af116120d93d082ad247591ec9adad9233;p=libs%2Fgl.git

diff --git a/source/mesh.h b/source/mesh.h
index 0a4142fe..1abbefd3 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,14 +1,14 @@
 /* $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"
 
@@ -16,19 +16,18 @@ 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);
 	};
@@ -37,20 +36,25 @@ private:
 	VertexArray vertices;
 	std::list<Batch> batches;
 	Buffer *ibuf;
+	bool defer_ibuf;
 
 public:
 	Mesh();
 	Mesh(const VertexFormat &f);
+	~Mesh();
+
+	void clear();
+	void use_buffers(bool);
 
-	void use_vertex_buffer(bool);
 	const VertexArray &get_vertices() const { return vertices; }
-	float *get_vertex(unsigned);
+	unsigned get_n_vertices() const;
+	float *modify_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();
+	void draw(Renderer &) const;
 };
 
 } // namespace GL