X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel.cpp;fp=src%2Fmodel.cpp;h=ab6e72f18d6735866682b9aef236bc7ff9959f55;hb=28fda9f7f55a9e806ade3f49f4e94f0242ec2c3c;hp=0e358c5585c62300d9a7aae3abe0e52da8a18863;hpb=8acc3f990f1a5ee00471f72c150b407164149f2d;p=blank.git

diff --git a/src/model.cpp b/src/model.cpp
index 0e358c5..ab6e72f 100644
--- a/src/model.cpp
+++ b/src/model.cpp
@@ -9,20 +9,27 @@ Model::Model()
 : vertices()
 , colors()
 , normals()
+, indices()
+, va(0)
 , handle{}
 , dirty(false) {
+	glGenVertexArrays(1, &va);
 	glGenBuffers(ATTRIB_COUNT, handle);
 }
 
 Model::~Model() {
 	glDeleteBuffers(ATTRIB_COUNT, handle);
+	glDeleteVertexArrays(1, &va);
 }
 
 Model::Model(Model &&other)
 : vertices(std::move(other.vertices))
 , colors(std::move(other.colors))
 , normals(std::move(other.normals))
+, indices(std::move(other.indices))
+, va(other.va)
 , dirty(other.dirty) {
+	other.va = 0;
 	for (int i = 0; i < ATTRIB_COUNT; ++i) {
 		handle[i] = other.handle[i];
 		other.handle[i] = 0;
@@ -30,10 +37,11 @@ Model::Model(Model &&other)
 }
 
 Model &Model::operator =(Model &&other) {
-	vertices = std::move(other.vertices);
-	colors = std::move(other.colors);
-	normals = std::move(other.normals);
-	indices = std::move(other.indices);
+	std::swap(vertices, other.vertices);
+	std::swap(colors, other.colors);
+	std::swap(normals, other.normals);
+	std::swap(indices, other.indices);
+	std::swap(va, other.va);
 	for (int i = 0; i < ATTRIB_COUNT; ++i) {
 		std::swap(handle[i], other.handle[i]);
 	}
@@ -58,42 +66,17 @@ void Model::Reserve(int v, int i) {
 }
 
 
-void Model::Update() {
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
-	glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(glm::vec3), vertices.data(), GL_STATIC_DRAW);
-
-#ifndef NDEBUG
-	if (colors.size() < vertices.size()) {
-		std::cerr << "Model: not enough colors!" << std::endl;
-		colors.resize(vertices.size(), { 1, 0, 1 });
-	}
-#endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
-	glBufferData(GL_ARRAY_BUFFER, colors.size() * sizeof(glm::vec3), colors.data(), GL_STATIC_DRAW);
-
-#ifndef NDEBUG
-	if (normals.size() < vertices.size()) {
-		std::cerr << "Model: not enough normals!" << std::endl;
-		normals.resize(vertices.size(), { 0, 1, 0 });
-	}
-#endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_NORMAL]);
-	glBufferData(GL_ARRAY_BUFFER, normals.size() * sizeof(glm::vec3), normals.data(), GL_STATIC_DRAW);
-
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(Index), indices.data(), GL_STATIC_DRAW);
-
-	dirty = false;
-}
-
-
-void Model::Draw() {
+void Model::CheckUpdate() {
 	if (dirty) {
+		glBindVertexArray(va);
 		Update();
 	}
+}
 
-	glEnableVertexAttribArray(ATTRIB_VERTEX);
+void Model::Update() {
 	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
+	glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(glm::vec3), vertices.data(), GL_STATIC_DRAW);
+	glEnableVertexAttribArray(ATTRIB_VERTEX);
 	glVertexAttribPointer(
 		ATTRIB_VERTEX, // location (for shader)
 		3,             // size
@@ -103,8 +86,15 @@ void Model::Draw() {
 		nullptr        // offset
 	);
 
-	glEnableVertexAttribArray(ATTRIB_COLOR);
+#ifndef NDEBUG
+	if (colors.size() < vertices.size()) {
+		std::cerr << "Model: not enough colors!" << std::endl;
+		colors.resize(vertices.size(), { 1, 0, 1 });
+	}
+#endif
 	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
+	glBufferData(GL_ARRAY_BUFFER, colors.size() * sizeof(glm::vec3), colors.data(), GL_STATIC_DRAW);
+	glEnableVertexAttribArray(ATTRIB_COLOR);
 	glVertexAttribPointer(
 		ATTRIB_COLOR,  // location (for shader)
 		3,             // size
@@ -114,8 +104,15 @@ void Model::Draw() {
 		nullptr        // offset
 	);
 
-	glEnableVertexAttribArray(ATTRIB_NORMAL);
+#ifndef NDEBUG
+	if (normals.size() < vertices.size()) {
+		std::cerr << "Model: not enough normals!" << std::endl;
+		normals.resize(vertices.size(), { 0, 1, 0 });
+	}
+#endif
 	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_NORMAL]);
+	glBufferData(GL_ARRAY_BUFFER, normals.size() * sizeof(glm::vec3), normals.data(), GL_STATIC_DRAW);
+	glEnableVertexAttribArray(ATTRIB_NORMAL);
 	glVertexAttribPointer(
 		ATTRIB_NORMAL, // location (for shader)
 		3,             // size
@@ -125,6 +122,20 @@ void Model::Draw() {
 		nullptr        // offset
 	);
 
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
+	glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(Index), indices.data(), GL_STATIC_DRAW);
+
+	dirty = false;
+}
+
+
+void Model::Draw() {
+	glBindVertexArray(va);
+
+	if (dirty) {
+		Update();
+	}
+
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
 	glDrawElements(
 		GL_TRIANGLES,      // how
@@ -132,10 +143,6 @@ void Model::Draw() {
 		GL_UNSIGNED_INT, // type
 		nullptr            // offset
 	);
-
-	glDisableVertexAttribArray(ATTRIB_NORMAL);
-	glDisableVertexAttribArray(ATTRIB_COLOR);
-	glDisableVertexAttribArray(ATTRIB_VERTEX);
 }
 
 
@@ -143,13 +150,16 @@ OutlineModel::OutlineModel()
 : vertices()
 , colors()
 , indices()
+, va(0)
 , handle{}
 , dirty(false) {
+	glGenVertexArrays(1, &va);
 	glGenBuffers(ATTRIB_COUNT, handle);
 }
 
 OutlineModel::~OutlineModel() {
 	glDeleteBuffers(ATTRIB_COUNT, handle);
+	glDeleteVertexArrays(1, &va);
 }
 
 
@@ -170,6 +180,15 @@ void OutlineModel::Reserve(int v, int i) {
 void OutlineModel::Update() {
 	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
 	glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(glm::vec3), vertices.data(), GL_STATIC_DRAW);
+	glEnableVertexAttribArray(ATTRIB_VERTEX);
+	glVertexAttribPointer(
+		ATTRIB_VERTEX, // location (for shader)
+		3,             // size
+		GL_FLOAT,      // type
+		GL_FALSE,      // normalized
+		0,             // stride
+		nullptr        // offset
+	);
 
 #ifndef NDEBUG
 	if (colors.size() < vertices.size()) {
@@ -179,6 +198,15 @@ void OutlineModel::Update() {
 #endif
 	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
 	glBufferData(GL_ARRAY_BUFFER, colors.size() * sizeof(glm::vec3), colors.data(), GL_STATIC_DRAW);
+	glEnableVertexAttribArray(ATTRIB_COLOR);
+	glVertexAttribPointer(
+		ATTRIB_COLOR,  // location (for shader)
+		3,             // size
+		GL_FLOAT,      // type
+		GL_FALSE,      // normalized
+		0,             // stride
+		nullptr        // offset
+	);
 
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices.size() * sizeof(Index), indices.data(), GL_STATIC_DRAW);
@@ -188,32 +216,12 @@ void OutlineModel::Update() {
 
 
 void OutlineModel::Draw() {
+	glBindVertexArray(va);
+
 	if (dirty) {
 		Update();
 	}
 
-	glEnableVertexAttribArray(ATTRIB_VERTEX);
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
-	glVertexAttribPointer(
-		ATTRIB_VERTEX, // location (for shader)
-		3,             // size
-		GL_FLOAT,      // type
-		GL_FALSE,      // normalized
-		0,             // stride
-		nullptr        // offset
-	);
-
-	glEnableVertexAttribArray(ATTRIB_COLOR);
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
-	glVertexAttribPointer(
-		ATTRIB_COLOR,  // location (for shader)
-		3,             // size
-		GL_FLOAT,      // type
-		GL_FALSE,      // normalized
-		0,             // stride
-		nullptr        // offset
-	);
-
 	glEnable(GL_LINE_SMOOTH);
 	glLineWidth(2.0f);
 
@@ -224,9 +232,6 @@ void OutlineModel::Draw() {
 		GL_UNSIGNED_SHORT, // type
 		nullptr            // offset
 	);
-
-	glDisableVertexAttribArray(ATTRIB_COLOR);
-	glDisableVertexAttribArray(ATTRIB_VERTEX);
 }
 
 }