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

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 4414a90e..b5628eb1 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -1,42 +1,19 @@
-#include <msp/gl/extensions/arb_vertex_array_object.h>
-#include <msp/gl/extensions/arb_vertex_buffer_object.h>
-#include <msp/gl/extensions/arb_vertex_shader.h>
-#include <msp/gl/extensions/khr_debug.h>
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
 #include "renderer.h"
 #include "resourcemanager.h"
-#include "vertexsetup.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Mesh::Mesh(ResourceManager *rm)
+Mesh::Mesh(const VertexFormat &f)
 {
-	init(rm);
-}
-
-Mesh::Mesh(const VertexFormat &f, ResourceManager *rm)
-{
-	init(rm);
 	storage(f);
 }
 
-void Mesh::init(ResourceManager *rm)
-{
-	vbuf = 0;
-	ibuf = 0;
-	dirty = 0;
-	disallow_rendering = false;
-	face_winding = NON_MANIFOLD;
-
-	if(rm)
-		set_manager(rm);
-}
-
 Mesh::~Mesh()
 {
 	set_manager(0);
@@ -52,6 +29,8 @@ void Mesh::storage(const VertexFormat &fmt)
 
 	vertices.set_format(fmt);
 	vtx_setup.set_format(fmt);
+	if(vbuf)
+		vtx_setup.set_vertex_array(vertices);
 }
 
 void Mesh::clear()
@@ -70,7 +49,8 @@ void Mesh::check_buffers(unsigned mask)
 			delete vbuf;
 			vbuf = new Buffer;
 			vertices.use_buffer(vbuf);
-			vtx_setup.set_vertex_array(vertices);
+			if(!vertices.get_format().empty())
+				vtx_setup.set_vertex_array(vertices);
 			dirty |= VERTEX_BUFFER;
 
 #ifdef DEBUG
@@ -89,7 +69,6 @@ void Mesh::check_buffers(unsigned mask)
 			ibuf = new Buffer;
 			if(!batches.empty())
 				batches.front().change_buffer(ibuf);
-			vtx_setup.set_index_buffer(*ibuf);
 			dirty |= INDEX_BUFFER;
 
 #ifdef DEBUG
@@ -97,15 +76,18 @@ void Mesh::check_buffers(unsigned mask)
 				vbuf->set_debug_name(debug_name+" [IBO]");
 #endif
 		}
+
+		if(!batches.empty())
+			vtx_setup.set_index_buffer(*ibuf, batches.front().get_index_type());
 	}
 }
 
-unsigned Mesh::get_n_vertices() const
+size_t Mesh::get_n_vertices() const
 {
 	return vertices.size();
 }
 
-float *Mesh::modify_vertex(unsigned i)
+char *Mesh::modify_vertex(size_t i)
 {
 	if(vertices.get_format().empty())
 		throw invalid_operation("Mesh::modify_vertex");
@@ -127,7 +109,7 @@ void Mesh::add_batch(const Batch &b)
 		bool reallocate = (batches.size()==batches.capacity());
 		if(reallocate)
 		{
-			for(vector<Batch>::iterator i=batches.end(); i!=batches.begin(); )
+			for(auto i=batches.end(); i!=batches.begin(); )
 				(--i)->use_buffer(0);
 		}
 
@@ -136,16 +118,29 @@ void Mesh::add_batch(const Batch &b)
 		if(reallocate)
 		{
 			prev = 0;
-			for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
+			for(Batch &a: batches)
 			{
-				i->use_buffer(ibuf, prev);
-				prev = &*i;
+				a.use_buffer(ibuf, prev);
+				prev = &a;
 			}
 		}
 		else
 			batches.back().use_buffer(ibuf, prev);
 	}
 
+	DataType existing_type = batches.front().get_index_type();
+	DataType added_type = batches.back().get_index_type();
+	if(existing_type!=added_type)
+	{
+		if(get_type_size(existing_type)>get_type_size(added_type))
+			batches.back().set_index_type(existing_type);
+		else
+		{
+			for(Batch &a: batches)
+				a.set_index_type(added_type);
+		}
+	}
+
 	check_buffers(INDEX_BUFFER);
 }
 
@@ -187,13 +182,13 @@ void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
 
 	if(!count)
 	{
-		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-			renderer.draw(*i);
+		for(const Batch &b: batches)
+			renderer.draw(b);
 	}
 	else
 	{
-		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-			renderer.draw_instanced(*i, count);
+		for(const Batch &b: batches)
+			renderer.draw_instanced(b, count);
 	}
 }
 
@@ -211,9 +206,9 @@ Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
 	return new AsyncLoader(*this, io);
 }
 
-UInt64 Mesh::get_data_size() const
+uint64_t Mesh::get_data_size() const
 {
-	UInt64 size = 0;
+	uint64_t size = 0;
 	if(vbuf)
 		size += vbuf->get_size();
 	if(ibuf)
@@ -248,9 +243,8 @@ void Mesh::set_debug_name(const string &name)
 }
 
 
-Mesh::Loader::Loader(Mesh &m, bool g):
-	DataFile::ObjectLoader<Mesh>(m),
-	allow_gl_calls(g)
+Mesh::Loader::Loader(Mesh &m):
+	DataFile::ObjectLoader<Mesh>(m)
 {
 	add("batch",    &Loader::batch);
 	add("storage",  &Loader::storage);
@@ -259,14 +253,14 @@ Mesh::Loader::Loader(Mesh &m, bool g):
 	add("winding",  &Mesh::face_winding);
 }
 
-void Mesh::Loader::storage(const vector<VertexAttribute> &a)
+void Mesh::Loader::storage(const vector<VertexAttribute> &attrs)
 {
-	if(a.empty())
+	if(attrs.empty())
 		throw invalid_argument("No vertex attributes");
 
 	VertexFormat fmt;
-	for(vector<VertexAttribute>::const_iterator i=a.begin(); i!=a.end(); ++i)
-		fmt = (fmt, *i);
+	for(VertexAttribute a: attrs)
+		fmt = (fmt, a);
 	obj.storage(fmt);
 }
 
@@ -293,10 +287,7 @@ void Mesh::Loader::batch(PrimitiveType p)
 
 Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
 	mesh(m),
-	io(i),
-	vertex_updater(0),
-	index_updater(0),
-	phase(0)
+	io(i)
 {
 	mesh.disallow_rendering = true;
 	mesh.check_buffers(VERTEX_BUFFER|INDEX_BUFFER);
@@ -320,7 +311,8 @@ bool Mesh::AsyncLoader::process()
 	{
 		// TODO use correct filename
 		DataFile::Parser parser(io, "async");
-		Loader loader(mesh, false);
+		Loader loader(mesh);
+		loader.allow_gl_calls = false;
 		loader.load(parser);
 	}
 	else if(phase==1)