X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=6be5616e95686c97cc003086e80871e2ca4b2a4a;hb=7d6b7b18221e670810bdd0505995b8f1fa012eb4;hp=039dfa8b13ea3ed467dcdf3825b0ddaa64b825cf;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git diff --git a/source/vertexarray.h b/source/vertexarray.h index 039dfa8b..6be5616e 100644 --- a/source/vertexarray.h +++ b/source/vertexarray.h @@ -58,38 +58,21 @@ public: 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; - float *append(); + 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; } + 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