aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/crepe/api')
-rw-r--r--src/crepe/api/Camera.h13
-rw-r--r--src/crepe/api/Vector2.h11
2 files changed, 9 insertions, 15 deletions
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h
index 137c8ed..eea1b28 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -2,7 +2,8 @@
#include "Color.h"
#include "Component.h"
-#include "api/Vector2.h"
+
+#include "types.h"
namespace crepe {
@@ -29,15 +30,15 @@ public:
Color bg_color;
//! pos The position of the camera in world units
- Vector2 pos = {0, 0};
+ vec2 pos = {0, 0};
//! screen the display size in pixels ( output resolution )
- //Vector2 screen = {720, 480};
- Vector2 screen = {1080, 720};
+ //vec2 screen = {720, 480};
+ vec2 screen = {1080, 720};
//! viewport is the area of the world visible through the camera (in world units)
- //Vector2 viewport = {720, 480};
- Vector2 viewport = {2000, 1000};
+ //vec2 viewport = {720, 480};
+ vec2 viewport = {2000, 1000};
//! scale scaling factor from world units to pixel coordinates
//! Zoom level of the camera view.
diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h
index 019d849..0688fac 100644
--- a/src/crepe/api/Vector2.h
+++ b/src/crepe/api/Vector2.h
@@ -34,15 +34,11 @@ struct Vector2 {
//! Multiplies this vector by another vector element-wise and updates this vector.
Vector2 & operator*=(const Vector2<T> & other);
- //! Multiplies a scalar value to both components of this vector and updates this vector.
- Vector2 & operator*=(const Vector2<T> & other);
-
- //! Divides this vector by another vector element-wise and updates this vector.
- Vector2 operator/(const Vector2<T> & other) const;
-
//! Divides a scalar value to both components of this vector and updates this vector.
Vector2 operator/(const T & other) const;
+ Vector2 operator/(T other) const;
+
//! Adds another vector to this vector and updates this vector.
Vector2 & operator+=(const Vector2<T> & other);
@@ -55,9 +51,6 @@ struct Vector2 {
//! Subtracts a scalar value from both components of this vector and updates this vector.
Vector2 & operator-=(T other);
- //! Multiplies this vector by another vector element-wise and updates this vector.
- Vector2 & operator*=(const Vector2<T> & other);
-
//! Multiplies this vector by a scalar and updates this vector.
Vector2 & operator*=(T other);