X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.cpp;h=2b18178b26db4734bcc3e3f673abb32324a10779;hb=f1cbab0dca940fd5db6d459f9e91661efe3d6052;hp=dc8ff23eeaa2a7b52f194ef72c94a11c705d5f77;hpb=4443707c752ab8ee288f1c22be08cf82f27439d7;p=libs%2Fgl.git

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index dc8ff23e..2b18178b 100644
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include <cstring>
 #include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
 #include "except.h"
 #include "vertexformat.h"
 
@@ -101,76 +102,61 @@ VertexFormat operator,(const VertexFormat &f, unsigned i)
 	return r;
 }
 
-istream &operator>>(istream &in, VertexFormat &f)
+void operator>>(const LexicalConverter &conv, VertexComponent &c)
 {
-	string str;
-	in>>str;
-
-	unsigned start = 0;
-
-	while(1)
+	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]=='_')
 	{
-		string::size_type underscore = str.find('_', start);
-		bool fail = false;
-		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);
-		else if(underscore>=start+8 && !str.compare(start, 6, "ATTRIB"))
+		unsigned n;
+		try
 		{
-			try
-			{
-				char n = str[start+6];
-				unsigned i = lexical_cast<unsigned>(str.substr(start+7, underscore-start-7));
-				if(n=='1')
-					f = (f,ATTRIB1,i);
-				else if(n=='2')
-					f = (f,ATTRIB2,i);
-				else if(n=='3')
-					f = (f,ATTRIB3,i);
-				else if(n=='4')
-					f = (f,ATTRIB4,i);
-				else
-					fail = true;
-			}
-			catch(const LexicalError &)
-			{
-				fail = true;
-			}
+			n = lexical_cast<unsigned>(str.substr(8));
 		}
-		else
-			fail = true;
-
-		if(fail)
+		catch(const LexicalError &)
 		{
-			in.setstate(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==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