X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexformat.h;h=7edca1f3dcf74782d8fd5a94c7bfb25cd079c72d;hp=3e36c18f4e76f2a60cd93e43d29c382f805bb7e5;hb=a9c375e17065bcc429b430bd8211a9ee845159a5;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 3e36c18f..7edca1f3 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -1,65 +1,75 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_VERTEXFORMAT_H_
 #define MSP_GL_VERTEXFORMAT_H_
 
-#include <istream>
+#include <msp/strings/lexicalcast.h>
 
 namespace Msp {
 namespace GL {
 
+/** A single vertex component.  Nvidia drivers have aliasing between the
+fixed-functions and generic vertex attributes, despite the standard not
+allowing it.  We use the same attribute indices here to avoid problems. */
 enum VertexComponent
 {
 	VERTEX2 = 1,
 	VERTEX3,
 	VERTEX4,
-	NORMAL3 = 6,
-	TEXCOORD1 = 8,
-	TEXCOORD2,
-	TEXCOORD3,
-	TEXCOORD4,
+	NORMAL3 = 10,
 	COLOR4_UBYTE = 12,
 	COLOR3_FLOAT = 14,
 	COLOR4_FLOAT,
-	ATTRIB1 = 16,
+	TANGENT3 = 18,
+	BINORMAL3 = 22,
+	TEXCOORD1 = 32,
+	TEXCOORD2,
+	TEXCOORD3,
+	TEXCOORD4,
+	ATTRIB1 = 64,
 	ATTRIB2,
 	ATTRIB3,
 	ATTRIB4
 };
 
-struct VertexFormat
+class VertexFormat
 {
-	unsigned char *data;
+private:
+	enum { MAX_COMPONENTS = 15 };
+
+	unsigned char count;
+	unsigned char components[MAX_COMPONENTS];
 
+public:
 	VertexFormat();
 	VertexFormat(VertexComponent);
-	VertexFormat(const VertexFormat &);
-	VertexFormat &operator=(const VertexFormat &);
-	~VertexFormat();
 
-	bool empty() const { return !data || !data[0]; }
-	const unsigned char *begin() const { return data ? data+1 : 0; }
-	const unsigned char *end() const { return data ? data+1+data[0] : 0; }
+	VertexFormat operator,(VertexComponent c) const;
+	VertexFormat operator,(unsigned i) const;
+
+	bool empty() const { return !count; }
+	const unsigned char *begin() const { return components; }
+	const unsigned char *end() const { return components+count; }
 	unsigned stride() const;
+	int offset(VertexComponent) const;
 };
 
-VertexFormat operator,(const VertexFormat &f, VertexComponent c);
 inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
 { return (VertexFormat(c1), c2); }
 
-VertexFormat operator,(const VertexFormat &f, unsigned i);
 inline VertexFormat operator,(VertexComponent c, unsigned i)
 { return (VertexFormat(c), i); }
 
+VertexComponent make_indexed_component(VertexComponent, unsigned);
+
+inline unsigned get_component_type(unsigned char c)
+{ return c>>2; }
+
+inline unsigned get_component_size(unsigned char c)
+{ return (c&3)+1; }
+
 inline unsigned get_stride(const VertexFormat &f)
 { return f.stride(); }
 
-std::istream &operator>>(std::istream &, VertexFormat &);
+void operator>>(const LexicalConverter &, VertexComponent &);
 
 } // namespace GL
 } // namespace Msp