Remove alignment where it doesn't belong

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 23d53be0a6c51e187267720713253dbbae2e32b5..7e6d04f5a05aab16c15d6dfb980748f93235cef0 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,89 +1,94 @@
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
+#include <climits>
 #include <vector>
 #include <msp/core/refptr.h>
-#include "types.h"
+#include <msp/datafile/loader.h>
+#include "datatype.h"
+#include "primitivetype.h"
+#include "vertexarraybuilder.h"
+#include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexArray;
-class VertexBuffer;
+class Buffer;
 
-enum VertexFormat
-{
-       NODATA=0,
-       VERTEX2=1,
-       VERTEX3,
-       VERTEX4,
-       NORMAL3=6,
-       TEXCOORD1=8,
-       TEXCOORD2,
-       TEXCOORD3,
-       TEXCOORD4,
-       COLOR4_UBYTE=12,
-       COLOR3_FLOAT=14,
-       COLOR4_FLOAT,
-};
-
-inline VertexFormat operator,(VertexFormat a, VertexFormat b) { return VertexFormat((a<<4)|b); }
-uint get_stride(VertexFormat);
-
-class VertexArrayBuilder
+class VertexArray
 {
 public:
-       std::vector<float> &data;
-
-       VertexArrayBuilder(VertexArray &, std::vector<float> &);
-       void vertex(float x, float y)                     { vertex(x, y, 0, 1); }
-       void vertex(float x, float y, float z)            { vertex(x, y, z, 1); }
-       void vertex(float, float, float, float);
-       void normal(float x, float y, float z)            { nx=x; ny=y; nz=z; }
-       void texcoord(float s)                            { texcoord(s, 0, 0, 1); }
-       void texcoord(float s, float t)                   { texcoord(s, t, 0, 1); }
-       void texcoord(float s, float t, float r)          { texcoord(s, t, r, 1); }
-       void texcoord(float s, float t, float r, float q) { ts=s; tt=t; tr=r; tq=q; }
-       void color(ubyte r, ubyte g, ubyte b)             { color(r, g, b, 255); }
-       void color(ubyte r, ubyte g, ubyte b, ubyte a)    { color(r/255.f, g/255.f, b/255.f, a/255.f); }
-       void color(float r, float g, float b)             { color(r, g, b, 1); }
-       void color(float r, float g, float b, float a)    { cr=r; cg=g; cb=b; ca=a; }
-       ~VertexArrayBuilder();
+       class Loader: public DataFile::Loader, public VertexArrayBuilder
+       {
+       public:
+               Loader(VertexArray &);
+       };
+
 private:
-       VertexArray  &array;
+       struct ArrayMask
+       {
+               enum
+               {
+                       B = (sizeof(unsigned)*CHAR_BIT),
+                       N = (63+B)/B
+               };
+
+               unsigned mask[N];
+
+               ArrayMask();
+
+               void set(unsigned);
+               bool is_set(unsigned) const;
+       };
+
        VertexFormat format;
-       uint         stride;
+       std::vector<float> data;
+       unsigned stride;
+       RefPtr<Buffer> vbuf;
+       bool defer_vbuf;
+       mutable bool dirty;
 
-       float cr, cg, cb, ca;  // Color
-       float ts, tt, tr, tq;  // TexCoord
-       float nx, ny, nz;     // Normal
-};
+       static ArrayMask enabled_arrays;
 
-class VertexArray
-{
+       VertexArray(const VertexArray &);
+       VertexArray &operator=(const VertexArray &);
 public:
-       VertexArray(VertexFormat);
+       VertexArray(const VertexFormat &);
        ~VertexArray();
 
-       VertexFormat get_format() const { return format; }
+       const VertexFormat &get_format() const { return format; }
        const std::vector<float> &get_data() const { return data; }
-       void         use_vertex_buffer();
-       void         use_vertex_buffer(VertexBuffer *);
-       void         clear();
-       RefPtr<VertexArrayBuilder> modify() { return new VertexArrayBuilder(*this, data); }
-       void         apply() const;
-       void         update_data();
+       void use_vertex_buffer();
+       void use_vertex_buffer(Buffer *);
+       void reserve(unsigned);
+       unsigned size() const { return data.size()/stride; }
+       void clear();
+       void reset(const VertexFormat &);
+       void apply() const;
+       float *append();
+       float *modify(unsigned);
+       const float *operator[](unsigned i) const { return &data[0]+i*stride; }
+
 private:
-       VertexFormat format;
-       std::vector<float> data;
-       uint         stride;
-       VertexBuffer *vbuf;
-       bool         own_vbuf;
+       void set_dirty();
+};
 
-       void set_array(unsigned, unsigned, unsigned) const;
+void array_element(int);
+void draw_arrays(PrimitiveType, int, unsigned);
+void draw_elements(PrimitiveType, unsigned, DataType, const void *);
+void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *);
 
-       static unsigned enabled_arrays;
-};
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
+{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
+{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+
+inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices)
+{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
+
+inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
+{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
 
 } // namespace GL
 } // namespace Msp