Move defines below includes

2021-02-11 16:48:52 +01:00
parent 58afdbeae6
commit b26cb3e073
4 changed files with 7 additions and 15 deletions
@@ -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 = {

@@ -1,14 +1,14 @@
 #ifndef LOG_H
 #define LOG_H

-#define BUFFER_SIZE 128
-
 #include <cstddef>     // size_t
 #include <cstring>     // memcpy
 #include <string>      // std::string
 #include <string_view> // std::string_view
 #include <utility>     // std::forward

+#define BUFFER_SIZE 128
+
 namespace Inferno {

 	enum class Log {
@@ -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 {

@@ -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 <memory> //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 {