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

diff --git a/source/mesh.h b/source/mesh.h
deleted file mode 100644
index 9e086e87..00000000
--- a/source/mesh.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef MSP_GL_MESH_H_
-#define MSP_GL_MESH_H_
-
-#include <msp/datafile/objectloader.h>
-#include "batch.h"
-#include "resource.h"
-#include "vertexarray.h"
-#include "vertexsetup.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 Resource
-{
-	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:
-	class AsyncLoader: public Resource::AsyncLoader
-	{
-	private:
-		Mesh &mesh;
-		IO::Seekable &io;
-		Bufferable::AsyncUpdater *vertex_updater;
-		Bufferable::AsyncUpdater *index_updater;
-		unsigned phase;
-
-	public:
-		AsyncLoader(Mesh &, IO::Seekable &);
-		~AsyncLoader();
-
-		virtual bool needs_sync() const;
-		virtual bool process();
-	};
-
-	VertexArray vertices;
-	std::vector<Batch> batches;
-	Buffer *vbuf;
-	Buffer *ibuf;
-	VertexSetup vtx_setup;
-	bool defer_buffers;
-	mutable bool dirty;
-	bool disallow_rendering;
-	const WindingTest *winding;
-
-public:
-	Mesh(ResourceManager * = 0);
-	Mesh(const VertexFormat &, ResourceManager * = 0);
-private:
-	void init(ResourceManager *);
-public:
-	~Mesh();
-
-	void clear();
-private:
-	void create_buffers();
-
-public:
-	const VertexArray &get_vertices() const { return vertices; }
-	const VertexSetup &get_vertex_setup() const { return vtx_setup; }
-	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::vector<Batch> &get_batches() const { return batches; }
-
-	void set_winding(const WindingTest *);
-
-	void draw(Renderer &) const;
-	void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
-private:
-	void draw(Renderer &, const VertexSetup *, unsigned) const;
-
-public:
-	virtual int get_load_priority() const { return 1; }
-	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-	virtual UInt64 get_data_size() const;
-	virtual void unload();
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif