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.

1 files changed, 62 insertions, 0 deletions

@@ -0,0 +1,62 @@
+#ifndef MESH_H_76B72E12
+#define MESH_H_76B72E12
+
+#include <string>
+#include "gl.h"
+#include "wrappers.h"
+
+class Mesh {
+public:
+
+  Mesh(std::string filename);
+
+  Mesh(const Mesh& other) = delete;
+  Mesh& operator=(const Mesh& other) = delete;
+
+  inline GLuint getVertexBufferId() const
+  {
+    return vertexBuffer_.getId();
+  }
+
+  inline GLuint getUvBufferId() const
+  {
+    return uvBuffer_.getId();
+  }
+
+  inline GLuint getNormalBufferId() const
+  {
+    return normalBuffer_.getId();
+  }
+
+  inline GLuint getIndexBufferId() const
+  {
+    return indexBuffer_.getId();
+  }
+
+  inline size_t getIndexCount() const
+  {
+    return indexCount_;
+  }
+
+private:
+
+  struct element {
+    size_t vertexId;
+    size_t uvId;
+    size_t normalId;
+
+    bool operator<(const element& other) const
+    {
+      return std::tie(vertexId, uvId, normalId) <
+        std::tie(other.vertexId, other.uvId, other.normalId);
+    }
+  };
+
+  GLBuffer vertexBuffer_;
+  GLBuffer uvBuffer_;
+  GLBuffer normalBuffer_;
+  GLBuffer indexBuffer_;
+  size_t indexCount_;
+};
+
+#endif /* end of include guard: MESH_H_76B72E12 */