X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=d8484d83ca882ebb1c5e0d215aee57a930270dbf;hb=6e42e65cb070ef86ea748423a1c6e0a59a937958;hp=3b67527864a014908b3b2349d3616a455ec39699;hpb=249ce48a66074d0f0b6e23caeb77fad7c3d238ae;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 3b675278..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_
 
@@ -63,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;
-	float        *append();
-	float *modify(unsigned);
-	const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
 
+	void use_vertex_buffer();
+	void use_vertex_buffer(Buffer *);
+
+	void clear();
+	void reserve(unsigned);
+	float *append();
+	float *modify(unsigned);
 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