X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.h;h=60e035f9a6ad429cef54bee4aaa1832d38fb4e08;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=95a6ec2f3aa526ac11165b4f24e77e5d30d67b10;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/vertexarray.h b/source/core/vertexarray.h
index 95a6ec2f..60e035f9 100644
--- a/source/core/vertexarray.h
+++ b/source/core/vertexarray.h
@@ -1,21 +1,15 @@
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
-#include <climits>
 #include <vector>
-#include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
 #include "bufferable.h"
-#include "datatype.h"
-#include "primitivetype.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class Buffer;
-
 /**
 Stores vertex data.
 
@@ -37,16 +31,19 @@ public:
 
 private:
 	VertexFormat format;
-	std::vector<float> data;
-	unsigned stride;
+	std::vector<char> data;
+	unsigned stride = 0;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
 public:
+	VertexArray() = default;
+
+	/// Construct a VertexArray and set its format.
 	VertexArray(const VertexFormat &);
 
-	/// Resets the VertexArray to a different format.  All data is cleared.
-	void reset(const VertexFormat &);
+	/// Sets the format of the VertexArray.
+	void set_format(const VertexFormat &);
 
 	const VertexFormat &get_format() const { return format; }
 
@@ -54,21 +51,21 @@ public:
 	void clear();
 
 	/// Reserve space for vertices.
-	void reserve(unsigned);
+	void reserve(std::size_t n);
 
 	/// Append a new vertex at the end of the array and return its location.
-	float *append();
+	char *append();
 
 	/// Returns the location of a vertex for modification.
-	float *modify(unsigned);
+	char *modify(std::size_t);
 private:
-	virtual unsigned get_data_size() const;
+	virtual std::size_t get_data_size() const;
 	virtual const void *get_data_pointer() const { return &data[0]; }
 
 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; }
+	std::size_t size() const { return data.size()/stride; }
+	const std::vector<char> &get_data() const { return data; }
+	const char *operator[](std::size_t i) const { return &data[0]+i*stride; }
 };
 
 } // namespace GL