X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=ef7f6a24c23482292d38db863c56353159afed9e;hb=b8fef9be469eb16e54068bac7e275ea225efc71c;hp=8e72d9554c7e39078b2ddebed2e94d5f8434fd59;hpb=16f6f15328b3a6eec87b1b5e5822368966d44a38;p=libs%2Fgl.git diff --git a/source/vertexarray.h b/source/vertexarray.h index 8e72d955..ef7f6a24 100644 --- a/source/vertexarray.h +++ b/source/vertexarray.h @@ -40,28 +40,45 @@ private: 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 &get_data() const { return data; } void use_vertex_buffer(); void use_vertex_buffer(VertexBuffer *); void reserve(unsigned); unsigned size() const { return data.size()/stride; } void clear(); - void reset(VertexFormat); + void reset(const VertexFormat &); void apply() const; void update_data(); float *append(); float *operator[](unsigned i) { return &data[0]+i*stride; } const float *operator[](unsigned i) const { return &data[0]+i*stride; } private: - void set_array(unsigned, unsigned, unsigned) const; + void set_array(unsigned, bool, unsigned) const; static unsigned enabled_arrays; }; +void array_element(int); +void draw_arrays(PrimitiveType, int, sizei); +void draw_elements(PrimitiveType, sizei, DataType, const void *); +void draw_range_elements(PrimitiveType, uint, uint, sizei, DataType, const void *); + +inline void draw_elements(PrimitiveType mode, sizei count, const unsigned *indices) +{ draw_elements(mode, count, UNSIGNED_INT, indices); } + +inline void draw_elements(PrimitiveType mode, sizei count, const unsigned short *indices) +{ draw_elements(mode, count, UNSIGNED_SHORT, indices); } + +inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned short *indices) +{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); } + +inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned *indices) +{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); } + } // namespace GL } // namespace Msp