X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fmesh.cpp;h=3aa631eb77e5e266f156d9516e75760ed92f5c28;hb=75172fd735e34082c34b47ae7c194445b53038d9;hp=4b0f5829d73ed552ff9fc8c4998a77b785425379;hpb=57d3e33b47c92d56de4007e23800d9bcdb353463;p=blank.git

diff --git a/src/graphics/mesh.cpp b/src/graphics/mesh.cpp
index 4b0f582..3aa631e 100644
--- a/src/graphics/mesh.cpp
+++ b/src/graphics/mesh.cpp
@@ -1,6 +1,6 @@
 #include "BlockMesh.hpp"
 #include "EntityMesh.hpp"
-#include "OutlineMesh.hpp"
+#include "PrimitiveMesh.hpp"
 #include "SkyBoxMesh.hpp"
 #include "SpriteMesh.hpp"
 
@@ -72,10 +72,29 @@ void BlockMesh::Draw() const noexcept {
 }
 
 
-void OutlineMesh::Update(const Buffer &buf) noexcept {
+void PrimitiveMesh::Buffer::FillRect(
+	float w, float h,
+	const glm::vec4 &color,
+	const glm::vec2 &pivot
+) {
+	Clear();
+	Reserve(4, 6);
+
+	vertices.emplace_back( -pivot.x,  -pivot.y, 0.0f);
+	vertices.emplace_back(w-pivot.x,  -pivot.y, 0.0f);
+	vertices.emplace_back( -pivot.x, h-pivot.y, 0.0f);
+	vertices.emplace_back(w-pivot.x, h-pivot.y, 0.0f);
+
+	colors.resize(4, color);
+
+	indices.assign({ 0, 2, 1, 1, 2, 3 });
+}
+
+
+void PrimitiveMesh::Update(const Buffer &buf) noexcept {
 #ifndef NDEBUG
 	if (buf.colors.size() < buf.vertices.size()) {
-		std::cerr << "OutlineMesh: not enough colors!" << std::endl;
+		std::cerr << "PrimitiveMesh: not enough colors!" << std::endl;
 	}
 #endif
 
@@ -86,12 +105,16 @@ void OutlineMesh::Update(const Buffer &buf) noexcept {
 }
 
 
-void OutlineMesh::Draw() noexcept {
+void PrimitiveMesh::DrawLines() noexcept {
 	glEnable(GL_LINE_SMOOTH);
 	glLineWidth(2.0f);
 	vao.DrawLineElements();
 }
 
+void PrimitiveMesh::DrawTriangles() noexcept {
+	vao.DrawTriangleElements();
+}
+
 
 void SkyBoxMesh::LoadUnitBox() {
 	Buffer buffer;