diff --git a/assets/lua/cameracontroller.lua b/assets/lua/cameracontroller.lua index 5506a7b..ab92c9c 100644 --- a/assets/lua/cameracontroller.lua +++ b/assets/lua/cameracontroller.lua @@ -2,8 +2,6 @@ TRANSLATE_SPEED = 2.5 ROTATE_SPEED = 90.0 ZOOM_SENSITIVITY = 2.5 MOUSE_SENSITIVITY = 0.25 -NEAR_PLANE = 0.1 -FAR_PLANE = 100.0 LuaScript = { diff --git a/inferno/src/inferno/io/log.h b/inferno/src/inferno/io/log.h index 326c6e5..bd7ef21 100644 --- a/inferno/src/inferno/io/log.h +++ b/inferno/src/inferno/io/log.h @@ -1,14 +1,14 @@ #ifndef LOG_H #define LOG_H -#define BUFFER_SIZE 128 - #include // size_t #include // memcpy #include // std::string #include // std::string_view #include // std::forward +#define BUFFER_SIZE 128 + namespace Inferno { enum class Log { diff --git a/inferno/src/inferno/script/cameracontroller.h b/inferno/src/inferno/script/cameracontroller.h index 6b70566..a6a5fa1 100644 --- a/inferno/src/inferno/script/cameracontroller.h +++ b/inferno/src/inferno/script/cameracontroller.h @@ -1,14 +1,12 @@ #ifndef CAMERA_CONTROLLER_H #define CAMERA_CONTROLLER_H +#include "inferno/script/nativescript.h" + #define TRANSLATE_SPEED 2.5f #define ROTATE_SPEED 90.0f #define ZOOM_SENSITIVITY 2.5f #define MOUSE_SENSITIVITY 0.25f -#define NEAR_PLANE 0.1f -#define FAR_PLANE 100.0f - -#include "inferno/script/nativescript.h" namespace Inferno { diff --git a/inferno/src/inferno/system/camerasystem.h b/inferno/src/inferno/system/camerasystem.h index b25ac32..a2fe66b 100644 --- a/inferno/src/inferno/system/camerasystem.h +++ b/inferno/src/inferno/system/camerasystem.h @@ -1,13 +1,6 @@ #ifndef CAMERA_SYSTEM_H #define CAMERA_SYSTEM_H -#define TRANSLATE_SPEED 2.5f -#define ROTATE_SPEED 90.0f -#define ZOOM_SENSITIVITY 2.5f -#define MOUSE_SENSITIVITY 0.25f -#define NEAR_PLANE 0.1f -#define FAR_PLANE 100.0f - #include //std::shared_ptr #include "entt/entity/registry.hpp" // entt::entity, entt::registry @@ -15,6 +8,9 @@ #include "inferno/component/cameracomponent.h" #include "inferno/component/transformcomponent.h" +#define NEAR_PLANE 0.1f +#define FAR_PLANE 100.0f + namespace Inferno { class CameraSystem {