X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=208126ef26c477ed5adf8ca61f357400ca44ee73;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hp=371b38b4894a96935cbd2c75326e790e38e45ce6;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;p=libs%2Fgl.git

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 371b38b4..208126ef 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -1,40 +1,33 @@
-#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)
+Mesh::Mesh(Mesh &&other):
+	Resource(move(other)),
+	vertices(move(other.vertices)),
+	batches(move(other.batches)),
+	vbuf(other.vbuf),
+	ibuf(other.ibuf),
+	vtx_setup(move(other.vtx_setup)),
+	dirty(other.dirty),
+	disallow_rendering(other.disallow_rendering),
+	face_winding(other.face_winding),
+	debug_name(move(other.debug_name))
 {
-	vbuf = 0;
-	ibuf = 0;
-	dirty = 0;
-	disallow_rendering = false;
-	face_winding = NON_MANIFOLD;
-
-	if(rm)
-		set_manager(rm);
+	other.vbuf = 0;
+	other.ibuf = 0;
 }
 
 Mesh::~Mesh()
@@ -52,6 +45,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 +65,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
@@ -102,23 +98,23 @@ void Mesh::check_buffers(unsigned mask)
 	}
 }
 
-unsigned Mesh::get_n_vertices() const
+size_t Mesh::get_n_vertices() const
 {
 	return vertices.size();
 }
 
-char *Mesh::modify_vertex(unsigned i)
+char *Mesh::modify_vertex(size_t i)
 {
 	if(vertices.get_format().empty())
 		throw invalid_operation("Mesh::modify_vertex");
 	return vertices.modify(i);
 }
 
-void Mesh::add_batch(const Batch &b)
+void Mesh::add_batch(Batch &&b)
 {
 	if(batches.empty())
 	{
-		batches.push_back(b);
+		batches.emplace_back(move(b));
 		if(ibuf)
 			batches.back().use_buffer(ibuf);
 	}
@@ -134,7 +130,7 @@ void Mesh::add_batch(const Batch &b)
 		}
 
 		Batch *prev = &batches.back();
-		batches.push_back(b);
+		batches.emplace_back(move(b));
 		if(reallocate)
 		{
 			prev = 0;
@@ -263,9 +259,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);
@@ -302,16 +297,13 @@ void Mesh::Loader::batch(PrimitiveType p)
 {
 	Batch btc(p);
 	load_sub(btc);
-	obj.add_batch(btc);
+	obj.add_batch(move(btc));
 }
 
 
 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);
@@ -335,7 +327,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)