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

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index 232690ed..457cffad 100644
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -10,6 +10,8 @@ Distributed under the LGPL
 #include "except.h"
 #include "vertexformat.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -53,6 +55,14 @@ 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;
@@ -87,31 +97,23 @@ VertexFormat operator,(const VertexFormat &f, unsigned i)
 	if(*c<ATTRIB1)
 		throw InvalidState("Last component is not a generic attribute");
 	// VertexArray uses an unsigned to store flags for enabled arrays
-	if(i<1 || i>28)
+	if(i>=28)
 		throw InvalidParameterValue("Generic attribute index out of range");
-	*c+=(i-1)*4;
+	*c+=i*4;
 
 	return r;
 }
 
-uint get_stride(const VertexFormat &f)
-{
-	uint stride=0;
-	for(const unsigned char *i=f.begin(); i!=f.end(); ++i)
-		stride+=(*i&3)+1;
-	return stride;
-}
-
-std::istream &operator>>(std::istream &in, VertexFormat &f)
+istream &operator>>(istream &in, VertexFormat &f)
 {
-	std::string str;
+	string str;
 	in>>str;
 
 	unsigned start=0;
 
 	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);
@@ -162,11 +164,11 @@ std::istream &operator>>(std::istream &in, VertexFormat &f)
 
 		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;
 	}