X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=7fcbb8bdba7ba50e84cbb8d674e987adbdbc354f;hb=7e9e15a12fb398798f2719545cc8553354c1e389;hp=f0baf2d4a84fa8896b21c351149d9cd28612ee04;hpb=e92458a4a0e6191bff549a8b316dbbbd7c56e90f;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index f0baf2d4..7fcbb8bd 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -11,20 +11,18 @@ Distributed under the LGPL
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "datatype.h"
 #include "primitivetype.h"
-#include "types.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexBuffer;
+class Buffer;
 
 class VertexArray
 {
-	friend class VertexArrayBuilder;
-
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
 	{
@@ -35,33 +33,52 @@ public:
 private:
 	VertexFormat format;
 	std::vector<float> data;
-	uint         stride;
-	VertexBuffer *vbuf;
-	bool         own_vbuf;
+	unsigned stride;
+	Buffer *vbuf;
+	bool own_vbuf;
 
 	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<float> &get_data() const { return data; }
 	void         use_vertex_buffer();
-	void         use_vertex_buffer(VertexBuffer *);
+	void         use_vertex_buffer(Buffer *);
 	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:
-	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, 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