From ed08b673c50b076042d8f0c49501372168142764 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 16 Feb 2018 16:04:32 -0500
Subject: Refactored renderer

Renderer is basically now more C++'y, as it makes more use of classes (a lot of GL types have been wrapped), and the renderer itself is now a class. The monitor mesh is also now indexed.

Tweaked the NTSC artifacting after inadvertently fixing a bug with the way the image was loaded.
---
 src/renderer/mesh.cpp | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 src/renderer/mesh.cpp

(limited to 'src/renderer/mesh.cpp')

diff --git a/src/renderer/mesh.cpp b/src/renderer/mesh.cpp
new file mode 100644
index 0000000..b06b723
--- /dev/null
+++ b/src/renderer/mesh.cpp
@@ -0,0 +1,109 @@
+#include "mesh.h"
+#include <fstream>
+#include <vector>
+#include <map>
+#include <glm/glm.hpp>
+#include "util.h"
+
+Mesh::Mesh(std::string filename)
+{
+  std::ifstream meshfile(filename);
+  if (!meshfile.is_open())
+  {
+    throw std::invalid_argument("Could not open mesh file");
+  }
+
+  std::vector<glm::vec3> tempVertices;
+  std::vector<glm::vec2> tempUvs;
+  std::vector<glm::vec3> tempNormals;
+
+  std::vector<glm::vec3> outVertices;
+  std::vector<glm::vec2> outUvs;
+  std::vector<glm::vec3> outNormals;
+  std::map<element, unsigned short> elementIds;
+  std::vector<unsigned short> indices;
+
+  while (meshfile)
+  {
+    std::string linetype;
+    meshfile >> linetype;
+
+    if (linetype == "v")
+    {
+      glm::vec3 vertex;
+      meshfile >> vertex.x >> vertex.y >> vertex.z;
+
+      tempVertices.push_back(std::move(vertex));
+    } else if (linetype == "vt")
+    {
+      glm::vec2 uv;
+      meshfile >> uv.x >> uv.y;
+
+      tempUvs.push_back(std::move(uv));
+    } else if (linetype == "vn")
+    {
+      glm::vec3 normal;
+      meshfile >> normal.x >> normal.y >> normal.z;
+
+      tempNormals.push_back(std::move(normal));
+    } else if (linetype == "f")
+    {
+      element elements[3];
+
+      meshfile
+        >> elements[0].vertexId >> chlit('/')
+        >> elements[0].uvId >> chlit('/')
+        >> elements[0].normalId
+        >> elements[1].vertexId >> chlit('/')
+        >> elements[1].uvId >> chlit('/')
+        >> elements[1].normalId
+        >> elements[2].vertexId >> chlit('/')
+        >> elements[2].uvId >> chlit('/')
+        >> elements[2].normalId;
+
+      for (size_t i = 0; i < 3; i++)
+      {
+        if (!elementIds.count(elements[i]))
+        {
+          elementIds[elements[i]] = outVertices.size();
+
+          outVertices.push_back(tempVertices[elements[i].vertexId - 1]);
+          outUvs.push_back(tempUvs[elements[i].uvId - 1]);
+          outNormals.push_back(tempNormals[elements[i].normalId - 1]);
+        }
+
+        indices.push_back(elementIds[elements[i]]);
+      }
+    }
+  }
+
+  glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer_.getId());
+  glBufferData(
+    GL_ARRAY_BUFFER,
+    outVertices.size() * sizeof(glm::vec3),
+    outVertices.data(),
+    GL_STATIC_DRAW);
+
+  glBindBuffer(GL_ARRAY_BUFFER, uvBuffer_.getId());
+  glBufferData(
+    GL_ARRAY_BUFFER,
+    outUvs.size() * sizeof(glm::vec2),
+    outUvs.data(),
+    GL_STATIC_DRAW);
+
+  glBindBuffer(GL_ARRAY_BUFFER, normalBuffer_.getId());
+  glBufferData(
+    GL_ARRAY_BUFFER,
+    outNormals.size() * sizeof(glm::vec3),
+    outNormals.data(),
+    GL_STATIC_DRAW);
+
+  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer_.getId());
+  glBufferData(
+    GL_ELEMENT_ARRAY_BUFFER,
+    indices.size() * sizeof(unsigned short),
+    indices.data(),
+    GL_STATIC_DRAW);
+
+  indexCount_ = indices.size();
+}
-- 
cgit 1.4.1