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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index fb47484b..7edca1f3 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -6,20 +6,25 @@
 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,
-	COLOR4_UBYTE = 8,
-	COLOR3_FLOAT = 10,
+	NORMAL3 = 10,
+	COLOR4_UBYTE = 12,
+	COLOR3_FLOAT = 14,
 	COLOR4_FLOAT,
-	TEXCOORD1 = 12,
+	TANGENT3 = 18,
+	BINORMAL3 = 22,
+	TEXCOORD1 = 32,
 	TEXCOORD2,
 	TEXCOORD3,
 	TEXCOORD4,
-	ATTRIB1 = 44,
+	ATTRIB1 = 64,
 	ATTRIB2,
 	ATTRIB3,
 	ATTRIB4
@@ -28,23 +33,23 @@ enum VertexComponent
 class VertexFormat
 {
 private:
-	unsigned char *data;
+	enum { MAX_COMPONENTS = 15 };
+
+	unsigned char count;
+	unsigned char components[MAX_COMPONENTS];
 
 public:
 	VertexFormat();
 	VertexFormat(VertexComponent);
-	VertexFormat(const VertexFormat &);
-	VertexFormat &operator=(const VertexFormat &);
-	~VertexFormat();
 
 	VertexFormat operator,(VertexComponent c) const;
 	VertexFormat operator,(unsigned i) const;
 
-	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; }
+	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, unsigned = 0) const;
+	int offset(VertexComponent) const;
 };
 
 inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
@@ -53,6 +58,8 @@ inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
 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; }
 
@@ -63,7 +70,6 @@ inline unsigned get_stride(const VertexFormat &f)
 { return f.stride(); }
 
 void operator>>(const LexicalConverter &, VertexComponent &);
-void operator>>(const LexicalConverter &, VertexFormat &);
 
 } // namespace GL
 } // namespace Msp