From 98785fa182d8058bd6c484f286d1212417b30612 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Thu, 28 Jan 2021 16:37:26 +0100 Subject: [PATCH] Rename folders to singular form --- .../cameracomponent.h | 0 .../luascriptcomponent.h | 0 .../nativescriptcomponent.h | 0 .../spritecomponent.h | 0 .../{components => component}/tagcomponent.h | 0 .../transformcomponent.cpp | 2 +- .../transformcomponent.h | 0 inferno/src/inferno/render/renderer.h | 2 +- inferno/src/inferno/scene/scene.cpp | 18 +++++++++--------- .../src/inferno/script/cameracontroller.cpp | 4 ++-- inferno/src/inferno/script/luascript.cpp | 8 ++++---- inferno/src/inferno/script/registration.cpp | 8 ++++---- .../{systems => system}/camerasystem.cpp | 2 +- .../inferno/{systems => system}/camerasystem.h | 4 ++-- .../{systems => system}/rendersystem.cpp | 6 +++--- .../inferno/{systems => system}/rendersystem.h | 0 .../{systems => system}/scriptsystem.cpp | 8 ++++---- .../inferno/{systems => system}/scriptsystem.h | 0 .../{systems => system}/transformsystem.cpp | 4 ++-- .../{systems => system}/transformsystem.h | 0 20 files changed, 33 insertions(+), 33 deletions(-) rename inferno/src/inferno/{components => component}/cameracomponent.h (100%) rename inferno/src/inferno/{components => component}/luascriptcomponent.h (100%) rename inferno/src/inferno/{components => component}/nativescriptcomponent.h (100%) rename inferno/src/inferno/{components => component}/spritecomponent.h (100%) rename inferno/src/inferno/{components => component}/tagcomponent.h (100%) rename inferno/src/inferno/{components => component}/transformcomponent.cpp (94%) rename inferno/src/inferno/{components => component}/transformcomponent.h (100%) rename inferno/src/inferno/{systems => system}/camerasystem.cpp (98%) rename inferno/src/inferno/{systems => system}/camerasystem.h (90%) rename inferno/src/inferno/{systems => system}/rendersystem.cpp (84%) rename inferno/src/inferno/{systems => system}/rendersystem.h (100%) rename inferno/src/inferno/{systems => system}/scriptsystem.cpp (93%) rename inferno/src/inferno/{systems => system}/scriptsystem.h (100%) rename inferno/src/inferno/{systems => system}/transformsystem.cpp (93%) rename inferno/src/inferno/{systems => system}/transformsystem.h (100%) diff --git a/inferno/src/inferno/components/cameracomponent.h b/inferno/src/inferno/component/cameracomponent.h similarity index 100% rename from inferno/src/inferno/components/cameracomponent.h rename to inferno/src/inferno/component/cameracomponent.h diff --git a/inferno/src/inferno/components/luascriptcomponent.h b/inferno/src/inferno/component/luascriptcomponent.h similarity index 100% rename from inferno/src/inferno/components/luascriptcomponent.h rename to inferno/src/inferno/component/luascriptcomponent.h diff --git a/inferno/src/inferno/components/nativescriptcomponent.h b/inferno/src/inferno/component/nativescriptcomponent.h similarity index 100% rename from inferno/src/inferno/components/nativescriptcomponent.h rename to inferno/src/inferno/component/nativescriptcomponent.h diff --git a/inferno/src/inferno/components/spritecomponent.h b/inferno/src/inferno/component/spritecomponent.h similarity index 100% rename from inferno/src/inferno/components/spritecomponent.h rename to inferno/src/inferno/component/spritecomponent.h diff --git a/inferno/src/inferno/components/tagcomponent.h b/inferno/src/inferno/component/tagcomponent.h similarity index 100% rename from inferno/src/inferno/components/tagcomponent.h rename to inferno/src/inferno/component/tagcomponent.h diff --git a/inferno/src/inferno/components/transformcomponent.cpp b/inferno/src/inferno/component/transformcomponent.cpp similarity index 94% rename from inferno/src/inferno/components/transformcomponent.cpp rename to inferno/src/inferno/component/transformcomponent.cpp index ebd37c0..00da5ed 100644 --- a/inferno/src/inferno/components/transformcomponent.cpp +++ b/inferno/src/inferno/component/transformcomponent.cpp @@ -1,4 +1,4 @@ -#include "inferno/components/transformcomponent.h" +#include "inferno/component/transformcomponent.h" namespace Inferno { diff --git a/inferno/src/inferno/components/transformcomponent.h b/inferno/src/inferno/component/transformcomponent.h similarity index 100% rename from inferno/src/inferno/components/transformcomponent.h rename to inferno/src/inferno/component/transformcomponent.h diff --git a/inferno/src/inferno/render/renderer.h b/inferno/src/inferno/render/renderer.h index b6fc83d..7077683 100644 --- a/inferno/src/inferno/render/renderer.h +++ b/inferno/src/inferno/render/renderer.h @@ -9,7 +9,7 @@ #include "glm/ext/vector_float3.hpp" // glm::vec3 #include "glm/ext/vector_float4.hpp" // glm::vec4 -#include "inferno/components/transformcomponent.h" +#include "inferno/component/transformcomponent.h" namespace Inferno { diff --git a/inferno/src/inferno/scene/scene.cpp b/inferno/src/inferno/scene/scene.cpp index ed54fb0..2e04060 100644 --- a/inferno/src/inferno/scene/scene.cpp +++ b/inferno/src/inferno/scene/scene.cpp @@ -1,16 +1,16 @@ #include "inferno/assert.h" -#include "inferno/components/cameracomponent.h" -#include "inferno/components/luascriptcomponent.h" -#include "inferno/components/nativescriptcomponent.h" -#include "inferno/components/spritecomponent.h" -#include "inferno/components/tagcomponent.h" +#include "inferno/component/cameracomponent.h" +#include "inferno/component/luascriptcomponent.h" +#include "inferno/component/nativescriptcomponent.h" +#include "inferno/component/spritecomponent.h" +#include "inferno/component/tagcomponent.h" #include "inferno/scene/scene.h" #include "inferno/script/cameracontroller.h" #include "inferno/script/nativescript.h" -#include "inferno/systems/camerasystem.h" -#include "inferno/systems/rendersystem.h" -#include "inferno/systems/scriptsystem.h" -#include "inferno/systems/transformsystem.h" +#include "inferno/system/camerasystem.h" +#include "inferno/system/rendersystem.h" +#include "inferno/system/scriptsystem.h" +#include "inferno/system/transformsystem.h" namespace Inferno { diff --git a/inferno/src/inferno/script/cameracontroller.cpp b/inferno/src/inferno/script/cameracontroller.cpp index b33348b..9510e7d 100644 --- a/inferno/src/inferno/script/cameracontroller.cpp +++ b/inferno/src/inferno/script/cameracontroller.cpp @@ -1,7 +1,7 @@ #include "glm/ext/matrix_transform.hpp" // glm::radians -#include "inferno/components/cameracomponent.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/cameracomponent.h" +#include "inferno/component/transformcomponent.h" #include "inferno/io/input.h" #include "inferno/keycodes.h" #include "inferno/script/cameracontroller.h" diff --git a/inferno/src/inferno/script/luascript.cpp b/inferno/src/inferno/script/luascript.cpp index 4eafa9f..4167ff6 100644 --- a/inferno/src/inferno/script/luascript.cpp +++ b/inferno/src/inferno/script/luascript.cpp @@ -1,9 +1,9 @@ #include "sol/unsafe_function_result.hpp" -#include "inferno/components/cameracomponent.h" -#include "inferno/components/spritecomponent.h" -#include "inferno/components/tagcomponent.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/cameracomponent.h" +#include "inferno/component/spritecomponent.h" +#include "inferno/component/tagcomponent.h" +#include "inferno/component/transformcomponent.h" #include "inferno/io/file.h" #include "inferno/scene/scene.h" #include "inferno/script/luascript.h" diff --git a/inferno/src/inferno/script/registration.cpp b/inferno/src/inferno/script/registration.cpp index 3d59e46..a85fc87 100644 --- a/inferno/src/inferno/script/registration.cpp +++ b/inferno/src/inferno/script/registration.cpp @@ -3,10 +3,10 @@ #include "glm/ext/vector_float4.hpp" // glm::vec4 #include "glm/ext/matrix_transform.hpp" // glm::radians -#include "inferno/components/cameracomponent.h" -#include "inferno/components/spritecomponent.h" -#include "inferno/components/tagcomponent.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/cameracomponent.h" +#include "inferno/component/spritecomponent.h" +#include "inferno/component/tagcomponent.h" +#include "inferno/component/transformcomponent.h" #include "inferno/io/input.h" #include "inferno/keycodes.h" #include "inferno/script/registration.h" diff --git a/inferno/src/inferno/systems/camerasystem.cpp b/inferno/src/inferno/system/camerasystem.cpp similarity index 98% rename from inferno/src/inferno/systems/camerasystem.cpp rename to inferno/src/inferno/system/camerasystem.cpp index 52c10ef..97ae826 100644 --- a/inferno/src/inferno/systems/camerasystem.cpp +++ b/inferno/src/inferno/system/camerasystem.cpp @@ -5,7 +5,7 @@ #include "inferno/assert.h" #include "inferno/io/input.h" #include "inferno/io/log.h" -#include "inferno/systems/camerasystem.h" +#include "inferno/system/camerasystem.h" #include "inferno/window.h" namespace Inferno { diff --git a/inferno/src/inferno/systems/camerasystem.h b/inferno/src/inferno/system/camerasystem.h similarity index 90% rename from inferno/src/inferno/systems/camerasystem.h rename to inferno/src/inferno/system/camerasystem.h index 096182a..b25ac32 100644 --- a/inferno/src/inferno/systems/camerasystem.h +++ b/inferno/src/inferno/system/camerasystem.h @@ -12,8 +12,8 @@ #include "entt/entity/registry.hpp" // entt::entity, entt::registry -#include "inferno/components/cameracomponent.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/cameracomponent.h" +#include "inferno/component/transformcomponent.h" namespace Inferno { diff --git a/inferno/src/inferno/systems/rendersystem.cpp b/inferno/src/inferno/system/rendersystem.cpp similarity index 84% rename from inferno/src/inferno/systems/rendersystem.cpp rename to inferno/src/inferno/system/rendersystem.cpp index b8fec6a..045856c 100644 --- a/inferno/src/inferno/systems/rendersystem.cpp +++ b/inferno/src/inferno/system/rendersystem.cpp @@ -1,11 +1,11 @@ #include "glm/ext/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale, glm::radians #include "inferno/assert.h" -#include "inferno/components/spritecomponent.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/spritecomponent.h" +#include "inferno/component/transformcomponent.h" #include "inferno/io/log.h" #include "inferno/render/renderer.h" -#include "inferno/systems/rendersystem.h" +#include "inferno/system/rendersystem.h" namespace Inferno { diff --git a/inferno/src/inferno/systems/rendersystem.h b/inferno/src/inferno/system/rendersystem.h similarity index 100% rename from inferno/src/inferno/systems/rendersystem.h rename to inferno/src/inferno/system/rendersystem.h diff --git a/inferno/src/inferno/systems/scriptsystem.cpp b/inferno/src/inferno/system/scriptsystem.cpp similarity index 93% rename from inferno/src/inferno/systems/scriptsystem.cpp rename to inferno/src/inferno/system/scriptsystem.cpp index 7105611..4d550ac 100644 --- a/inferno/src/inferno/systems/scriptsystem.cpp +++ b/inferno/src/inferno/system/scriptsystem.cpp @@ -1,14 +1,14 @@ #include "entt/entity/registry.hpp" // entt::entity, entt::registry #include "inferno/assert.h" -#include "inferno/components/luascriptcomponent.h" -#include "inferno/components/nativescriptcomponent.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/luascriptcomponent.h" +#include "inferno/component/nativescriptcomponent.h" +#include "inferno/component/transformcomponent.h" #include "inferno/io/log.h" #include "inferno/scene/scene.h" #include "inferno/script/luascript.h" #include "inferno/script/nativescript.h" -#include "inferno/systems/scriptsystem.h" +#include "inferno/system/scriptsystem.h" namespace Inferno { diff --git a/inferno/src/inferno/systems/scriptsystem.h b/inferno/src/inferno/system/scriptsystem.h similarity index 100% rename from inferno/src/inferno/systems/scriptsystem.h rename to inferno/src/inferno/system/scriptsystem.h diff --git a/inferno/src/inferno/systems/transformsystem.cpp b/inferno/src/inferno/system/transformsystem.cpp similarity index 93% rename from inferno/src/inferno/systems/transformsystem.cpp rename to inferno/src/inferno/system/transformsystem.cpp index f69d15b..00f0da0 100644 --- a/inferno/src/inferno/systems/transformsystem.cpp +++ b/inferno/src/inferno/system/transformsystem.cpp @@ -1,9 +1,9 @@ #include "glm/ext/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale, glm::radians #include "inferno/assert.h" -#include "inferno/components/transformcomponent.h" +#include "inferno/component/transformcomponent.h" #include "inferno/io/log.h" -#include "inferno/systems/transformsystem.h" +#include "inferno/system/transformsystem.h" namespace Inferno { diff --git a/inferno/src/inferno/systems/transformsystem.h b/inferno/src/inferno/system/transformsystem.h similarity index 100% rename from inferno/src/inferno/systems/transformsystem.h rename to inferno/src/inferno/system/transformsystem.h