X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.cpp;h=2b18178b26db4734bcc3e3f673abb32324a10779;hb=9a9d3517dcfdba5206d9c73ce211feac8e402bc2;hp=bf2d9095d77220333ac205a608375450c8ada8c9;hpb=d1800d7ea80290f4913d0203241cef1409656522;p=libs%2Fgl.git

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index bf2d9095..2b18178b 100644
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -1,68 +1,162 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <cstring>
+#include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
+#include "except.h"
 #include "vertexformat.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
-uint get_stride(VertexFormat f)
+VertexFormat::VertexFormat():
+	data(0)
+{ }
+
+VertexFormat::VertexFormat(VertexComponent c):
+	data(new unsigned char[8])
+{
+	data[0] = 1;
+	data[1] = c;
+}
+
+VertexFormat::VertexFormat(const VertexFormat &f):
+	data(0)
+{
+	if(f.data)
+	{
+		data = new unsigned char[(f.data[0]&~7)+8];
+		memcpy(data, f.data, f.data[0]+1);
+	}
+}
+
+VertexFormat &VertexFormat::operator=(const VertexFormat &f)
 {
-	uint stride=0;
-	for(uint fmt=f; fmt; fmt>>=4)
-		stride+=(fmt&3)+1;
-	return stride;
+	delete[] data;
+	if(f.data)
+	{
+		data = new unsigned char[(f.data[0]&~7)+8];
+		memcpy(data, f.data, f.data[0]+1);
+	}
+	else
+		data = 0;
+
+	return *this;
 }
 
-std::istream &operator>>(std::istream &in, VertexFormat &f)
+VertexFormat::~VertexFormat()
 {
-	std::string str;
-	in>>str;
+	delete[] data;
+}
 
-	unsigned start=0;
-	f=NODATA;
+unsigned VertexFormat::stride() const
+{
+	unsigned s = 0;
+	for(const unsigned char *i=begin(); i!=end(); ++i)
+		s += (*i&3)+1;
+	return s;
+}
 
-	while(1)
+VertexFormat operator,(const VertexFormat &f, VertexComponent c)
+{
+	VertexFormat r = f;
+	if(r.data)
 	{
-		unsigned underscore=str.find('_', start);
-		if(!str.compare(start, underscore-start, "VERTEX2"))
-			f=(f,VERTEX2);
-		else if(!str.compare(start, underscore-start, "VERTEX3"))
-			f=(f,VERTEX3);
-		else if(!str.compare(start, underscore-start, "VERTEX4"))
-			f=(f,VERTEX4);
-		else if(!str.compare(start, underscore-start, "NORMAL3"))
-			f=(f,NORMAL3);
-		else if(!str.compare(start, underscore-start, "TEXCOORD1"))
-			f=(f,TEXCOORD1);
-		else if(!str.compare(start, underscore-start, "TEXCOORD2"))
-			f=(f,TEXCOORD2);
-		else if(!str.compare(start, underscore-start, "TEXCOORD3"))
-			f=(f,TEXCOORD3);
-		else if(!str.compare(start, underscore-start, "TEXCOORD4"))
-			f=(f,TEXCOORD4);
-		else if(!str.compare(start, underscore-start, "COLOR4UB"))
-			f=(f,COLOR4_UBYTE);
-		else if(!str.compare(start, underscore-start, "COLOR3F"))
-			f=(f,COLOR3_FLOAT);
-		else if(!str.compare(start, underscore-start, "COLOR4F"))
-			f=(f,COLOR4_FLOAT);
+		const unsigned char n = ++r.data[0];
+		if((n&7)==7)
+		{
+			unsigned char *newdt = new unsigned char[n+9];
+			memcpy(newdt, r.data, n);
+			delete r.data;
+			r.data = newdt;
+		}
+		r.data[n] = c;
+	}
+	else
+	{
+		r.data = new unsigned char[8];
+		r.data[0] = 1;
+		r.data[1] = c;
+	}
+
+	return r;
+}
+
+VertexFormat operator,(const VertexFormat &f, unsigned i)
+{
+	if(!f.data)
+		throw InvalidState("VertexFormat has no components");
+	VertexFormat r = f;
+	unsigned char *c = r.data+r.data[0];
+	if((*c<TEXCOORD1 && i>0) || (*c<ATTRIB1 && i>=8) || i>=53)
+		throw InvalidParameterValue("Vertex component index out of range");
+	*c += i*4;
+
+	return r;
+}
+
+void operator>>(const LexicalConverter &conv, VertexComponent &c)
+{
+	const string &str = conv.get();
+	if(str.size()==7 && !str.compare(0, 6, "VERTEX") && str[6]>='2' && str[6]<='4')
+		c = static_cast<VertexComponent>(VERTEX2+(str[6]-'2'));
+	else if(str=="NORMAL3")
+		c = NORMAL3;
+	else if(str.size()==12 && !str.compare(0, 5, "COLOR") && str[5]>='3' && str[5]<='4' && !str.compare(6, 6, "_FLOAT"))
+		c = static_cast<VertexComponent>(COLOR3_FLOAT+(str[5]-'3'));
+	else if(str=="COLOR4_UBYTE")
+		c = COLOR4_UBYTE;
+	else if(str.size()>=9 && !str.compare(0, 8, "TEXCOORD") && str[8]>='1' && str[8]<='4')
+	{
+		if(str.size()==9)
+			c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1'));
+		else if(str.size()==11 && str[9]=='_' && str[10]>='0' && str[10]<='7')
+			c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1')+(str[10]-'0')*4);
 		else
+			throw LexicalError("Invalid texture unit in VertexComponent conversion");
+	}
+	else if(str.size()>=9 && !str.compare(0, 6, "ATTRIB") && str[6]>='1' && str[6]<='4' && str[7]=='_')
+	{
+		unsigned n;
+		try
+		{
+			n = lexical_cast<unsigned>(str.substr(8));
+		}
+		catch(const LexicalError &)
 		{
-			in.setstate(std::ios_base::failbit);
-			break;
+			throw LexicalError("Invalid attribute in VertexComponent conversion");
 		}
+		c = static_cast<VertexComponent>(ATTRIB1+(str[6]-'1')+n*4);
+	}
+	else
+		throw LexicalError("Invalid input in VertexComponent conversion");
+}
 
-		if(underscore==std::string::npos)
-			break;
-		start=underscore+1;
+// XXX This will go away eventually
+void operator>>(const LexicalConverter &conv, VertexFormat &f)
+{
+	vector<string> parts = split(conv.get(), '_');
+	for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
+	{
+		if(*i=="COLOR4UB")
+			*i = "COLOR4_UBYTE";
+		else if(i->size()==7 && !i->compare(0, 5, "COLOR") && (*i)[6]=='F')
+			*i = i->substr(0, 6)+"_FLOAT";
+		else if(i->size()>=10 && !i->compare(0, 8, "TEXCOORD"))
+			*i = i->substr(0, 9)+"_"+i->substr(9);
+		else if(i->size()>=8 && !i->compare(0, 6, "ATTRIB"))
+			*i = i->substr(0, 7)+"_"+i->substr(7);
 	}
 
-	return in;
+	for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
+		f = (f, lexical_cast<VertexComponent>(*i));
 }
 
 } // namespace GL