X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.cpp;h=457cffad2724548cc31577fc0267e2c368ec421b;hb=c6c4fc39952e372eba1f44f2bc504428140f3d0e;hp=5c02f2ab3aec7180f2a40a4a12b225bbe8ae5c38;hpb=f71aee8c20ff85e4857e4dfad0c20ce606ea3717;p=libs%2Fgl.git

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index 5c02f2ab..457cffad 100644
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -1,34 +1,120 @@
 /* $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 "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]/8+8];
+		memcpy(data, f.data, f.data[0]+1);
+	}
+}
+
+VertexFormat &VertexFormat::operator=(const VertexFormat &f)
+{
+	delete[] data;
+	if(f.data)
+	{
+		data=new unsigned char[f.data[0]/8+8];
+		memcpy(data, f.data, f.data[0]+1);
+	}
+	else
+		data=0;
+
+	return *this;
+}
+
+VertexFormat::~VertexFormat()
+{
+	delete[] data;
+}
+
+unsigned VertexFormat::stride() const
+{
+	uint s=0;
+	for(const unsigned char *i=begin(); i!=end(); ++i)
+		s+=(*i&3)+1;
+	return s;
+}
+
+VertexFormat operator,(const VertexFormat &f, VertexComponent c)
+{
+	VertexFormat r=f;
+	if(r.data)
+	{
+		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)
 {
-	uint stride=0;
-	for(uint fmt=f; fmt; fmt>>=4)
-		stride+=(fmt&3)+1;
-	return stride*sizeof(float);
+	if(!f.data)
+		throw InvalidState("VertexFormat has no components");
+	VertexFormat r=f;
+	unsigned char *c=r.data+r.data[0];
+	if(*c<ATTRIB1)
+		throw InvalidState("Last component is not a generic attribute");
+	// VertexArray uses an unsigned to store flags for enabled arrays
+	if(i>=28)
+		throw InvalidParameterValue("Generic attribute index out of range");
+	*c+=i*4;
+
+	return r;
 }
 
-std::istream &operator>>(std::istream &in, VertexFormat &f)
+istream &operator>>(istream &in, VertexFormat &f)
 {
-	std::string str;
+	string str;
 	in>>str;
 
 	unsigned start=0;
-	f=NODATA;
 
 	while(1)
 	{
-		unsigned underscore=str.find('_', start);
+		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"))
@@ -51,13 +137,38 @@ std::istream &operator>>(std::istream &in, VertexFormat &f)
 			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"))
+		{
+			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;
+			}
+		}
 		else
+			fail=true;
+
+		if(fail)
 		{
-			in.setstate(std::ios_base::failbit);
+			in.setstate(ios_base::failbit);
 			break;
 		}
 
-		if(underscore==std::string::npos)
+		if(underscore==string::npos)
 			break;
 		start=underscore+1;
 	}