Check for armature mismatches in Animation

[libs/gl.git] / source / vertexformat.h

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 018d21f00e5176a322b8cbe262da5d355b762bb1..7edca1f3dcf74782d8fd5a94c7bfb25cd079c72d 100644 (file)
--- 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,21 +33,21 @@ 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) const;
 };
@@ -65,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