X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.h;h=39bf55b22d5129f0725f11a44233f48be28556d9;hb=f19366d32cc29287a2730cfba90893e407754081;hp=c325ade6111c9f4a981f41d80b228db65decb057;hpb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;p=libs%2Fgl.git

diff --git a/source/core/mesh.h b/source/core/mesh.h
index c325ade6..39bf55b2 100644
--- a/source/core/mesh.h
+++ b/source/core/mesh.h
@@ -1,12 +1,14 @@
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
+#include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include "batch.h"
+#include "cullface.h"
 #include "resource.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
-#include "windingtest.h"
 
 namespace Msp {
 namespace GL {
@@ -32,9 +34,10 @@ public:
 	public:
 		Loader(Mesh &, bool = true);
 	private:
-		void vertices(const std::vector<VertexAttribute> &);
+		void storage(const std::vector<VertexAttribute> &);
+		void vertices();
+		void vertices_with_format(const std::vector<VertexAttribute> &);
 		void batch(PrimitiveType);
-		void winding(FaceWinding);
 	};
 
 private:
@@ -68,16 +71,16 @@ private:
 	VertexSetup vtx_setup;
 	mutable unsigned short dirty;
 	bool disallow_rendering;
-	const WindingTest *winding;
+	FaceWinding face_winding;
+	std::string debug_name;
 
 public:
 	Mesh(ResourceManager * = 0);
 	Mesh(const VertexFormat &, ResourceManager * = 0);
-private:
-	void init(ResourceManager *);
-public:
 	~Mesh();
 
+	void storage(const VertexFormat &);
+
 	void clear();
 private:
 	void check_buffers(unsigned);
@@ -87,12 +90,12 @@ public:
 	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);
+	char *modify_vertex(unsigned);
 
 	void add_batch(const Batch &b);
 	const std::vector<Batch> &get_batches() const { return batches; }
 
-	void set_winding(const WindingTest *);
+	void set_winding(FaceWinding);
 
 	void draw(Renderer &) const;
 	void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
@@ -103,8 +106,10 @@ private:
 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 std::uint64_t get_data_size() const;
 	virtual void unload();
+
+	void set_debug_name(const std::string &);
 };
 
 } // namespace GL