X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=5f9c60d03919e2fe262d4bf848325eaee30dd6e5;hp=508054a521346ac45e394848fb0c7ec11f0fe799;hb=HEAD;hpb=43c6495ff3d14a85ee5de169a80fdacf13b7147e

diff --git a/source/mesh.cpp b/source/mesh.cpp
deleted file mode 100644
index 508054a5..00000000
--- a/source/mesh.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#include "buffer.h"
-#include "mesh.h"
-#include "nv_primitive_restart.h"
-#include "renderer.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Mesh::Mesh():
-	vertices(VERTEX3),
-	ibuf(0),
-	defer_ibuf(true),
-	winding(0)
-{ }
-
-Mesh::Mesh(const VertexFormat &f):
-	vertices(f),
-	ibuf(0),
-	defer_ibuf(true),
-	winding(0)
-{ }
-
-Mesh::~Mesh()
-{
-	delete ibuf;
-}
-
-void Mesh::clear()
-{
-	vertices.clear();
-	batches.clear();
-}
-
-void Mesh::use_buffers(bool b)
-{
-	if(b)
-	{
-		vertices.use_vertex_buffer();
-		if(!ibuf)
-			ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
-		defer_ibuf = false;
-	}
-	else
-	{
-		vertices.use_vertex_buffer(0);
-		delete ibuf;
-		ibuf = 0;
-		defer_ibuf = 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)
-{
-	bool can_append = false;
-	if(!batches.empty())
-	{
-		PrimitiveType type = b.get_type();
-		can_append = (type==batches.back().get_type() &&
-			type!=LINE_STRIP && type!=LINE_LOOP && type!=POLYGON &&
-			(type!=TRIANGLE_FAN || NV_primitive_restart));
-	}
-
-	if(defer_ibuf)
-	{
-		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
-		defer_ibuf = false;
-	}
-
-	if(can_append)
-		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
-{
-	vertices.apply();
-
-	if(ibuf)
-		ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-	Bind bind_winding(winding);
-
-	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		i->draw();
-
-	if(ibuf)
-		Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-}
-
-void Mesh::draw(Renderer &renderer) const
-{
-	renderer.set_vertex_array(&vertices);
-	renderer.set_element_buffer(ibuf);
-	renderer.set_winding_test(winding);
-
-	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		renderer.draw(*i);
-
-	renderer.set_winding_test(0);
-}
-
-
-Mesh::Loader::Loader(Mesh &m):
-	DataFile::ObjectLoader<Mesh>(m)
-{
-	add("batch",    &Loader::batch);
-	add("vertices", &Loader::vertices);
-	add("winding",  &Loader::winding);
-}
-
-void Mesh::Loader::vertices(const vector<VertexComponent> &c)
-{
-	if(c.empty())
-		throw invalid_argument("No vertex components");
-
-	VertexFormat fmt;
-	for(vector<VertexComponent>::const_iterator i=c.begin(); i!=c.end(); ++i)
-		fmt = (fmt, *i);
-	obj.vertices.reset(fmt);
-	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();
-}
-
-} // namespace GL
-} // namespace Msp