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

diff --git a/source/mesh.h b/source/mesh.h
index 0a4142fe..730b724c 100644
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,56 +1,75 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 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
+/**
+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: public Bindable<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 vertices(const std::vector<VertexComponent> &);
 		void batch(PrimitiveType);
+		void winding(FaceWinding);
 	};
 
 private:
 	VertexArray vertices;
 	std::list<Batch> batches;
+	Buffer *vbuf;
 	Buffer *ibuf;
+	unsigned vao_id;
+	bool defer_buffers;
+	mutable bool dirty;
+	const WindingTest *winding;
 
 public:
 	Mesh();
 	Mesh(const VertexFormat &f);
+	~Mesh();
+
+	void clear();
+	void use_buffers(bool);
+private:
+	void create_buffers();
+	void setup_vao() const;
 
-	void use_vertex_buffer(bool);
+public:
 	const VertexArray &get_vertices() const { return vertices; }
-	float *get_vertex(unsigned);
+	const Buffer *get_index_buffer() const { return ibuf; }
+	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 set_winding(const WindingTest *);
+
 	void draw() const;
-private:
-	void update_index_buffer();
+	void draw(Renderer &) const;
+
+	void bind() const;
+
+	static void unbind();
 };
 
 } // namespace GL