aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
diff options
context:
space:
mode:
authorheavydemon21 <nielsstunnebrink1@gmail.com>2024-11-20 12:07:07 +0100
committerheavydemon21 <nielsstunnebrink1@gmail.com>2024-11-20 12:07:07 +0100
commitbdc81e355e5bee5d2a3e29346ba08f7bc55196ca (patch)
treea5a62ba0b7fd5a354b6523cff768099281d317a1 /src/crepe/api
parent88f613cbb2e4aaf3ed55ac0c6490706dd6f6f19d (diff)
adjusted branch based on feedback
Diffstat (limited to 'src/crepe/api')
-rw-r--r--src/crepe/api/Animator.cpp2
-rw-r--r--src/crepe/api/Camera.h18
-rw-r--r--src/crepe/api/Vector2.cpp4
-rw-r--r--src/crepe/api/Vector2.h2
4 files changed, 11 insertions, 15 deletions
diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index f3d809c..d206428 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -18,7 +18,7 @@ Animator::Animator(game_object_id_t id, Sprite & ss, int row, int col, int col_a
animator_rect.h /= col;
animator_rect.w /= row;
animator_rect.x = 0;
- animator_rect.y = (col_animator - 1)* animator_rect.h;
+ animator_rect.y = (col_animator - 1) * animator_rect.h;
this->active = false;
}
Animator::~Animator() { dbg_trace(); }
diff --git a/src/crepe/api/Camera.h b/src/crepe/api/Camera.h
index dfccd24..d7292ef 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -28,25 +28,17 @@ public:
//! Background color of the camera view.
Color bg_color;
- /**
- * \pos The position of the camera in world units
- */
+ //! pos The position of the camera in world units
Vector2 pos = {0, 0};
- /**
- * \screen the display size in pixels ( output resolution )
- */
+ //! screen the display size in pixels ( output resolution )
Vector2 screen = {640, 480};
- /**
- * \viewport is the area of the world visible through the camera (in world units)
- */
+ //! viewport is the area of the world visible through the camera (in world units)
Vector2 viewport = {500, 500};
- /**
- * \scale scaling factor from world units to pixel coordinates
- */
- Vector2 scale = {0,0};
+ //! scale scaling factor from world units to pixel coordinates
+ Vector2 scale = {0, 0};
//! Zoom level of the camera view.
double zoom = 1.0f;
diff --git a/src/crepe/api/Vector2.cpp b/src/crepe/api/Vector2.cpp
index c3a49b7..8658c00 100644
--- a/src/crepe/api/Vector2.cpp
+++ b/src/crepe/api/Vector2.cpp
@@ -8,14 +8,16 @@ Vector2 Vector2::operator+(const Vector2 & other) const { return {x + other.x, y
Vector2 Vector2::operator*(double scalar) const { return {x * scalar, y * scalar}; }
-Vector2 Vector2::operator*(const Vector2 & other) const{
+Vector2 Vector2::operator*(const Vector2 & other) const {
return {this->x * other.x, this->y * other.y};
}
+
Vector2 & Vector2::operator*=(const Vector2 & other) {
x *= other.x;
y *= other.y;
return *this;
}
+
Vector2 & Vector2::operator*=(const double & other) {
x *= other;
y *= other;
diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h
index 2a5db1d..790160d 100644
--- a/src/crepe/api/Vector2.h
+++ b/src/crepe/api/Vector2.h
@@ -18,6 +18,7 @@ struct Vector2 {
//! Multiplies this vector by a scalar and returns the result.
Vector2 operator*(double scalar) const;
+ //! Multiplies this vector by another vector element-wise and updates this vector.
Vector2 operator*(const Vector2 & other) const;
//! Multiplies this vector by another vector element-wise and updates this vector.
@@ -26,6 +27,7 @@ struct Vector2 {
//! Multiplies a scalar value to both components of this vector and updates this vector.
Vector2 & operator*=(const double & other);
+ //! Divides this vector by another vector element-wise and updates this vector.
Vector2 operator/(const Vector2 & other) const;
//! Adds another vector to this vector and updates this vector.