X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmesh.cpp;h=5f9c60d03919e2fe262d4bf848325eaee30dd6e5;hb=HEAD;hp=2ca040e6feb68e3eb65239a4c05e4eadfd997053;hpb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
deleted file mode 100644
index 2ca040e6..00000000
--- a/source/mesh.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "buffer.h"
-#include "mesh.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Mesh::Mesh():
-	vertices(VERTEX3),
-	ibuf(0)
-{ }
-
-Mesh::Mesh(const VertexFormat &f):
-	vertices(f),
-	ibuf(0)
-{ }
-
-void Mesh::use_vertex_buffer(bool b)
-{
-	if(b)
-	{
-		vertices.use_vertex_buffer();
-		if(!ibuf)
-			ibuf=new Buffer(ELEMENT_ARRAY_BUFFER);
-		update_index_buffer();
-	}
-	else
-	{
-		vertices.use_vertex_buffer(0);
-		delete ibuf;
-		ibuf=0;
-	}
-}
-
-float *Mesh::get_vertex(unsigned i)
-{
-	return vertices[i];
-}
-
-void Mesh::add_batch(const Batch &b)
-{
-	batches.push_back(b);
-	update_index_buffer();
-}
-
-void Mesh::clear()
-{
-	vertices.clear();
-	batches.clear();
-}
-
-void Mesh::draw() const
-{
-	vertices.apply();
-	if(ibuf)
-	{
-		ibuf->bind();
-		unsigned offset=0;
-		for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		{
-			i->draw_with_buffer(offset);
-			offset+=i->size();
-		}
-		ibuf->unbind();
-	}
-	else
-	{
-		for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-			i->draw();
-	}
-}
-
-void Mesh::update_index_buffer()
-{
-	if(!ibuf)
-		return;
-
-	unsigned total=0;
-	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		total+=i->size();
-
-	ibuf->data(total*sizeof(unsigned), 0);
-	unsigned offset=0;
-	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-	{
-		ibuf->sub_data(offset*sizeof(unsigned), i->size()*sizeof(unsigned), &i->get_indices()[0]);
-		offset+=i->size();
-	}
-	ibuf->unbind();
-}
-
-
-Mesh::Loader::Loader(Mesh &m):
-	DataFile::ObjectLoader<Mesh>(m)
-{
-	add("vertices", &Loader::vertices);
-	add("batch",    &Loader::batch);
-}
-
-void Mesh::Loader::vertices(VertexFormat f)
-{
-	obj.vertices.reset(f);
-	load_sub(obj.vertices);
-}
-
-void Mesh::Loader::batch(PrimitiveType p)
-{
-	obj.batches.push_back(Batch(p));
-	load_sub(obj.batches.back());
-}
-
-} // namespace GL
-} // namespace Msp