4 files changed, 34 insertions, 10 deletions

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index 464b0fd..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 * 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 e0cda34..d7292ef 100644
--- a/src/crepe/api/Camera.h
+++ b/src/crepe/api/Camera.h
@@ -2,6 +2,7 @@
 
 #include "Color.h"
 #include "Component.h"
+#include "api/Vector2.h"
 
 namespace crepe {
 
@@ -27,20 +28,20 @@ public:
 	//! Background color of the camera view.
 	Color bg_color;
 
-	//! Aspect ratio height for the camera.
-	double aspect_height = 480;
+	//! pos The position of the camera in world units
+	Vector2 pos = {0, 0};
 
-	//! Aspect ratio width for the camera.
-	double aspect_width = 640;
+	//! screen the display size in pixels ( output resolution )
+	Vector2 screen = {640, 480};
 
-	//! X-coordinate of the camera position.
-	double x = 0.0;
+	//! viewport is the area of the world visible through the camera (in world units)
+	Vector2 viewport = {500, 500};
 
-	//! Y-coordinate of the camera position.
-	double y = 0.0;
+	//! scale scaling factor from world units to pixel coordinates
+	Vector2 scale = {0, 0};
 
 	//! Zoom level of the camera view.
-	double zoom = 1.0;
+	double zoom = 1.0f;
 
 public:
 	/**
diff --git a/src/crepe/api/Vector2.cpp b/src/crepe/api/Vector2.cpp
index 30b968e..8658c00 100644
--- a/src/crepe/api/Vector2.cpp
+++ b/src/crepe/api/Vector2.cpp
@@ -8,12 +8,22 @@ 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 {
+	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;
+	return *this;
+}
+
 Vector2 & Vector2::operator+=(const Vector2 & other) {
 	x += other.x;
 	y += other.y;
@@ -26,6 +36,10 @@ Vector2 & Vector2::operator+=(double other) {
 	return *this;
 }
 
+Vector2 Vector2::operator/(const Vector2 & other) const {
+	return {this->x / other.x, this->y / other.y};
+}
+
 Vector2 Vector2::operator-() const { return {-x, -y}; }
 
 bool Vector2::operator==(const Vector2 & other) const { return x == other.x && y == other.y; }
diff --git a/src/crepe/api/Vector2.h b/src/crepe/api/Vector2.h
index 2fb6136..790160d 100644
--- a/src/crepe/api/Vector2.h
+++ b/src/crepe/api/Vector2.h
@@ -19,8 +19,17 @@ struct Vector2 {
 	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.
 	Vector2 & operator*=(const Vector2 & other);
 
+	//! 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.
 	Vector2 & operator+=(const Vector2 & other);