From 217502d45c8e77a7e69b6ee88c145a79d477a4e5 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Thu, 28 Jan 2021 13:41:02 +0100 Subject: [PATCH] #include <> should only be used for system directories --- inferno/src/inferno/input.cpp | 2 +- inferno/src/inferno/inputcodes.cpp | 2 +- inferno/src/inferno/render/buffer.cpp | 2 +- inferno/src/inferno/render/context.cpp | 4 ++-- inferno/src/inferno/render/font.h | 2 +- inferno/src/inferno/render/renderer.cpp | 2 +- inferno/src/inferno/render/shader.cpp | 4 ++-- inferno/src/inferno/render/shader.h | 2 +- inferno/src/inferno/render/texture.cpp | 4 ++-- inferno/src/inferno/script/cameracontroller.cpp | 2 +- inferno/src/inferno/systems/camera.cpp | 4 ++-- inferno/src/inferno/systems/render.cpp | 2 +- inferno/src/inferno/systems/transform.cpp | 2 +- inferno/src/inferno/time.cpp | 2 +- inferno/src/inferno/window.cpp | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/inferno/src/inferno/input.cpp b/inferno/src/inferno/input.cpp index 0ab5ec6..065d861 100644 --- a/inferno/src/inferno/input.cpp +++ b/inferno/src/inferno/input.cpp @@ -1,4 +1,4 @@ -#include +#include "GLFW/glfw3.h" #include "inferno/application.h" #include "inferno/event/mouseevent.h" diff --git a/inferno/src/inferno/inputcodes.cpp b/inferno/src/inferno/inputcodes.cpp index f599fcc..b34a5eb 100644 --- a/inferno/src/inferno/inputcodes.cpp +++ b/inferno/src/inferno/inputcodes.cpp @@ -1,7 +1,7 @@ #include // std::string #include // std::unordered_map -#include +#include "GLFW/glfw3.h" #include "inferno/assertions.h" #include "inferno/inputcodes.h" diff --git a/inferno/src/inferno/render/buffer.cpp b/inferno/src/inferno/render/buffer.cpp index 500a042..22398b7 100644 --- a/inferno/src/inferno/render/buffer.cpp +++ b/inferno/src/inferno/render/buffer.cpp @@ -1,4 +1,4 @@ -#include +#include "glad/glad.h" #include "inferno/assertions.h" #include "inferno/core.h" diff --git a/inferno/src/inferno/render/context.cpp b/inferno/src/inferno/render/context.cpp index 0beefde..0b41047 100644 --- a/inferno/src/inferno/render/context.cpp +++ b/inferno/src/inferno/render/context.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "glad/glad.h" +#include "GLFW/glfw3.h" #include "inferno/assertions.h" #include "inferno/core.h" diff --git a/inferno/src/inferno/render/font.h b/inferno/src/inferno/render/font.h index 33e7b4f..8681460 100644 --- a/inferno/src/inferno/render/font.h +++ b/inferno/src/inferno/render/font.h @@ -7,7 +7,7 @@ #include // std::unordered_map #include // std::vector -#include // glm::ivec2 +#include "glm/ext/vector_int2.hpp" // glm::ivec2 #include "inferno/log.h" diff --git a/inferno/src/inferno/render/renderer.cpp b/inferno/src/inferno/render/renderer.cpp index e77a428..62f8dc0 100644 --- a/inferno/src/inferno/render/renderer.cpp +++ b/inferno/src/inferno/render/renderer.cpp @@ -1,7 +1,7 @@ #include // std::min #include // std::move -#include +#include "glad/glad.h" #include "inferno/assertions.h" #include "inferno/render/buffer.h" diff --git a/inferno/src/inferno/render/shader.cpp b/inferno/src/inferno/render/shader.cpp index 76b3dbe..073fa80 100644 --- a/inferno/src/inferno/render/shader.cpp +++ b/inferno/src/inferno/render/shader.cpp @@ -1,7 +1,7 @@ #include // std::vector -#include -#include // glm::value_ptr +#include "glad/glad.h" +#include "glm/gtc/type_ptr.hpp" // glm::value_ptr #include "inferno/assertions.h" #include "inferno/core.h" diff --git a/inferno/src/inferno/render/shader.h b/inferno/src/inferno/render/shader.h index 53ed55c..0c180cb 100644 --- a/inferno/src/inferno/render/shader.h +++ b/inferno/src/inferno/render/shader.h @@ -6,7 +6,7 @@ #include // std::string #include // std::unordered_map -#include +#include "glm/glm.hpp" namespace Inferno { diff --git a/inferno/src/inferno/render/texture.cpp b/inferno/src/inferno/render/texture.cpp index a099c79..3b6c6a5 100644 --- a/inferno/src/inferno/render/texture.cpp +++ b/inferno/src/inferno/render/texture.cpp @@ -1,9 +1,9 @@ #include // UINT_MAX #include -#include +#include "glad/glad.h" #define STB_IMAGE_IMPLEMENTATION -#include +#include "stb_image.h" #include "inferno/assertions.h" #include "inferno/render/texture.h" diff --git a/inferno/src/inferno/script/cameracontroller.cpp b/inferno/src/inferno/script/cameracontroller.cpp index 5b4adca..def3004 100644 --- a/inferno/src/inferno/script/cameracontroller.cpp +++ b/inferno/src/inferno/script/cameracontroller.cpp @@ -1,4 +1,4 @@ -#include // glm::radians +#include "glm/ext/matrix_transform.hpp" // glm::radians #include "inferno/input.h" #include "inferno/inputcodes.h" diff --git a/inferno/src/inferno/systems/camera.cpp b/inferno/src/inferno/systems/camera.cpp index 6c50129..0958f41 100644 --- a/inferno/src/inferno/systems/camera.cpp +++ b/inferno/src/inferno/systems/camera.cpp @@ -1,5 +1,5 @@ -#include // glm::perspective, glm::ortho -#include // glm::radians, glm::lookAt +#include "glm/ext/matrix_clip_space.hpp" // glm::perspective, glm::ortho +#include "glm/ext/matrix_transform.hpp" // glm::radians, glm::lookAt #include "inferno/application.h" #include "inferno/assertions.h" diff --git a/inferno/src/inferno/systems/render.cpp b/inferno/src/inferno/systems/render.cpp index f186dde..62c6da7 100644 --- a/inferno/src/inferno/systems/render.cpp +++ b/inferno/src/inferno/systems/render.cpp @@ -1,4 +1,4 @@ -#include // glm::translate, glm::rotate, glm::scale, glm::radians +#include "glm/ext/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale, glm::radians #include "inferno/assertions.h" #include "inferno/log.h" diff --git a/inferno/src/inferno/systems/transform.cpp b/inferno/src/inferno/systems/transform.cpp index b310a14..16a1835 100644 --- a/inferno/src/inferno/systems/transform.cpp +++ b/inferno/src/inferno/systems/transform.cpp @@ -1,4 +1,4 @@ -#include // glm::translate, glm::rotate, glm::scale, glm::radians +#include "glm/ext/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale, glm::radians #include "inferno/assertions.h" #include "inferno/log.h" diff --git a/inferno/src/inferno/time.cpp b/inferno/src/inferno/time.cpp index 74ddb61..584d5ad 100644 --- a/inferno/src/inferno/time.cpp +++ b/inferno/src/inferno/time.cpp @@ -1,4 +1,4 @@ -#include +#include "GLFW/glfw3.h" #include "inferno/time.h" diff --git a/inferno/src/inferno/window.cpp b/inferno/src/inferno/window.cpp index b0a2b65..9d9239c 100644 --- a/inferno/src/inferno/window.cpp +++ b/inferno/src/inferno/window.cpp @@ -1,4 +1,4 @@ -#include +#include "GLFW/glfw3.h" #include "inferno/assertions.h" #include "inferno/core.h"