X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=07e5e27f928f41911e3ca376850e3fd4ed081c62;hb=16ff00bce699d09cc89e4280a97b097c59e7e475;hp=981a59e8002c46585f498887da1c32f00429b7ce;hpb=f19366d32cc29287a2730cfba90893e407754081;p=libs%2Fgl.git diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp index 981a59e8..07e5e27f 100644 --- a/source/core/mesh.cpp +++ b/source/core/mesh.cpp @@ -9,19 +9,7 @@ using namespace std; namespace Msp { namespace GL { -Mesh::Mesh(ResourceManager *rm): - vbuf(0), - ibuf(0), - dirty(0), - disallow_rendering(false), - face_winding(NON_MANIFOLD) -{ - if(rm) - set_manager(rm); -} - -Mesh::Mesh(const VertexFormat &f, ResourceManager *rm): - Mesh(rm) +Mesh::Mesh(const VertexFormat &f) { storage(f); } @@ -91,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"); @@ -297,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);