From 5a0b3927a33807cca4c77c40eb873f8a3b51b0b0 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 29 Apr 2023 19:07:11 +0100
Subject: Drop .hpp for header only things

Half of them acquired a .cpp part anyway
---
 gfx/models/mesh.cpp   |  4 ++--
 gfx/models/mesh.h     |  2 +-
 gfx/models/vertex.h   | 23 +++++++++++++++++++++++
 gfx/models/vertex.hpp | 23 -----------------------
 4 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 gfx/models/vertex.h
 delete mode 100644 gfx/models/vertex.hpp

(limited to 'gfx/models')

diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp
index 7c5ddd4..a1ce991 100644
--- a/gfx/models/mesh.cpp
+++ b/gfx/models/mesh.cpp
@@ -1,7 +1,7 @@
 #include "mesh.h"
-#include "gfx/gl/vertexArrayObject.hpp"
+#include "gfx/gl/vertexArrayObject.h"
 #include "glArrays.h"
-#include "vertex.hpp"
+#include "vertex.h"
 #include <cstddef>
 
 Mesh::Mesh(const std::span<const Vertex> vertices, const std::span<const unsigned int> indices, GLenum m) :
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index 9b22b02..f022c2a 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -4,7 +4,7 @@
 #include <glArrays.h>
 #include <memory>
 #include <span>
-#include <stdTypeDefs.hpp>
+#include <stdTypeDefs.h>
 
 class Vertex;
 class VertexArrayObject;
diff --git a/gfx/models/vertex.h b/gfx/models/vertex.h
new file mode 100644
index 0000000..181e7e7
--- /dev/null
+++ b/gfx/models/vertex.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <GL/glew.h>
+#include <glm/glm.hpp>
+
+class Vertex {
+public:
+#ifndef __cpp_aggregate_paren_init
+	constexpr Vertex(glm::vec3 pos, glm::vec2 texCoord, glm::vec3 normal, glm::vec4 colour = {}, GLuint material = 0) :
+		pos {std::move(pos)}, texCoord {std::move(texCoord)}, normal {std::move(normal)}, colour {std::move(colour)},
+		material {material}
+	{
+	}
+#endif
+
+	bool operator==(const Vertex &) const = default;
+
+	glm::vec3 pos;
+	glm::vec2 texCoord;
+	glm::vec3 normal;
+	glm::vec4 colour {};
+	GLuint material {};
+};
diff --git a/gfx/models/vertex.hpp b/gfx/models/vertex.hpp
deleted file mode 100644
index 181e7e7..0000000
--- a/gfx/models/vertex.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <GL/glew.h>
-#include <glm/glm.hpp>
-
-class Vertex {
-public:
-#ifndef __cpp_aggregate_paren_init
-	constexpr Vertex(glm::vec3 pos, glm::vec2 texCoord, glm::vec3 normal, glm::vec4 colour = {}, GLuint material = 0) :
-		pos {std::move(pos)}, texCoord {std::move(texCoord)}, normal {std::move(normal)}, colour {std::move(colour)},
-		material {material}
-	{
-	}
-#endif
-
-	bool operator==(const Vertex &) const = default;
-
-	glm::vec3 pos;
-	glm::vec2 texCoord;
-	glm::vec3 normal;
-	glm::vec4 colour {};
-	GLuint material {};
-};
-- 
cgit v1.2.3