Check the flat qualifier from the correct member

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
deleted file mode 100644 (file)
index 3b67527..0000000
--- a/source/vertexarray.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GL_VERTEXARRAY_H_
-#define MSP_GL_VERTEXARRAY_H_
-
-#include <climits>
-#include <vector>
-#include <msp/core/refptr.h>
-#include <msp/datafile/loader.h>
-#include "datatype.h"
-#include "primitivetype.h"
-#include "vertexarraybuilder.h"
-#include "vertexformat.h"
-
-namespace Msp {
-namespace GL {
-
-class Buffer;
-
-class VertexArray
-{
-public:
-       class Loader: public DataFile::Loader, public VertexArrayBuilder
-       {
-       public:
-               Loader(VertexArray &);
-       };
-
-private:
-       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;
-       std::vector<float> data;
-       unsigned stride;
-       RefPtr<Buffer> vbuf;
-       bool defer_vbuf;
-       mutable bool dirty;
-
-       static ArrayMask enabled_arrays;
-
-       VertexArray(const VertexArray &);
-       VertexArray &operator=(const VertexArray &);
-public:
-       VertexArray(const VertexFormat &);
-       ~VertexArray();
-
-       const VertexFormat &get_format() const { return format; }
-       const std::vector<float> &get_data() const { return 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:
-       void set_dirty();
-};
-
-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 *);
-
-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
-
-#endif