X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.cpp;h=d4b6497fc980bbab71bf9caf794302c26ec04014;hb=7398ee7ebbd8b7e56c721a85cbe721b79758d09a;hp=33481a1cdfc8c613692f36de60e667e8413ed698;hpb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;p=libs%2Fgl.git

diff --git a/source/batch.cpp b/source/batch.cpp
index 33481a1c..d4b6497f 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,54 +1,272 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "batch.h"
-#include "extension.h"
+#include "bindable.h"
+#include "buffer.h"
+#include "error.h"
+#include "ext_draw_range_elements.h"
+#include "nv_primitive_restart.h"
 #include "vertexarray.h"
 
 using namespace std;
 
+namespace {
+
+template<typename T>
+void append(vector<unsigned char> &data, T i)
+{
+	data.insert(data.end(), sizeof(T), 0);
+	*(T *)(&data[data.size()-sizeof(T)]) = i;
+}
+
+template<typename T, typename U>
+U convert(T n)
+{
+	if(!static_cast<T>(~n))
+		return ~0;
+	else
+		return n;
+}
+
+template<typename T, typename U>
+void expand(vector<unsigned char> &data)
+{
+	unsigned count = data.size()/sizeof(T);
+	data.resize(count*sizeof(U));
+	for(unsigned i=count; i--;)
+		*(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
+}
+
+template<typename T, typename U>
+void shrink(vector<unsigned char> &data)
+{
+	unsigned count = data.size()/sizeof(T);
+	for(unsigned i=0; i<count; ++i)
+		*(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
+	data.resize(count*sizeof(U));
+}
+
+}
+
 namespace Msp {
 namespace GL {
 
+unsigned Batch::restart_index = 0;
+
 Batch::Batch(PrimitiveType t):
-	type(t),
+	prim_type(t),
+	data_type(UNSIGNED_BYTE),
 	min_index(0),
-	max_index(0)
-{ }
+	max_index(0),
+	restart(false)
+{
+	/* XXX Should probably provide a fallback to glDrawElements since this class
+	is pretty much required to render anything. */
+	static Require _req(EXT_draw_range_elements);
+}
+
+Batch::~Batch()
+{
+}
+
+void Batch::set_data_type(DataType t)
+{
+	if(t!=UNSIGNED_BYTE && t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
+		throw invalid_argument("Batch::set_data_type");
+	if(t==UNSIGNED_BYTE && max_index>0xFE)
+		throw invalid_operation("Batch::set_data_type");
+	else if(t==UNSIGNED_SHORT && max_index>0xFFFE)
+		throw invalid_operation("Batch::set_data_type");
+
+	if(data_type==UNSIGNED_BYTE && t==UNSIGNED_SHORT)
+		expand<unsigned char, unsigned short>(data);
+	else if(data_type==UNSIGNED_BYTE && t==UNSIGNED_INT)
+		expand<unsigned char, unsigned>(data);
+	else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
+		expand<unsigned short, unsigned>(data);
+	else if(data_type==UNSIGNED_INT && t==UNSIGNED_BYTE)
+		shrink<unsigned, unsigned char>(data);
+	else if(data_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
+		shrink<unsigned, unsigned short>(data);
+	else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_BYTE)
+		shrink<unsigned short, unsigned char>(data);
 
-Batch &Batch::append(uint i)
+	data_type = t;
+	update_offset();
+	dirty = true;
+}
+
+Batch &Batch::append(unsigned i)
 {
-	if(indices.empty())
-		min_index=max_index=i;
+	if(data.empty())
+		min_index = max_index = i;
 	else
 	{
-		min_index=min(min_index, i);
-		max_index=max(max_index, i);
+		min_index = min(min_index, i);
+		max_index = max(max_index, i);
 	}
-	indices.push_back(i);
+
+	if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
+		set_data_type(UNSIGNED_INT);
+	else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
+		set_data_type(UNSIGNED_SHORT);
+
+	if(data_type==UNSIGNED_SHORT)
+		::append<unsigned short>(data, i);
+	else if(data_type==UNSIGNED_INT)
+		::append<unsigned>(data, i);
+	else
+		data.push_back(i);
+	
+	update_offset();
+	dirty = true;
 
 	return *this;
 }
 
-void Batch::append(const vector<uint> &ind)
+void Batch::append(const vector<unsigned> &ind)
 {
-	indices.reserve(indices.size()+ind.size());
-	for(vector<uint>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
-		append(*i);
+	if(ind.empty())
+		return;
+
+	if(data.empty())
+		min_index = max_index = ind.front();
+
+	for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
+	{
+		min_index = min(min_index, *i);
+		max_index = max(max_index, *i);
+	}
+
+	if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
+		set_data_type(UNSIGNED_INT);
+	else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
+		set_data_type(UNSIGNED_SHORT);
+
+	unsigned base = data.size();
+	data.resize(data.size()+ind.size()*get_index_size());
+	if(data_type==UNSIGNED_SHORT)
+	{
+		unsigned short *ptr = reinterpret_cast<unsigned short *>(&data[base]);
+		for(unsigned i=0; i<ind.size(); ++i)
+			ptr[i] = ind[i];
+	}
+	else if(data_type==UNSIGNED_INT)
+	{
+		unsigned *ptr = reinterpret_cast<unsigned *>(&data[base]);
+		for(unsigned i=0; i<ind.size(); ++i)
+			ptr[i] = ind[i];
+	}
+	else
+	{
+		for(unsigned i=0; i<ind.size(); ++i)
+			data[base+i] = ind[i];
+	}
+	dirty = true;
 }
 
-void Batch::draw() const
+void Batch::append(const Batch &other)
+{
+	if(other.prim_type!=prim_type)
+		throw invalid_argument("Batch::append");
+	if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
+		static Require _req(NV_primitive_restart);
+
+	if(other.data.empty())
+		return;
+
+	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
+		;
+	else if(NV_primitive_restart)
+	{
+		restart = true;
+		if(data_type==UNSIGNED_SHORT)
+			::append<unsigned short>(data, 0xFFFF);
+		else if(data_type==UNSIGNED_INT)
+			::append<unsigned>(data, 0xFFFFFFFF);
+		else
+			data.push_back(0xFF);
+	}
+	else if(prim_type==TRIANGLE_STRIP)
+	{
+		append(get_index(size()-1));
+		append(other.get_index(0));
+		if(size()&1)
+			append(other.get_index(0));
+	}
+	else if(prim_type==QUAD_STRIP)
+	{
+		append(get_index(size()-1));
+		append(get_index(size()-1));
+		append(other.get_index(0));
+		append(other.get_index(0));
+	}
+
+	unsigned count = other.size();
+	for(unsigned i=0; i<count; ++i)
+		append(other.get_index(i));
+}
+
+void Batch::upload_data() const
 {
-	draw_range_elements(type, min_index, max_index, indices.size(), &indices[0]);
+	get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
 }
 
-void Batch::draw_with_buffer(unsigned offset) const
+unsigned Batch::get_index_size() const
 {
-	draw_range_elements(type, min_index, max_index, indices.size(), (unsigned *)0+offset);
+	if(data_type==UNSIGNED_SHORT)
+		return sizeof(unsigned short);
+	else if(data_type==UNSIGNED_INT)
+		return sizeof(unsigned);
+	return sizeof(unsigned char);
+}
+
+unsigned Batch::get_index(unsigned i) const
+{
+	if(data_type==UNSIGNED_SHORT)
+		return *(unsigned short *)&data[i*sizeof(unsigned short)];
+	else if(data_type==UNSIGNED_INT)
+		return *(unsigned *)&data[i*sizeof(unsigned )];
+	else
+		return data[i];
+}
+
+void Batch::draw() const
+{
+	if(restart)
+	{
+		unsigned index;
+		if(data_type==UNSIGNED_SHORT)
+			index = 0xFFFF;
+		else if(data_type==UNSIGNED_INT)
+			index = 0xFFFFFFFF;
+		else
+			index = 0xFF;
+
+		if(index!=restart_index)
+		{
+			if(!restart_index)
+				glEnableClientState(GL_PRIMITIVE_RESTART_NV);
+			glPrimitiveRestartIndexNV(index);
+			restart_index = index;
+		}
+	}
+	else if(restart_index && restart_index<max_index)
+	{
+		glDisableClientState(GL_PRIMITIVE_RESTART_NV);
+		restart_index = 0;
+	}
+
+	if(get_buffer())
+	{
+		if(dirty)
+			update_buffer();
+
+		BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
+		Bind bind_ibuf(alias, true);
+
+		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
+	}
+	else
+		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);
 }
 
 
@@ -58,7 +276,7 @@ Batch::Loader::Loader(Batch &b):
 	add("indices", &Loader::indices);
 }
 
-void Batch::Loader::indices(const vector<uint> &ind)
+void Batch::Loader::indices(const vector<unsigned> &ind)
 {
 	obj.append(ind);
 }