X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvertexformat.h;h=3561292245fc640deb2859629cbf8f39c1776e5b;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=95e9b2c5bc42fd299283201ffa6a8c725697fb57;hpb=40c364b04084d11573a9ff9f7be6f1c4cc521f4b;p=libs%2Fgl.git

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 95e9b2c5..35612922 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -6,9 +6,9 @@
 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. */
+/** A single vertex component.  Symbolic names are provided for commonly used
+attributes.  These are aliased with with generic attributes, so be careful when
+picking your attribute indices. */
 enum VertexComponent
 {
 	VERTEX2 = 1,
@@ -18,6 +18,8 @@ enum VertexComponent
 	COLOR4_UBYTE = 12,
 	COLOR3_FLOAT = 14,
 	COLOR4_FLOAT,
+	TANGENT3 = 18,
+	BINORMAL3 = 22,
 	TEXCOORD1 = 32,
 	TEXCOORD2,
 	TEXCOORD3,
@@ -31,21 +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 operator==(const VertexFormat &) const;
+	bool operator!=(const VertexFormat &other) const { return !(*this==other); }
 
-	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) const;
 };
@@ -68,7 +72,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