Browse Source

Move defines below includes

master
Riyyi 4 years ago
parent
commit
b26cb3e073
  1. 2
      assets/lua/cameracontroller.lua
  2. 4
      inferno/src/inferno/io/log.h
  3. 6
      inferno/src/inferno/script/cameracontroller.h
  4. 10
      inferno/src/inferno/system/camerasystem.h

2
assets/lua/cameracontroller.lua

@ -2,8 +2,6 @@ TRANSLATE_SPEED = 2.5
ROTATE_SPEED = 90.0 ROTATE_SPEED = 90.0
ZOOM_SENSITIVITY = 2.5 ZOOM_SENSITIVITY = 2.5
MOUSE_SENSITIVITY = 0.25 MOUSE_SENSITIVITY = 0.25
NEAR_PLANE = 0.1
FAR_PLANE = 100.0
LuaScript = { LuaScript = {

4
inferno/src/inferno/io/log.h

@ -1,14 +1,14 @@
#ifndef LOG_H #ifndef LOG_H
#define LOG_H #define LOG_H
#define BUFFER_SIZE 128
#include <cstddef> // size_t #include <cstddef> // size_t
#include <cstring> // memcpy #include <cstring> // memcpy
#include <string> // std::string #include <string> // std::string
#include <string_view> // std::string_view #include <string_view> // std::string_view
#include <utility> // std::forward #include <utility> // std::forward
#define BUFFER_SIZE 128
namespace Inferno { namespace Inferno {
enum class Log { enum class Log {

6
inferno/src/inferno/script/cameracontroller.h

@ -1,14 +1,12 @@
#ifndef CAMERA_CONTROLLER_H #ifndef CAMERA_CONTROLLER_H
#define CAMERA_CONTROLLER_H #define CAMERA_CONTROLLER_H
#include "inferno/script/nativescript.h"
#define TRANSLATE_SPEED 2.5f #define TRANSLATE_SPEED 2.5f
#define ROTATE_SPEED 90.0f #define ROTATE_SPEED 90.0f
#define ZOOM_SENSITIVITY 2.5f #define ZOOM_SENSITIVITY 2.5f
#define MOUSE_SENSITIVITY 0.25f #define MOUSE_SENSITIVITY 0.25f
#define NEAR_PLANE 0.1f
#define FAR_PLANE 100.0f
#include "inferno/script/nativescript.h"
namespace Inferno { namespace Inferno {

10
inferno/src/inferno/system/camerasystem.h

@ -1,13 +1,6 @@
#ifndef CAMERA_SYSTEM_H #ifndef CAMERA_SYSTEM_H
#define 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 <memory> //std::shared_ptr
#include "entt/entity/registry.hpp" // entt::entity, entt::registry #include "entt/entity/registry.hpp" // entt::entity, entt::registry
@ -15,6 +8,9 @@
#include "inferno/component/cameracomponent.h" #include "inferno/component/cameracomponent.h"
#include "inferno/component/transformcomponent.h" #include "inferno/component/transformcomponent.h"
#define NEAR_PLANE 0.1f
#define FAR_PLANE 100.0f
namespace Inferno { namespace Inferno {
class CameraSystem { class CameraSystem {

Loading…
Cancel
Save