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

diff --git a/source/mesh.h b/source/mesh.h
deleted file mode 100644
index 730b724c..00000000
--- a/source/mesh.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef MSP_GL_MESH_H_
-#define MSP_GL_MESH_H_
-
-#include <msp/datafile/objectloader.h>
-#include "batch.h"
-#include "vertexarray.h"
-#include "windingtest.h"
-
-namespace Msp {
-namespace GL {
-
-class Buffer;
-class Renderer;
-
-/**
-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::ObjectLoader<Mesh>
-	{
-	public:
-		Loader(Mesh &);
-	private:
-		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;
-
-public:
-	const VertexArray &get_vertices() const { return vertices; }
-	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 set_winding(const WindingTest *);
-
-	void draw() const;
-	void draw(Renderer &) const;
-
-	void bind() const;
-
-	static void unbind();
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif