X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel.cpp;h=f6a4476ecba2a98c6be7be87f0a70861ab7a1810;hb=b35ce3a6423c554b34b37362c5550bd705e63a1d;hp=032fc150a9e449c12bc68d62c98609280fee09a8;hpb=482114e156e91729f2529ea6bb1fe98dacdee97f;p=blank.git

diff --git a/src/model.cpp b/src/model.cpp
index 032fc15..f6a4476 100644
--- a/src/model.cpp
+++ b/src/model.cpp
@@ -1,5 +1,7 @@
 #include "model.hpp"
 
+#include <iostream>
+
 
 namespace blank {
 
@@ -16,6 +18,28 @@ Model::~Model() {
 	glDeleteBuffers(ATTRIB_COUNT, handle);
 }
 
+Model::Model(Model &&other)
+: vertices(std::move(other.vertices))
+, colors(std::move(other.colors))
+, normals(std::move(other.normals))
+, dirty(other.dirty) {
+	for (int i = 0; i < ATTRIB_COUNT; ++i) {
+		handle[i] = other.handle[i];
+		other.handle[i] = 0;
+	}
+}
+
+Model &Model::operator =(Model &&other) {
+	vertices = std::move(other.vertices);
+	colors = std::move(other.colors);
+	normals = std::move(other.normals);
+	for (int i = 0; i < ATTRIB_COUNT; ++i) {
+		std::swap(handle[i], other.handle[i]);
+	}
+	dirty = other.dirty;
+	return *this;
+}
+
 
 void Model::Clear() {
 	vertices.clear();
@@ -35,9 +59,21 @@ 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);
 
@@ -94,4 +130,86 @@ void Model::Draw() {
 	glDisableVertexAttribArray(ATTRIB_VERTEX);
 }
 
+
+OutlineModel::OutlineModel()
+: vertices()
+, colors()
+, handle{}
+, dirty(false) {
+	glGenBuffers(ATTRIB_COUNT, handle);
+}
+
+OutlineModel::~OutlineModel() {
+	glDeleteBuffers(ATTRIB_COUNT, handle);
+}
+
+
+void OutlineModel::Clear() {
+	vertices.clear();
+	colors.clear();
+	Invalidate();
+}
+
+void OutlineModel::Reserve(int s) {
+	vertices.reserve(s);
+	colors.reserve(s);
+}
+
+
+void OutlineModel::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 << "OutlineModel: 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);
+
+	dirty = false;
+}
+
+
+void OutlineModel::Draw() {
+	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
+	);
+
+	glLineWidth(2.0f);
+
+	glDrawArrays(
+		GL_LINES,       // how
+		0,              // start
+		vertices.size() // len
+	);
+
+	glDisableVertexAttribArray(ATTRIB_COLOR);
+	glDisableVertexAttribArray(ATTRIB_VERTEX);
+}
+
 }