From 08d0e47634e1632c96ebe3308535a86f5e625b40 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Mon, 23 Dec 2013 09:31:15 +0100
Subject: [PATCH] adjust cam speed to zoom level

---
 src/app/Application.cpp |  1 +
 src/graphics/Camera.cpp |  6 ++++--
 src/graphics/Camera.h   | 20 ++++++++++++++++----
 src/graphics/Moveable.h |  1 +
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 34edd25..20c3718 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -141,6 +141,7 @@ void Application::Update(int dt) {
 	controlled->acc = Vector<float>(control * 10);
 	cam.Update(delta);
 	univ.Update(delta);
+	focus.SetSpeed(500 / cam.Zoom());
 	focus.Update(delta);
 }
 
diff --git a/src/graphics/Camera.cpp b/src/graphics/Camera.cpp
index ad2587f..ea2f97d 100644
--- a/src/graphics/Camera.cpp
+++ b/src/graphics/Camera.cpp
@@ -5,7 +5,8 @@ namespace space {
 
 Camera::Camera(int w, int h, const Vector<float> &t)
 : target(&t)
-, offset(w/2, h/2)
+, size(w, h)
+, offset(size / 2)
 , zoom(1)
 , zoomAcc(0) {
 
@@ -13,7 +14,8 @@ Camera::Camera(int w, int h, const Vector<float> &t)
 
 
 void Camera::Resize(int w, int h) {
-	offset = Vector<float>(w/2, h/2);
+	size = Vector<int>(w, h);
+	offset = size / 2;
 }
 
 void Camera::Update(float delta) {
diff --git a/src/graphics/Camera.h b/src/graphics/Camera.h
index 911f236..4d49cb6 100644
--- a/src/graphics/Camera.h
+++ b/src/graphics/Camera.h
@@ -15,6 +15,9 @@ public:
 	void SetTarget(const Vector<float> &t) { target = &t; }
 	void SetZoom(float z) { zoom = z; }
 
+	Vector<int> ScreenSize() const { return size; }
+	float Zoom() const { return zoom; }
+
 	void Resize(int w, int h);
 	void Update(float deltaT);
 
@@ -23,18 +26,27 @@ public:
 	void StartShrink();
 	void StopShrink();
 
+	/// transform v from world coords to screen coords
 	Vector<int> ToScreen(Vector<float> v) const {
-		return Vector<int>(OffsetOf(v)) + offset;
-	}
-	Vector<float> OffsetOf(Vector<float> v) const {
-		return ToScale(v - *target);
+		return Vector<int>(ToScale(v - *target)) + offset;
 	}
+	/// scale v to current zoom level
 	Vector<float> ToScale(Vector<float> v) const {
 		return v * zoom;
 	}
 
+	/// transform v from screen coords to world coords
+	Vector<float> FromScreen(Vector<int> v) const {
+		return FromScale(v - offset) + *target;
+	}
+	/// scale v back from current zoom level
+	Vector<float> FromScale(Vector<float> v) const {
+		return v / zoom;
+	}
+
 private:
 	const Vector<float> *target;
+	Vector<int> size;
 	Vector<int> offset;
 
 	float zoom;
diff --git a/src/graphics/Moveable.h b/src/graphics/Moveable.h
index b5fbfe5..71f5909 100644
--- a/src/graphics/Moveable.h
+++ b/src/graphics/Moveable.h
@@ -16,6 +16,7 @@ public:
 public:
 	const Vector<Scalar> &Pos() const { return pos; }
 	Vector<Scalar> Vel() const { return Vector<Scalar>(dir) * speed; }
+	void SetSpeed(float s) { speed = s; }
 
 	void Update(Scalar delta) {
 		pos += Vel() * delta;
-- 
2.39.2