X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fmodel.cpp;h=b834298ac6c5354dff984b55fa4bc3b8b245c839;hb=5998b18978bd8e7a0c9deb516474634e1d3521c9;hp=4e000806cff56c2812f9aaa42fc459c642cc29ca;hpb=7c2a8b8285278b8a3077b311d82f05ea0463a96e;p=blank.git

diff --git a/src/model/model.cpp b/src/model/model.cpp
index 4e00080..b834298 100644
--- a/src/model/model.cpp
+++ b/src/model/model.cpp
@@ -1,326 +1,82 @@
 #include "BlockModel.hpp"
-#include "Model.hpp"
+#include "EntityModel.hpp"
 #include "OutlineModel.hpp"
 #include "SpriteModel.hpp"
 
+#include <algorithm>
 #include <iostream>
 
 
 namespace blank {
 
-Model::Model() noexcept
-: va(0)
-, handle{}
-, count(0) {
-	glGenVertexArrays(1, &va);
-	glGenBuffers(ATTRIB_COUNT, handle);
-}
-
-Model::~Model() noexcept {
-	glDeleteBuffers(ATTRIB_COUNT, handle);
-	glDeleteVertexArrays(1, &va);
-}
-
-Model::Model(Model &&other) noexcept
-: va(other.va)
-, count(other.count) {
-	other.va = 0;
-	for (int i = 0; i < ATTRIB_COUNT; ++i) {
-		handle[i] = other.handle[i];
-		other.handle[i] = 0;
-	}
-}
-
-Model &Model::operator =(Model &&other) noexcept {
-	std::swap(va, other.va);
-	for (int i = 0; i < ATTRIB_COUNT; ++i) {
-		std::swap(handle[i], other.handle[i]);
-	}
-	count = other.count;
-	return *this;
-}
-
-void Model::Update(const Buffer &buf) noexcept {
-	glBindVertexArray(va);
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
-	glBufferData(GL_ARRAY_BUFFER, buf.vertices.size() * sizeof(glm::vec3), buf.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
-	);
-
+void EntityModel::Update(const Buffer &buf) noexcept {
 #ifndef NDEBUG
 	if (buf.colors.size() < buf.vertices.size()) {
-		std::cerr << "Model: not enough colors!" << std::endl;
+		std::cerr << "EntityModel: not enough colors!" << std::endl;
 	}
-#endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
-	glBufferData(GL_ARRAY_BUFFER, buf.colors.size() * sizeof(glm::vec3), buf.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
-	);
-
-#ifndef NDEBUG
 	if (buf.normals.size() < buf.vertices.size()) {
-		std::cerr << "Model: not enough normals!" << std::endl;
+		std::cerr << "EntityModel: not enough normals!" << std::endl;
 	}
 #endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_NORMAL]);
-	glBufferData(GL_ARRAY_BUFFER, buf.normals.size() * sizeof(glm::vec3), buf.normals.data(), GL_STATIC_DRAW);
-	glEnableVertexAttribArray(ATTRIB_NORMAL);
-	glVertexAttribPointer(
-		ATTRIB_NORMAL, // 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, buf.indices.size() * sizeof(Index), buf.indices.data(), GL_STATIC_DRAW);
-	count = buf.indices.size();
-}
-
 
-void Model::Draw() const noexcept {
-	glBindVertexArray(va);
-	glDrawElements(
-		GL_TRIANGLES,    // how
-		count,           // count
-		GL_UNSIGNED_INT, // type
-		nullptr          // offset
-	);
+	vao.Bind();
+	vao.PushAttribute(ATTRIB_VERTEX, buf.vertices);
+	vao.PushAttribute(ATTRIB_COLOR, buf.colors);
+	vao.PushAttribute(ATTRIB_NORMAL, buf.normals);
+	vao.PushIndices(ATTRIB_INDEX, buf.indices);
 }
 
 
-BlockModel::BlockModel() noexcept
-: va(0)
-, handle{}
-, count(0) {
-	glGenVertexArrays(1, &va);
-	glGenBuffers(ATTRIB_COUNT, handle);
-}
-
-BlockModel::~BlockModel() noexcept {
-	glDeleteBuffers(ATTRIB_COUNT, handle);
-	glDeleteVertexArrays(1, &va);
+void EntityModel::Draw() const noexcept {
+	vao.DrawTriangleElements();
 }
 
-BlockModel::BlockModel(BlockModel &&other) noexcept
-: va(other.va)
-, count(other.count) {
-	other.va = 0;
-	for (int i = 0; i < ATTRIB_COUNT; ++i) {
-		handle[i] = other.handle[i];
-		other.handle[i] = 0;
-	}
-}
-
-BlockModel &BlockModel::operator =(BlockModel &&other) noexcept {
-	std::swap(va, other.va);
-	for (int i = 0; i < ATTRIB_COUNT; ++i) {
-		std::swap(handle[i], other.handle[i]);
-	}
-	count = other.count;
-	return *this;
-}
 
 void BlockModel::Update(const Buffer &buf) noexcept {
-	glBindVertexArray(va);
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
-	glBufferData(GL_ARRAY_BUFFER, buf.vertices.size() * sizeof(glm::vec3), buf.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 (buf.colors.size() < buf.vertices.size()) {
 		std::cerr << "BlockModel: not enough colors!" << std::endl;
 	}
-#endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
-	glBufferData(GL_ARRAY_BUFFER, buf.colors.size() * sizeof(glm::vec3), buf.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
-	);
-
-#ifndef NDEBUG
 	if (buf.lights.size() < buf.vertices.size()) {
 		std::cerr << "BlockModel: not enough lights!" << std::endl;
 	}
 #endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_LIGHT]);
-	glBufferData(GL_ARRAY_BUFFER, buf.lights.size() * sizeof(float), buf.lights.data(), GL_STATIC_DRAW);
-	glEnableVertexAttribArray(ATTRIB_LIGHT);
-	glVertexAttribPointer(
-		ATTRIB_LIGHT, // location (for shader)
-		1,            // size
-		GL_FLOAT,     // type
-		GL_FALSE,     // normalized
-		0,            // stride
-		nullptr       // offset
-	);
 
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, buf.indices.size() * sizeof(Index), buf.indices.data(), GL_STATIC_DRAW);
-	count = buf.indices.size();
+	vao.Bind();
+	vao.PushAttribute(ATTRIB_VERTEX, buf.vertices);
+	vao.PushAttribute(ATTRIB_COLOR, buf.colors);
+	vao.PushAttribute(ATTRIB_LIGHT, buf.lights);
+	vao.PushIndices(ATTRIB_INDEX, buf.indices);
 }
 
 
 void BlockModel::Draw() const noexcept {
-	glBindVertexArray(va);
-	glDrawElements(
-		GL_TRIANGLES,    // how
-		count,           // count
-		GL_UNSIGNED_INT, // type
-		nullptr          // offset
-	);
-}
-
-OutlineModel::OutlineModel() noexcept
-: vertices()
-, colors()
-, indices()
-, va(0)
-, handle{}
-, dirty(false) {
-	glGenVertexArrays(1, &va);
-	glGenBuffers(ATTRIB_COUNT, handle);
+	vao.DrawTriangleElements();
 }
 
-OutlineModel::~OutlineModel() noexcept {
-	glDeleteBuffers(ATTRIB_COUNT, handle);
-	glDeleteVertexArrays(1, &va);
-}
-
-
-void OutlineModel::Clear() noexcept {
-	vertices.clear();
-	colors.clear();
-	indices.clear();
-	Invalidate();
-}
-
-void OutlineModel::Reserve(int v, int i) {
-	vertices.reserve(v);
-	colors.reserve(v);
-	indices.reserve(i);
-}
-
-
-void OutlineModel::Update() noexcept {
-	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
-	);
 
+void OutlineModel::Update(const Buffer &buf) noexcept {
 #ifndef NDEBUG
-	if (colors.size() < vertices.size()) {
+	if (buf.colors.size() < buf.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);
-	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);
 
-	dirty = false;
+	vao.Bind();
+	vao.PushAttribute(ATTRIB_VERTEX, buf.vertices);
+	vao.PushAttribute(ATTRIB_COLOR, buf.colors);
+	vao.PushIndices(ATTRIB_INDEX, buf.indices);
 }
 
 
 void OutlineModel::Draw() noexcept {
-	glBindVertexArray(va);
-
-	if (dirty) {
-		Update();
-	}
-
 	glEnable(GL_LINE_SMOOTH);
 	glLineWidth(2.0f);
-
-	glDrawElements(
-		GL_LINES,          // how
-		indices.size(),    // count
-		GL_UNSIGNED_SHORT, // type
-		nullptr            // offset
-	);
-}
-
-
-SpriteModel::SpriteModel() noexcept
-: vertices()
-, coords()
-, indices()
-, va(0)
-, handle{}
-, dirty(false) {
-	glGenVertexArrays(1, &va);
-	glGenBuffers(ATTRIB_COUNT, handle);
-}
-
-SpriteModel::~SpriteModel() noexcept {
-	glDeleteBuffers(ATTRIB_COUNT, handle);
-	glDeleteVertexArrays(1, &va);
+	vao.DrawLineElements();
 }
 
 
-void SpriteModel::Clear() noexcept {
-	vertices.clear();
-	coords.clear();
-	indices.clear();
-	Invalidate();
-}
-
-void SpriteModel::Reserve(int v, int i) {
-	vertices.reserve(v);
-	coords.reserve(v);
-	indices.reserve(i);
-}
-
-
-void SpriteModel::LoadRect(
+void SpriteModel::Buffer::LoadRect(
 	float w, float h,
 	const glm::vec2 &pivot,
 	const glm::vec2 &tex_begin,
@@ -340,62 +96,25 @@ void SpriteModel::LoadRect(
 	coords.emplace_back(tex_end.x,   tex_end.y);
 
 	indices.assign({ 0, 2, 1, 1, 2, 3 });
-
-	Invalidate();
 }
 
 
-void SpriteModel::Update() noexcept {
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
-	glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(Position), 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
-	);
-
+void SpriteModel::Update(const Buffer &buf) noexcept {
 #ifndef NDEBUG
-	if (coords.size() < vertices.size()) {
+	if (buf.coords.size() < buf.vertices.size()) {
 		std::cerr << "SpriteModel: not enough coords!" << std::endl;
-		coords.resize(vertices.size(), { 1, 1 });
 	}
 #endif
-	glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_TEXCOORD]);
-	glBufferData(GL_ARRAY_BUFFER, coords.size() * sizeof(TexCoord), coords.data(), GL_STATIC_DRAW);
-	glEnableVertexAttribArray(ATTRIB_TEXCOORD);
-	glVertexAttribPointer(
-		ATTRIB_TEXCOORD, // location (for shader)
-		2,               // 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);
 
-	dirty = false;
+	vao.Bind();
+	vao.PushAttribute(ATTRIB_VERTEX, buf.vertices);
+	vao.PushAttribute(ATTRIB_TEXCOORD, buf.coords);
+	vao.PushIndices(ATTRIB_INDEX, buf.indices);
 }
 
 
 void SpriteModel::Draw() noexcept {
-	glBindVertexArray(va);
-
-	if (dirty) {
-		Update();
-	}
-
-	glDrawElements(
-		GL_TRIANGLES,      // how
-		indices.size(),    // count
-		GL_UNSIGNED_SHORT, // type
-		nullptr            // offset
-	);
+	vao.DrawTriangleElements();
 }
 
 }