From 6b7d0e795bc57856a1bcaaab08229bb0869e8516 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 3 Feb 2023 23:53:33 +0100 Subject: Extracted from/to camera viewport transformations to camera itself --- engine/src/Camera.cpp | 39 +++++++++++++++++++++++++++++++++++++++ engine/src/Point.cpp | 16 +++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 engine/src/Camera.cpp (limited to 'engine/src') diff --git a/engine/src/Camera.cpp b/engine/src/Camera.cpp new file mode 100644 index 0000000..60e8aa1 --- /dev/null +++ b/engine/src/Camera.cpp @@ -0,0 +1,39 @@ +#include + +#include + +#include + + +namespace kurator +{ +namespace engine +{ + + +static auto viewport() -> Point; + + +Point +Camera::to_world(const Point& screen) const +{ + return screen - viewport().scale(1.0 / (2.0 * scale)) + offset; +} + + +Point +Camera::to_screen(const Point& world) const +{ + return (world - offset).scale(scale) + viewport().scale(0.5); +} + + +Point +viewport() +{ + return {static_cast(GetScreenWidth()), static_cast(GetScreenHeight())}; +} + + +} // namespace engine +} // namespace kurator diff --git a/engine/src/Point.cpp b/engine/src/Point.cpp index b5ce4eb..f02991c 100644 --- a/engine/src/Point.cpp +++ b/engine/src/Point.cpp @@ -57,7 +57,7 @@ Point::normalized() const Point Point::operator-(const Point& other) const { - return {x - other.x, y - other.y}; + return subtract(other); } @@ -68,5 +68,19 @@ Point::operator+(const Point& other) const } +Point +Point::subtract(const Point& other) const +{ + return {x - other.x, y - other.y}; +} + + +Point +Point::subtract(const double _x, const double _y) const +{ + return {x - _x, y - _y}; +} + + } // namespace engine } // namespace kurator -- cgit v1.1