X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=5f9c60d03919e2fe262d4bf848325eaee30dd6e5;hp=d1cb77f143c7a1ede2e5873fc1a21bb6c331d568;hb=HEAD;hpb=26ff1dd4c645c9b8b5361f5f37c58f071789f026 diff --git a/source/mesh.cpp b/source/mesh.cpp deleted file mode 100644 index d1cb77f1..00000000 --- a/source/mesh.cpp +++ /dev/null @@ -1,333 +0,0 @@ -#include -#include -#include -#include "buffer.h" -#include "error.h" -#include "mesh.h" -#include "renderer.h" -#include "resourcemanager.h" - -using namespace std; - -namespace Msp { -namespace GL { - -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; - vao_id = 0; - defer_buffers = true; - dirty = true; - disallow_rendering = false; - winding = 0; - - if(rm) - set_manager(rm); -} - -Mesh::~Mesh() -{ - delete vbuf; - delete ibuf; - if(vao_id) - glDeleteVertexArrays(1, &vao_id); -} - -void Mesh::clear() -{ - vertices.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) - vbuf = new Buffer(ARRAY_BUFFER); - vertices.use_buffer(vbuf); - - if(!ibuf) - ibuf = new Buffer(ELEMENT_ARRAY_BUFFER); - - if(ARB_vertex_array_object && !vao_id) - glGenVertexArrays(1, &vao_id); -} - -void Mesh::setup_vao() const -{ - Bind bind_vbuf(vbuf, ARRAY_BUFFER); - - 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()); - - dirty = false; -} - -unsigned Mesh::get_n_vertices() const -{ - return vertices.size(); -} - -float *Mesh::modify_vertex(unsigned i) -{ - return vertices.modify(i); -} - -void Mesh::add_batch(const Batch &b) -{ - if(defer_buffers) - create_buffers(); - - if(!batches.empty() && batches.back().can_append(b.get_type())) - batches.back().append(b); - else - { - Batch *prev = (batches.empty() ? 0 : &batches.back()); - batches.push_back(b); - if(ibuf) - batches.back().use_buffer(ibuf, prev); - } -} - -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(); - Bind bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER); - Bind bind_winding(winding); - - for(list::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_element_buffer(ibuf); - renderer.set_winding_test(winding); - - for(list::const_iterator i=batches.begin(); i!=batches.end(); ++i) - renderer.draw(*i); -} - -void Mesh::bind() const -{ - /* 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(); - vertices.apply(false); - } - else if(set_current(this)) - { - glBindVertexArray(vao_id); - vertices.refresh(); - if(dirty) - setup_vao(); - } -} - -void Mesh::unbind() -{ - if(set_current(0)) - glBindVertexArray(0); -} - -Resource::AsyncLoader *Mesh::load(IO::Seekable &io) -{ - return new AsyncLoader(*this, io); -} - -UInt64 Mesh::get_data_size() const -{ - 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; - defer_buffers = (vbuf || ibuf); - vbuf = 0; - ibuf = 0; -} - - -Mesh::Loader::Loader(Mesh &m): - DataFile::ObjectLoader(m) -{ - add("batch", &Loader::batch); - add("vertices", &Loader::vertices); - add("winding", &Loader::winding); -} - -void Mesh::Loader::vertices(const vector &c) -{ - if(c.empty()) - throw invalid_argument("No vertex components"); - - VertexFormat fmt; - for(vector::const_iterator i=c.begin(); i!=c.end(); ++i) - fmt = (fmt, *i); - obj.vertices.reset(fmt); - obj.dirty = true; - load_sub(obj.vertices); -} - -void Mesh::Loader::batch(PrimitiveType p) -{ - Batch btc(p); - load_sub(btc); - obj.add_batch(btc); -} - -void Mesh::Loader::winding(FaceWinding w) -{ - if(w==CLOCKWISE) - obj.winding = &WindingTest::clockwise(); - else if(w==COUNTERCLOCKWISE) - obj.winding = &WindingTest::counterclockwise(); -} - - -Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i): - mesh(m), - io(i), - vertex_updater(0), - index_updater(0), - phase(0) -{ - // Make sure the extension is initialized in the rendering thread. - (bool)NV_primitive_restart; - - mesh.disallow_rendering = true; - if(mesh.defer_buffers) - 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