X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;h=b5535039b44109a2f31ca8cd9c57105001966b64;hb=f5469600171c951438fb62df6427bf968adda28c;hp=45b022facc1edb8a673c4ea5e6d59485bff2b209;hpb=55f24c84b7270e117615b212665f17d64771cede;p=libs%2Fgl.git diff --git a/source/mesh.cpp b/source/mesh.cpp index 45b022fa..b5535039 100644 --- a/source/mesh.cpp +++ b/source/mesh.cpp @@ -1,41 +1,46 @@ #include +#include #include #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(): - vertices(VERTEX3), - vbuf(0), - ibuf(0), - vao_id(0), - defer_buffers(true), - dirty(0), - winding(0) -{ } - -Mesh::Mesh(const VertexFormat &f): - vertices(f), - vbuf(0), - ibuf(0), - vao_id(0), - defer_buffers(true), - dirty(2), - winding(0) -{ } +Mesh::Mesh(ResourceManager *rm): + vertices(VERTEX3) +{ + init(rm); +} + +Mesh::Mesh(const VertexFormat &f, ResourceManager *rm): + vertices(f) +{ + init(rm); +} + +void Mesh::init(ResourceManager *rm) +{ + vbuf = 0; + ibuf = 0; + disallow_rendering = false; + winding = 0; + + if(rm) + set_manager(rm); +} Mesh::~Mesh() { + set_manager(0); delete vbuf; delete ibuf; - if(vao_id) - glDeleteVertexArrays(1, &vao_id); } void Mesh::clear() @@ -44,24 +49,10 @@ void Mesh::clear() batches.clear(); } -void Mesh::use_buffers(bool b) -{ - defer_buffers = false; - if(b) - create_buffers(); - else - { - vertices.use_buffer(0); - delete vbuf; - vbuf = 0; - delete ibuf; - ibuf = 0; - } -} - void Mesh::create_buffers() { - defer_buffers = false; + if(vbuf && ibuf) + return; if(!vbuf) vbuf = new Buffer(ARRAY_BUFFER); @@ -70,56 +61,8 @@ void Mesh::create_buffers() if(!ibuf) ibuf = new Buffer(ELEMENT_ARRAY_BUFFER); - if(ARB_vertex_array_object && !vao_id) - glGenVertexArrays(1, &vao_id); -} - -void Mesh::refresh() const -{ - if(!vbuf) - return; - - vertices.refresh(); - if(dirty) - { - if(dirty&1) - { - for(list::const_iterator i=batches.begin(); i!=batches.end(); ++i) - i->refresh(); - } - - if(dirty&2) - { - Bind bind_vbuf(vbuf, ARRAY_BUFFER); - - bool bind_here = !current(); - if(bind_here) - glBindVertexArray(vao_id); - - const VertexFormat &fmt = vertices.get_format(); - unsigned stride = get_stride(fmt)*sizeof(float); - float *ptr = 0; - for(const unsigned char *c=fmt.begin(); c!=fmt.end(); ++c) - { - unsigned t = get_component_type(*c); - if(t>=get_component_type(ATTRIB1)) - t -= get_component_type(ATTRIB1); - unsigned sz = get_component_size(*c); - if(*c==COLOR4_UBYTE) - glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride, ptr); - else - glVertexAttribPointer(t, sz, GL_FLOAT, false, stride, ptr); - glEnableVertexAttribArray(t); - ptr += sz; - } - glBindBuffer(ELEMENT_ARRAY_BUFFER, ibuf->get_id()); - - if(bind_here) - glBindVertexArray(0); - } - - dirty = 0; - } + vtx_setup.set_vertex_array(vertices); + vtx_setup.set_index_buffer(*ibuf); } unsigned Mesh::get_n_vertices() const @@ -134,18 +77,35 @@ float *Mesh::modify_vertex(unsigned i) void Mesh::add_batch(const Batch &b) { - if(defer_buffers) - create_buffers(); + create_buffers(); - dirty |= 1; if(!batches.empty() && batches.back().can_append(b.get_type())) batches.back().append(b); else { + bool reallocate = (batches.size()==batches.capacity()); + if(reallocate && ibuf) + { + for(vector::iterator i=batches.end(); i!=batches.begin(); ) + (--i)->use_buffer(0); + } + Batch *prev = (batches.empty() ? 0 : &batches.back()); batches.push_back(b); if(ibuf) - batches.back().use_buffer(ibuf, prev); + { + if(reallocate) + { + prev = 0; + for(vector::iterator i=batches.begin(); i!=batches.end(); ++i) + { + i->use_buffer(ibuf, prev); + prev = &*i; + } + } + else + batches.back().use_buffer(ibuf, prev); + } } } @@ -154,49 +114,67 @@ void Mesh::set_winding(const WindingTest *w) winding = w; } -void Mesh::draw() const +void Mesh::draw(Renderer &renderer) const { - const Mesh *cur = current(); - if(cur && cur!=this) - throw invalid_operation("Mesh::draw"); - - refresh(); + draw(renderer, 0, 0); +} - if(!current()) - vertices.apply(); - Bind bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER); - Bind bind_winding(winding); +void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned count) const +{ + if(vs.get_vertex_array()!=&vertices) + throw invalid_argument("Mesh::draw_instanced"); - for(list::const_iterator i=batches.begin(); i!=batches.end(); ++i) - i->draw(); + draw(renderer, &vs, count); } -void Mesh::draw(Renderer &renderer) const +void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const { - refresh(); + if(manager) + { + manager->resource_used(*this); + if(disallow_rendering) + return; + } - renderer.set_mesh(this); - renderer.set_element_buffer(ibuf); + renderer.set_vertex_setup(vs ? vs : &vtx_setup); renderer.set_winding_test(winding); - for(list::const_iterator i=batches.begin(); i!=batches.end(); ++i) - renderer.draw(*i); + if(!count) + { + for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) + renderer.draw(*i); + } + else + { + for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) + renderer.draw_instanced(*i, count); + } } -void Mesh::bind() const +Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *) { - /* If VAOs are not supported, vao_id is zero and set_current won't get - called. Thus unbind won't try to call a null function either. */ - if(!vao_id) - unbind(); - else if(set_current(this)) - glBindVertexArray(vao_id); + return new AsyncLoader(*this, io); } -void Mesh::unbind() +UInt64 Mesh::get_data_size() const { - if(set_current(0)) - glBindVertexArray(0); + UInt64 size = 0; + if(vbuf) + size += vbuf->get_size(); + if(ibuf) + size += ibuf->get_size(); + return size; +} + +void Mesh::unload() +{ + vertices.clear(); + vertices.use_buffer(0); + batches.clear(); + delete vbuf; + delete ibuf; + vbuf = 0; + ibuf = 0; } @@ -217,7 +195,9 @@ void Mesh::Loader::vertices(const vector &c) for(vector::const_iterator i=c.begin(); i!=c.end(); ++i) fmt = (fmt, *i); obj.vertices.reset(fmt); - obj.dirty |= 2; + if(obj.vbuf) + // Set it again to force the vertex setup to update + obj.vtx_setup.set_vertex_array(obj.vertices); load_sub(obj.vertices); } @@ -236,5 +216,65 @@ void Mesh::Loader::winding(FaceWinding w) obj.winding = &WindingTest::counterclockwise(); } + +Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i): + mesh(m), + io(i), + vertex_updater(0), + index_updater(0), + phase(0) +{ + mesh.disallow_rendering = true; + mesh.create_buffers(); +} + +Mesh::AsyncLoader::~AsyncLoader() +{ + mesh.disallow_rendering = false; + delete vertex_updater; + delete index_updater; +} + +bool Mesh::AsyncLoader::needs_sync() const +{ + return phase%2; +} + +bool Mesh::AsyncLoader::process() +{ + if(phase==0) + { + // TODO use correct filename + DataFile::Parser parser(io, "async"); + Loader loader(mesh); + loader.load(parser); + } + else if(phase==1) + { + vertex_updater = mesh.vertices.refresh_async(); + if(!mesh.batches.empty()) + index_updater = mesh.batches.front().refresh_async(); + } + else if(phase==2) + { + if(vertex_updater) + vertex_updater->upload_data(); + if(index_updater) + index_updater->upload_data(); + } + else if(phase==3) + { + delete vertex_updater; + vertex_updater = 0; + delete index_updater; + index_updater = 0; + } + + ++phase; + if(phase==1 && !mesh.vbuf && !mesh.ibuf) + phase += 3; + return phase>3; +} + } // namespace GL } // namespace Msp