-#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)
+Mesh::Mesh(Mesh &&other):
+ Resource(move(other)),
+ vertices(move(other.vertices)),
+ batches(move(other.batches)),
+ vbuf(other.vbuf),
+ ibuf(other.ibuf),
+ vtx_setup(move(other.vtx_setup)),
+ dirty(other.dirty),
+ disallow_rendering(other.disallow_rendering),
+ face_winding(other.face_winding),
+ debug_name(move(other.debug_name))
{
- vbuf = 0;
- ibuf = 0;
- dirty = 0;
- disallow_rendering = false;
- winding = 0;
-
- if(rm)
- set_manager(rm);
+ other.vbuf = 0;
+ other.ibuf = 0;
}
Mesh::~Mesh()
vertices.set_format(fmt);
vtx_setup.set_format(fmt);
+ if(vbuf)
+ vtx_setup.set_vertex_array(vertices);
}
void Mesh::clear()
if(!vbuf || (vbuf->get_size()>0 && vbuf->get_size()<req_size))
{
delete vbuf;
- vbuf = new Buffer(ARRAY_BUFFER);
+ vbuf = new Buffer;
vertices.use_buffer(vbuf);
- vtx_setup.set_vertex_array(vertices);
+ if(!vertices.get_format().empty())
+ vtx_setup.set_vertex_array(vertices);
dirty |= VERTEX_BUFFER;
#ifdef DEBUG
if(!ibuf || (ibuf->get_size()>0 && ibuf->get_size()<req_size))
{
delete ibuf;
- ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+ ibuf = new Buffer;
if(!batches.empty())
batches.front().change_buffer(ibuf);
- vtx_setup.set_index_buffer(*ibuf);
dirty |= INDEX_BUFFER;
#ifdef DEBUG
vbuf->set_debug_name(debug_name+" [IBO]");
#endif
}
+
+ if(!batches.empty())
+ vtx_setup.set_index_buffer(*ibuf, batches.front().get_index_type());
}
}
-unsigned Mesh::get_n_vertices() const
+size_t Mesh::get_n_vertices() const
{
return vertices.size();
}
-float *Mesh::modify_vertex(unsigned i)
+char *Mesh::modify_vertex(size_t i)
{
if(vertices.get_format().empty())
throw invalid_operation("Mesh::modify_vertex");
return vertices.modify(i);
}
-void Mesh::add_batch(const Batch &b)
+void Mesh::add_batch(Batch &&b)
{
if(batches.empty())
{
- batches.push_back(b);
+ batches.emplace_back(move(b));
if(ibuf)
batches.back().use_buffer(ibuf);
}
bool reallocate = (batches.size()==batches.capacity());
if(reallocate)
{
- for(vector<Batch>::iterator i=batches.end(); i!=batches.begin(); )
+ for(auto i=batches.end(); i!=batches.begin(); )
(--i)->use_buffer(0);
}
Batch *prev = &batches.back();
- batches.push_back(b);
+ batches.emplace_back(move(b));
if(reallocate)
{
prev = 0;
- for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
+ for(Batch &a: batches)
{
- i->use_buffer(ibuf, prev);
- prev = &*i;
+ a.use_buffer(ibuf, prev);
+ prev = &a;
}
}
else
batches.back().use_buffer(ibuf, prev);
}
+ DataType existing_type = batches.front().get_index_type();
+ DataType added_type = batches.back().get_index_type();
+ if(existing_type!=added_type)
+ {
+ if(get_type_size(existing_type)>get_type_size(added_type))
+ batches.back().set_index_type(existing_type);
+ else
+ {
+ for(Batch &a: batches)
+ a.set_index_type(added_type);
+ }
+ }
+
check_buffers(INDEX_BUFFER);
}
-void Mesh::set_winding(const WindingTest *w)
+void Mesh::set_winding(FaceWinding w)
{
- winding = w;
+ face_winding = w;
}
void Mesh::draw(Renderer &renderer) const
resize_buffers();
renderer.set_vertex_setup(vs ? vs : &vtx_setup);
- renderer.set_winding_test(winding);
+ renderer.set_front_face(face_winding);
if(!count)
{
- for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
- renderer.draw(*i);
+ for(const Batch &b: batches)
+ renderer.draw(b);
}
else
{
- for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
- renderer.draw_instanced(*i, count);
+ for(const Batch &b: batches)
+ renderer.draw_instanced(b, count);
}
}
void Mesh::resize_buffers() const
{
if(dirty&VERTEX_BUFFER)
- vbuf->storage(vertices.get_required_buffer_size());
+ vbuf->storage(vertices.get_required_buffer_size(), STATIC);
if((dirty&INDEX_BUFFER) && !batches.empty())
- ibuf->storage(batches.front().get_required_buffer_size());
+ ibuf->storage(batches.front().get_required_buffer_size(), STATIC);
dirty = 0;
}
return new AsyncLoader(*this, io);
}
-UInt64 Mesh::get_data_size() const
+uint64_t Mesh::get_data_size() const
{
- UInt64 size = 0;
+ uint64_t size = 0;
if(vbuf)
size += vbuf->get_size();
if(ibuf)
}
-Mesh::Loader::Loader(Mesh &m, bool g):
- DataFile::ObjectLoader<Mesh>(m),
- allow_gl_calls(g)
+Mesh::Loader::Loader(Mesh &m):
+ DataFile::ObjectLoader<Mesh>(m)
{
add("batch", &Loader::batch);
add("storage", &Loader::storage);
add("vertices", &Loader::vertices);
add("vertices", &Loader::vertices_with_format);
- add("winding", &Loader::winding);
+ add("winding", &Mesh::face_winding);
}
-void Mesh::Loader::storage(const vector<VertexAttribute> &a)
+void Mesh::Loader::storage(const vector<VertexAttribute> &attrs)
{
- if(a.empty())
+ if(attrs.empty())
throw invalid_argument("No vertex attributes");
VertexFormat fmt;
- for(vector<VertexAttribute>::const_iterator i=a.begin(); i!=a.end(); ++i)
- fmt = (fmt, *i);
+ for(VertexAttribute a: attrs)
+ fmt = (fmt, a);
obj.storage(fmt);
}
{
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();
+ obj.add_batch(move(btc));
}
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);
{
// TODO use correct filename
DataFile::Parser parser(io, "async");
- Loader loader(mesh, false);
+ Loader loader(mesh);
+ loader.allow_gl_calls = false;
loader.load(parser);
}
else if(phase==1)
projects / libs / gl.git / blobdiff