X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=d8484d83ca882ebb1c5e0d215aee57a930270dbf;hb=b392a49f4079cd3db859f9eaa51f651115a09c1d;hp=7e6d04f5a05aab16c15d6dfb980748f93235cef0;hpb=afd625b06702e7a25e0730601f03955832b64e65;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7e6d04f5..d8484d83 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -56,39 +56,26 @@ public:
 	VertexArray(const VertexFormat &);
 	~VertexArray();
 
+	void reset(const VertexFormat &);
 	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;
+	void reserve(unsigned);
 	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); }
+public:
+	unsigned size() const { return data.size()/stride; }
+	const std::vector<float> &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