X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fopengl%2Fmesh-gl.cc;h=42c2af9251e9dac300fe228188abf6206b2a932a;hp=e7cf44dc8b5411271bde5ee777a05749f2be4aa1;hb=4bc86b416f29b4889075ad5c8dfdb1e11454a6c3;hpb=c0078cdf2aa206287888afa767bf75fa0e81ad15

diff --git a/src/opengl/mesh-gl.cc b/src/opengl/mesh-gl.cc
index e7cf44d..42c2af9 100644
--- a/src/opengl/mesh-gl.cc
+++ b/src/opengl/mesh-gl.cc
@@ -27,6 +27,7 @@ MeshGL::MeshGL(const MeshGL &mesh)
 	vbo_normals = 0;
 	vbo_tex_coords = 0;
 	ibo = 0;
+	vao = 0;
 
 	/*
 	 * if we set these to the actual
@@ -65,6 +66,9 @@ MeshGL::~MeshGL()
 
 void MeshGL::draw() const
 {
+	if(!vao)
+		return;
+
 	glBindVertexArray(vao);
 
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);
@@ -81,6 +85,9 @@ void MeshGL::update_vertex_data()
 
 void MeshGL::update_vbo()
 {
+	if(!num_vertices)
+		return;
+
 	/* vao */
 	if(!vao)
 		glGenVertexArrays(1, &vao);
@@ -92,13 +99,12 @@ void MeshGL::update_vbo()
 		glGenBuffers(1, &vbo_vertices);
 	glBindBuffer(GL_ARRAY_BUFFER, vbo_vertices);
 	if(num_vertices != (int)vertices.size())
-		glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(float) * 3,
-		             &vertices, GL_STATIC_DRAW);
+		glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(Vec3),
+		             &vertices[0], GL_STATIC_DRAW);
 	else
-		glBufferSubData(GL_ARRAY_BUFFER, 0, vertices.size() * sizeof(float) * 3,
-		                &vertices);
-	num_vertices = vertices.size();
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
+		glBufferSubData(GL_ARRAY_BUFFER, 0, vertices.size() * sizeof(Vec3),
+		                &vertices[0]);
+	glVertexAttribPointer(MESH_VERTEX, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), 0);
 
 	/* normals */
 
@@ -106,22 +112,23 @@ void MeshGL::update_vbo()
 		glGenBuffers(1, &vbo_normals);
 	glBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
 	if(num_vertices != (int)normals.size())
-		glBufferData(GL_ARRAY_BUFFER, normals.size() * sizeof(float) * 3,
-		             &normals, GL_STATIC_DRAW);
+		glBufferData(GL_ARRAY_BUFFER, normals.size() * sizeof(Vec3),
+		             &normals[0], GL_STATIC_DRAW);
 	else
-		glBufferSubData(GL_ARRAY_BUFFER, 0, normals.size() * sizeof(float) * 3,
-		                &normals);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
+		glBufferSubData(GL_ARRAY_BUFFER, 0, normals.size() * sizeof(Vec3),
+		                &normals[0]);
+	glVertexAttribPointer(MESH_NORMAL, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), 0);
 
 	/* texture coordinates */
 
 	if(!vbo_tex_coords)
 		glGenBuffers(1, &vbo_tex_coords);
+	glBindBuffer(GL_ARRAY_BUFFER, vbo_tex_coords);
 	if(num_vertices != (int)tex_coords.size())
-		glBufferData(GL_ARRAY_BUFFER, tex_coords.size() * sizeof(float) * 2, &tex_coords, GL_STATIC_DRAW);
+		glBufferData(GL_ARRAY_BUFFER, tex_coords.size() * sizeof(Vec2), &tex_coords[0], GL_STATIC_DRAW);
 	else
-		glBufferSubData(GL_ARRAY_BUFFER, 0, tex_coords.size() * sizeof(float) * 2, &tex_coords);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
+		glBufferSubData(GL_ARRAY_BUFFER, 0, tex_coords.size() * sizeof(Vec2), &tex_coords[0]);
+	glVertexAttribPointer(MESH_TEXTURE, 2, GL_FLOAT, GL_FALSE, sizeof(Vec2), 0);
 
 	/* indices */
 
@@ -134,22 +141,17 @@ void MeshGL::update_vbo()
 	else
 		glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, indices.size() * 2,
 		                &indices[0]);
+
 	num_indices = indices.size();
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+	num_vertices = vertices.size();
 
 	glEnableVertexAttribArray(MESH_VERTEX);
 	glEnableVertexAttribArray(MESH_NORMAL);
 	glEnableVertexAttribArray(MESH_TEXTURE);
 
-	glBindBuffer(GL_ARRAY_BUFFER, vbo_vertices);
-	glVertexAttribPointer(MESH_VERTEX, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), 0);
-
-	glBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
-	glVertexAttribPointer(MESH_NORMAL, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), 0);
-
-	glBindBuffer(GL_ARRAY_BUFFER, vbo_tex_coords);
-	glVertexAttribPointer(MESH_TEXTURE, 2, GL_FLOAT, GL_FALSE, sizeof(Vec2), 0);
 
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
 	glBindVertexArray(0);
 }