Avoid some brain damage from Windows headers

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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 9be98160b0bb0d23ef62358d150aa6e670d254d2..7edca1f3dcf74782d8fd5a94c7bfb25cd079c72d 100644 (file)
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -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,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;
 };