X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=4414a90e6577910e7881dee65877134e7cd1ba69;hb=fe9836f2d8d7abb0480582c544611a5b248310cc;hp=f63b32933c64245f988004df8fbca9377d62541c;hpb=a5a26e4e2eb2d0b05c3531b667411be657ac74f1;p=libs%2Fgl.git

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index f63b3293..4414a90e 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -14,16 +14,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Mesh::Mesh(ResourceManager *rm):
-	vertices(VERTEX3)
+Mesh::Mesh(ResourceManager *rm)
 {
 	init(rm);
 }
 
-Mesh::Mesh(const VertexFormat &f, ResourceManager *rm):
-	vertices(f)
+Mesh::Mesh(const VertexFormat &f, ResourceManager *rm)
 {
 	init(rm);
+	storage(f);
 }
 
 void Mesh::init(ResourceManager *rm)
@@ -32,7 +31,7 @@ void Mesh::init(ResourceManager *rm)
 	ibuf = 0;
 	dirty = 0;
 	disallow_rendering = false;
-	winding = 0;
+	face_winding = NON_MANIFOLD;
 
 	if(rm)
 		set_manager(rm);
@@ -46,6 +45,15 @@ Mesh::~Mesh()
 	delete ibuf;
 }
 
+void Mesh::storage(const VertexFormat &fmt)
+{
+	if(!vertices.get_format().empty())
+		throw invalid_operation("Mesh::storage");
+
+	vertices.set_format(fmt);
+	vtx_setup.set_format(fmt);
+}
+
 void Mesh::clear()
 {
 	vertices.clear();
@@ -60,7 +68,7 @@ void Mesh::check_buffers(unsigned mask)
 		if(!vbuf || (vbuf->get_size()>0 && vbuf->get_size()<req_size))
 		{
 			delete vbuf;
-			vbuf = new Buffer(ARRAY_BUFFER);
+			vbuf = new Buffer;
 			vertices.use_buffer(vbuf);
 			vtx_setup.set_vertex_array(vertices);
 			dirty |= VERTEX_BUFFER;
@@ -78,7 +86,7 @@ void Mesh::check_buffers(unsigned mask)
 		if(!ibuf || (ibuf->get_size()>0 && ibuf->get_size()<req_size))
 		{
 			delete ibuf;
-			ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+			ibuf = new Buffer;
 			if(!batches.empty())
 				batches.front().change_buffer(ibuf);
 			vtx_setup.set_index_buffer(*ibuf);
@@ -99,6 +107,8 @@ unsigned Mesh::get_n_vertices() const
 
 float *Mesh::modify_vertex(unsigned i)
 {
+	if(vertices.get_format().empty())
+		throw invalid_operation("Mesh::modify_vertex");
 	return vertices.modify(i);
 }
 
@@ -139,9 +149,9 @@ void Mesh::add_batch(const Batch &b)
 	check_buffers(INDEX_BUFFER);
 }
 
-void Mesh::set_winding(const WindingTest *w)
+void Mesh::set_winding(FaceWinding w)
 {
-	winding = w;
+	face_winding = w;
 }
 
 void Mesh::draw(Renderer &renderer) const
@@ -173,7 +183,7 @@ void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
 		resize_buffers();
 
 	renderer.set_vertex_setup(vs ? vs : &vtx_setup);
-	renderer.set_winding_test(winding);
+	renderer.set_front_face(face_winding);
 
 	if(!count)
 	{
@@ -243,11 +253,13 @@ Mesh::Loader::Loader(Mesh &m, bool g):
 	allow_gl_calls(g)
 {
 	add("batch",    &Loader::batch);
+	add("storage",  &Loader::storage);
 	add("vertices", &Loader::vertices);
-	add("winding",  &Loader::winding);
+	add("vertices", &Loader::vertices_with_format);
+	add("winding",  &Mesh::face_winding);
 }
 
-void Mesh::Loader::vertices(const vector<VertexAttribute> &a)
+void Mesh::Loader::storage(const vector<VertexAttribute> &a)
 {
 	if(a.empty())
 		throw invalid_argument("No vertex attributes");
@@ -255,13 +267,20 @@ void Mesh::Loader::vertices(const vector<VertexAttribute> &a)
 	VertexFormat fmt;
 	for(vector<VertexAttribute>::const_iterator i=a.begin(); i!=a.end(); ++i)
 		fmt = (fmt, *i);
-	obj.vertices.reset(fmt);
+	obj.storage(fmt);
+}
+
+void Mesh::Loader::vertices()
+{
 	load_sub(obj.vertices);
 	if(allow_gl_calls)
-	{
 		obj.check_buffers(VERTEX_BUFFER);
-		obj.vtx_setup.refresh();
-	}
+}
+
+void Mesh::Loader::vertices_with_format(const vector<VertexAttribute> &a)
+{
+	storage(a);
+	vertices();
 }
 
 void Mesh::Loader::batch(PrimitiveType p)
@@ -271,14 +290,6 @@ void Mesh::Loader::batch(PrimitiveType p)
 	obj.add_batch(btc);
 }
 
-void Mesh::Loader::winding(FaceWinding w)
-{
-	if(w==CLOCKWISE)
-		obj.winding = &WindingTest::clockwise();
-	else if(w==COUNTERCLOCKWISE)
-		obj.winding = &WindingTest::counterclockwise();
-}
-
 
 Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
 	mesh(m),
@@ -315,7 +326,6 @@ bool Mesh::AsyncLoader::process()
 	else if(phase==1)
 	{
 		mesh.resize_buffers();
-		mesh.vtx_setup.refresh();
 		vertex_updater = mesh.vertices.refresh_async();
 		if(!mesh.batches.empty())
 			index_updater = mesh.batches.front().refresh_async();