X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=d8484d83ca882ebb1c5e0d215aee57a930270dbf;hb=b392a49f4079cd3db859f9eaa51f651115a09c1d;hp=c7609afe6ae419445e777e032975fdcb61f8a3ad;hpb=4443707c752ab8ee288f1c22be08cf82f27439d7;p=libs%2Fgl.git diff --git a/source/vertexarray.h b/source/vertexarray.h index c7609afe..d8484d83 100644 --- a/source/vertexarray.h +++ b/source/vertexarray.h @@ -1,10 +1,3 @@ -/* $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_ @@ -51,8 +44,11 @@ private: VertexFormat format; std::vector data; unsigned stride; - Buffer *vbuf; - bool own_vbuf; + RefPtr vbuf; + bool defer_vbuf; + mutable bool dirty; + + static ArrayMask enabled_arrays; VertexArray(const VertexArray &); VertexArray &operator=(const VertexArray &); @@ -60,40 +56,26 @@ public: VertexArray(const VertexFormat &); ~VertexArray(); + void reset(const VertexFormat &); const VertexFormat &get_format() const { return format; } - const std::vector &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; - 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: - static ArrayMask enabled_arrays; -}; -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 *); + void use_vertex_buffer(); + void use_vertex_buffer(Buffer *); -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); } + void clear(); + void reserve(unsigned); + float *append(); + float *modify(unsigned); +private: + void set_dirty(); -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); } +public: + unsigned size() const { return data.size()/stride; } + const std::vector &get_data() const { return data; } + const float *operator[](unsigned i) const { return &data[0]+i*stride; } -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); } + void apply() const; +}; } // namespace GL } // namespace Msp