X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=ef7f6a24c23482292d38db863c56353159afed9e;hb=b8fef9be469eb16e54068bac7e275ea225efc71c;hp=b1b5fdee58baa672a6a45080e9909cc3ab0696b2;hpb=d1800d7ea80290f4913d0203241cef1409656522;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index b1b5fdee..ef7f6a24 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -30,34 +30,55 @@ public:
 		Loader(VertexArray &);
 	};
 
-	VertexArray(VertexFormat);
+private:
+	VertexFormat format;
+	std::vector<float> data;
+	uint         stride;
+	VertexBuffer *vbuf;
+	bool         own_vbuf;
+
+	VertexArray(const VertexArray &);
+	VertexArray &operator=(const VertexArray &);
+public:
+	VertexArray(const VertexFormat &);
 	~VertexArray();
 
-	VertexFormat get_format() const { return format; }
+	const VertexFormat &get_format() const { return format; }
 	const std::vector<float> &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);
-	RefPtr<VertexArrayBuilder> modify();
+	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:
-	VertexFormat format;
-	std::vector<float> data;
-	uint         stride;
-	VertexBuffer *vbuf;
-	bool         own_vbuf;
-
-	VertexArray(const VertexArray &);
-	VertexArray &operator=(const VertexArray &);
-	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