X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=dba8a9915489aede7906f8a684b9d59e288428b5;hp=a8129d9bdc70ec426519f01289f667b8ba39f58f;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b diff --git a/source/mesh.cpp b/source/mesh.cpp index a8129d9b..dba8a991 100644 --- a/source/mesh.cpp +++ b/source/mesh.cpp @@ -29,8 +29,7 @@ void Mesh::init(ResourceManager *rm) { vbuf = 0; ibuf = 0; - vtx_setup = 0; - defer_buffers = ARB_vertex_buffer_object; + dirty = 0; disallow_rendering = false; winding = 0; @@ -41,7 +40,7 @@ void Mesh::init(ResourceManager *rm) Mesh::~Mesh() { set_manager(0); - delete vtx_setup; + batches.clear(); delete vbuf; delete ibuf; } @@ -52,37 +51,33 @@ void Mesh::clear() batches.clear(); } -void Mesh::use_buffers(bool b) +void Mesh::check_buffers(unsigned mask) { - defer_buffers = false; - if(b) - create_buffers(); - else + if(mask&VERTEX_BUFFER) { - vertices.use_buffer(0); - delete vbuf; - vbuf = 0; - delete ibuf; - ibuf = 0; + unsigned req_size = vertices.get_required_buffer_size(); + if(!vbuf || (vbuf->get_size()>0 && vbuf->get_size()set_vertex_array(vertices); - vtx_setup->set_index_buffer(*ibuf); + unsigned req_size = (batches.empty() ? 0 : batches.front().get_required_buffer_size()); + if(!ibuf || (ibuf->get_size()>0 && ibuf->get_size()::iterator i=batches.end(); i!=batches.begin(); ) (--i)->use_buffer(0); } - Batch *prev = (batches.empty() ? 0 : &batches.back()); + Batch *prev = &batches.back(); batches.push_back(b); - if(ibuf) + if(reallocate) { - if(reallocate) + prev = 0; + for(vector::iterator i=batches.begin(); i!=batches.end(); ++i) { - prev = 0; - for(vector::iterator i=batches.begin(); i!=batches.end(); ++i) - { - i->use_buffer(ibuf, prev); - prev = &*i; - } + i->use_buffer(ibuf, prev); + prev = &*i; } - else - batches.back().use_buffer(ibuf, prev); } + else + batches.back().use_buffer(ibuf, prev); } + + check_buffers(INDEX_BUFFER); } void Mesh::set_winding(const WindingTest *w) @@ -136,42 +133,9 @@ void Mesh::set_winding(const WindingTest *w) winding = w; } -void Mesh::draw() const -{ - const Mesh *cur = current(); - if(cur && cur!=this) - throw invalid_operation("Mesh::draw"); - - if(manager) - { - manager->resource_used(*this); - if(disallow_rendering) - return; - } - - if(!current()) - vertices.apply(); - BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER); - Bind bind_winding(winding); - - for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) - i->draw(); -} - void Mesh::draw(Renderer &renderer) const { - if(manager) - { - manager->resource_used(*this); - if(disallow_rendering) - return; - } - - renderer.set_mesh(this); - renderer.set_winding_test(winding); - - for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) - renderer.draw(*i); + draw(renderer, 0, 0); } void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned count) const @@ -179,6 +143,11 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co if(vs.get_vertex_array()!=&vertices) throw invalid_argument("Mesh::draw_instanced"); + draw(renderer, &vs, count); +} + +void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const +{ if(manager) { manager->resource_used(*this); @@ -186,33 +155,31 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co return; } - renderer.set_vertex_setup(&vs); - renderer.set_winding_test(winding); + if(dirty) + resize_buffers(); - for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) - renderer.draw_instanced(*i, count); -} + renderer.set_vertex_setup(vs ? vs : &vtx_setup); + renderer.set_winding_test(winding); -void Mesh::bind() const -{ - /* If VAOs are not supported, vtx_setup is zero and set_current won't get - called. Thus unbind won't try to call a null function either. */ - if(!vtx_setup) + if(!count) { - unbind(); - vertices.apply(); + for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) + renderer.draw(*i); } - else if(set_current(this)) + else { - vtx_setup->bind(); - vertices.refresh(); + for(vector::const_iterator i=batches.begin(); i!=batches.end(); ++i) + renderer.draw_instanced(*i, count); } } -void Mesh::unbind() +void Mesh::resize_buffers() const { - if(set_current(0)) - VertexSetup::unbind(); + if(dirty&VERTEX_BUFFER) + vbuf->storage(vertices.get_required_buffer_size()); + if(dirty&INDEX_BUFFER) + ibuf->storage(batches.front().get_required_buffer_size()); + dirty = 0; } Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *) @@ -237,14 +204,14 @@ void Mesh::unload() batches.clear(); delete vbuf; delete ibuf; - defer_buffers = (vbuf || ibuf); vbuf = 0; ibuf = 0; } -Mesh::Loader::Loader(Mesh &m): - DataFile::ObjectLoader(m) +Mesh::Loader::Loader(Mesh &m, bool g): + DataFile::ObjectLoader(m), + allow_gl_calls(g) { add("batch", &Loader::batch); add("vertices", &Loader::vertices); @@ -260,10 +227,12 @@ 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); - if(obj.vtx_setup) - // Set it again to force the vertex setup to update - obj.vtx_setup->set_vertex_array(obj.vertices); load_sub(obj.vertices); + if(allow_gl_calls) + { + obj.check_buffers(VERTEX_BUFFER); + obj.vtx_setup.refresh(); + } } void Mesh::Loader::batch(PrimitiveType p) @@ -290,8 +259,7 @@ Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i): phase(0) { mesh.disallow_rendering = true; - if(mesh.defer_buffers) - mesh.create_buffers(); + mesh.check_buffers(VERTEX_BUFFER|INDEX_BUFFER); } Mesh::AsyncLoader::~AsyncLoader() @@ -312,11 +280,13 @@ bool Mesh::AsyncLoader::process() { // TODO use correct filename DataFile::Parser parser(io, "async"); - Loader loader(mesh); + Loader loader(mesh, false); loader.load(parser); } else if(phase==1) { + mesh.resize_buffers(); + mesh.vtx_setup.refresh(); vertex_updater = mesh.vertices.refresh_async(); if(!mesh.batches.empty()) index_updater = mesh.batches.front().refresh_async();