diff options
Diffstat (limited to 'gfx')
-rw-r--r-- | gfx/camera_controller.h | 2 | ||||
-rw-r--r-- | gfx/followCameraController.cpp | 2 | ||||
-rw-r--r-- | gfx/gl/bufferedLocation.cpp | 2 | ||||
-rw-r--r-- | gfx/gl/bufferedLocation.h | 2 | ||||
-rw-r--r-- | gfx/gl/camera.cpp | 4 | ||||
-rw-r--r-- | gfx/gl/camera.h | 2 | ||||
-rw-r--r-- | gfx/gl/instanceVertices.h | 2 | ||||
-rw-r--r-- | gfx/gl/program.cpp | 2 | ||||
-rw-r--r-- | gfx/gl/program.h | 4 | ||||
-rw-r--r-- | gfx/gl/sceneProvider.h | 2 | ||||
-rw-r--r-- | gfx/gl/sceneRenderer.cpp | 2 | ||||
-rw-r--r-- | gfx/gl/sceneShader.cpp | 4 | ||||
-rw-r--r-- | gfx/gl/shader.h | 2 | ||||
-rw-r--r-- | gfx/gl/shadowMapper.cpp | 6 | ||||
-rw-r--r-- | gfx/gl/vertexArrayObject.h (renamed from gfx/gl/vertexArrayObject.hpp) | 6 | ||||
-rw-r--r-- | gfx/image.h | 2 | ||||
-rw-r--r-- | gfx/models/mesh.cpp | 4 | ||||
-rw-r--r-- | gfx/models/mesh.h | 2 | ||||
-rw-r--r-- | gfx/models/vertex.h (renamed from gfx/models/vertex.hpp) | 0 | ||||
-rw-r--r-- | gfx/renderable.h | 2 |
20 files changed, 27 insertions, 27 deletions
diff --git a/gfx/camera_controller.h b/gfx/camera_controller.h index fd5c885..83c0d38 100644 --- a/gfx/camera_controller.h +++ b/gfx/camera_controller.h @@ -1,6 +1,6 @@ #pragma once -#include <special_members.hpp> +#include <special_members.h> class Camera; diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp index d15ecda..5b08483 100644 --- a/gfx/followCameraController.cpp +++ b/gfx/followCameraController.cpp @@ -2,7 +2,7 @@ #include "game/vehicles/vehicle.h" #include <gfx/gl/camera.h> #include <glm/glm.hpp> -#include <location.hpp> +#include <location.h> #include <maths.h> #include <memory> #include <tuple> diff --git a/gfx/gl/bufferedLocation.cpp b/gfx/gl/bufferedLocation.cpp index 4484053..7027b4c 100644 --- a/gfx/gl/bufferedLocation.cpp +++ b/gfx/gl/bufferedLocation.cpp @@ -1,5 +1,5 @@ #include "bufferedLocation.h" -#include "location.hpp" +#include "location.h" #include "maths.h" #include <glm/gtx/transform.hpp> diff --git a/gfx/gl/bufferedLocation.h b/gfx/gl/bufferedLocation.h index cf7afed..6d148cd 100644 --- a/gfx/gl/bufferedLocation.h +++ b/gfx/gl/bufferedLocation.h @@ -1,7 +1,7 @@ #pragma once #include "instanceVertices.h" -#include "location.hpp" +#include "location.h" #include <glm/mat4x4.hpp> #include <glm/vec3.hpp> diff --git a/gfx/gl/camera.cpp b/gfx/gl/camera.cpp index 5b7269e..f642423 100644 --- a/gfx/gl/camera.cpp +++ b/gfx/gl/camera.cpp @@ -1,9 +1,9 @@ #include "camera.h" -#include <collections.hpp> +#include <collections.h> #include <glm/gtx/intersect.hpp> // IWYU pragma: keep #include <glm/gtx/transform.hpp> // IWYU pragma: keep #include <maths.h> -#include <ray.hpp> +#include <ray.h> Camera::Camera(glm::vec3 pos, float fov, float aspect, float zNear, float zFar) : position {pos}, forward {::north}, up {::up}, near {zNear}, far {zFar}, projection {glm::perspective( diff --git a/gfx/gl/camera.h b/gfx/gl/camera.h index 5c168e7..3f1c3a7 100644 --- a/gfx/gl/camera.h +++ b/gfx/gl/camera.h @@ -2,7 +2,7 @@ #include <glm/glm.hpp> #include <maths.h> -#include <ray.hpp> +#include <ray.h> class Camera { public: diff --git a/gfx/gl/instanceVertices.h b/gfx/gl/instanceVertices.h index 8bb2f21..9df6e12 100644 --- a/gfx/gl/instanceVertices.h +++ b/gfx/gl/instanceVertices.h @@ -4,7 +4,7 @@ #include <cassert> #include <iterator> #include <span> -#include <special_members.hpp> +#include <special_members.h> #include <utility> #include <vector> diff --git a/gfx/gl/program.cpp b/gfx/gl/program.cpp index 7791e3e..0b60eaa 100644 --- a/gfx/gl/program.cpp +++ b/gfx/gl/program.cpp @@ -2,7 +2,7 @@ #include "shader.h" #include <glm/gtc/type_ptr.hpp> #include <glm/gtx/transform.hpp> -#include <location.hpp> +#include <location.h> #include <maths.h> void diff --git a/gfx/gl/program.h b/gfx/gl/program.h index 787a53c..2708ff0 100644 --- a/gfx/gl/program.h +++ b/gfx/gl/program.h @@ -2,9 +2,9 @@ #include "shader.h" #include <GL/glew.h> -#include <glRef.hpp> +#include <glRef.h> #include <glm/mat4x4.hpp> -#include <special_members.hpp> +#include <special_members.h> class Location; diff --git a/gfx/gl/sceneProvider.h b/gfx/gl/sceneProvider.h index 1d9ba57..f5e8e99 100644 --- a/gfx/gl/sceneProvider.h +++ b/gfx/gl/sceneProvider.h @@ -1,6 +1,6 @@ #pragma once -#include <special_members.hpp> +#include <special_members.h> class SceneRenderer; class ShadowMapper; diff --git a/gfx/gl/sceneRenderer.cpp b/gfx/gl/sceneRenderer.cpp index 6542bea..aa9453a 100644 --- a/gfx/gl/sceneRenderer.cpp +++ b/gfx/gl/sceneRenderer.cpp @@ -1,6 +1,6 @@ #include "sceneRenderer.h" #include "maths.h" -#include "vertexArrayObject.hpp" +#include "vertexArrayObject.h" #include <gfx/gl/shaders/fs-directionalLight.h> #include <gfx/gl/shaders/fs-lighting.h> #include <gfx/gl/shaders/vs-lighting.h> diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp index 00d9826..1354611 100644 --- a/gfx/gl/sceneShader.cpp +++ b/gfx/gl/sceneShader.cpp @@ -13,10 +13,10 @@ #include <gfx/gl/shaders/vs-pointLight.h> #include <gfx/gl/shaders/vs-spotLight.h> #include <gfx/gl/shaders/vs-water.h> -#include <gfx/gl/vertexArrayObject.hpp> +#include <gfx/gl/vertexArrayObject.h> #include <glm/gtc/type_ptr.hpp> #include <glm/gtx/transform.hpp> -#include <location.hpp> +#include <location.h> #include <maths.h> SceneShader::SceneShader() : diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h index c1e3981..cb8065b 100644 --- a/gfx/gl/shader.h +++ b/gfx/gl/shader.h @@ -1,7 +1,7 @@ #pragma once #include <GL/glew.h> -#include <glRef.hpp> +#include <glRef.h> #include <optional> #include <string_view> diff --git a/gfx/gl/shadowMapper.cpp b/gfx/gl/shadowMapper.cpp index 9f1e420..55d986c 100644 --- a/gfx/gl/shadowMapper.cpp +++ b/gfx/gl/shadowMapper.cpp @@ -1,14 +1,14 @@ #include "shadowMapper.h" #include "camera.h" -#include "collections.hpp" +#include "collections.h" #include "gfx/gl/shaders/vs-shadowDynamicPoint.h" #include "gfx/gl/shaders/vs-shadowDynamicPointInst.h" #include "gfx/gl/shaders/vs-shadowFixedPoint.h" -#include "location.hpp" +#include "location.h" #include "maths.h" #include "sceneProvider.h" #include "sceneShader.h" -#include "sorting.hpp" +#include "sorting.h" #include <glm/gtc/type_ptr.hpp> #include <glm/gtx/transform.hpp> #include <glm/matrix.hpp> diff --git a/gfx/gl/vertexArrayObject.hpp b/gfx/gl/vertexArrayObject.h index 7ded03e..085cba6 100644 --- a/gfx/gl/vertexArrayObject.hpp +++ b/gfx/gl/vertexArrayObject.h @@ -1,8 +1,8 @@ #pragma once -#include "collections.hpp" -#include "gl_traits.hpp" -#include "special_members.hpp" +#include "collections.h" +#include "gl_traits.h" +#include "special_members.h" #include <GL/glew.h> class VertexArrayObject { diff --git a/gfx/image.h b/gfx/image.h index 97c2731..8bb4067 100644 --- a/gfx/image.h +++ b/gfx/image.h @@ -1,7 +1,7 @@ #pragma once #include <span> // IWYU pragma: export -#include <special_members.hpp> +#include <special_members.h> #include <string> class Image { 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.hpp b/gfx/models/vertex.h index 181e7e7..181e7e7 100644 --- a/gfx/models/vertex.hpp +++ b/gfx/models/vertex.h diff --git a/gfx/renderable.h b/gfx/renderable.h index 5a9b1cd..e126fff 100644 --- a/gfx/renderable.h +++ b/gfx/renderable.h @@ -1,6 +1,6 @@ #pragma once -#include <special_members.hpp> +#include <special_members.h> class SceneShader; class ShadowMapper; |