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

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 371b38b4..07e5e27f 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);
@@ -102,12 +79,12 @@ 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");
@@ -308,10 +285,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);