diff options
Diffstat (limited to 'src/crepe/api')
| -rw-r--r-- | src/crepe/api/Camera.h | 11 | ||||
| -rw-r--r-- | src/crepe/api/Config.h | 9 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h index eea1b28..ec94c44 100644 --- a/src/crepe/api/Camera.h +++ b/src/crepe/api/Camera.h @@ -3,6 +3,7 @@ #include "Color.h" #include "Component.h" +#include "api/Config.h" #include "types.h" namespace crepe { @@ -30,19 +31,17 @@ public: Color bg_color; //! pos The position of the camera in world units - vec2 pos = {0, 0}; + vec2 pos = Config::get_instance().win_set.pos; //! screen the display size in pixels ( output resolution ) - //vec2 screen = {720, 480}; - vec2 screen = {1080, 720}; + vec2 screen = Config::get_instance().win_set.def_size; //! viewport is the area of the world visible through the camera (in world units) - //vec2 viewport = {720, 480}; - vec2 viewport = {2000, 1000}; + vec2 viewport = Config::get_instance().win_set.def_size; //! scale scaling factor from world units to pixel coordinates //! Zoom level of the camera view. - double zoom = 1.0f; + double zoom = Config::get_instance().win_set.zoom; public: /** diff --git a/src/crepe/api/Config.h b/src/crepe/api/Config.h index 671fd02..e1aef7d 100644 --- a/src/crepe/api/Config.h +++ b/src/crepe/api/Config.h @@ -1,6 +1,7 @@ #pragma once #include "../util/Log.h" +#include "types.h" namespace crepe { @@ -62,6 +63,14 @@ public: double gravity = 1; } physics; + //! default window settings + struct { + //TODO make this constexpr because this will never change + vec2 def_size = {1080,720}; + vec2 pos = {0,0}; + float zoom = 1.0f; + } win_set; + //! Asset loading options struct { /** |