Use interleaved vertex arrays

1 files changed, 12 insertions, 16 deletions

diff --git a/src/model/vertexarray.h b/src/model/vertexarray.h
index 4377f67..2e43f2a 100644
--- a/src/model/vertexarray.h
+++ b/src/model/vertexarray.h
@@ -25,25 +25,23 @@ public:
 	VertexArray(size_t size);
 	~VertexArray();
 
+	/// clear array, set memory to 0
 	void clear();
+	
+	/// print vertex array usage to console
+	void info();
 
 	size_t add_vertex(math::Vector3f const &v, math::Vector3f const &n, float tex_x = 0.0f, float tex_y = 0.0f);
 
-	inline float *vertex() {
-		return vertex_vertex;
-	}
-
-	inline float *normal() {
-		return vertex_normal;
-	}
-
-	inline float *texture() {
-		return vertex_texture;
-	}
-
+	/// true when the array is full
 	inline bool overflow() const {
 		return vertex_overflow;
 	}
+	
+	/// pointer to model vertices, sequential in GL_T2F_N3F_V3F format
+	inline const float *ptr() const {
+		return vertex_data;
+	}
 
 	/// size of the vertex array in number of floats (for a single array)
 	inline size_t size() const {
@@ -60,10 +58,8 @@ public:
 	}
 
 private:
-	/// model vertices
-	float *vertex_vertex;
-	float *vertex_normal;
-	float *vertex_texture;
+	/// model vertices, sequential in GL_T2F_N3F_V3F format
+	float *vertex_data;
 
 	size_t vertex_index;
 	size_t vertex_size;