some cleanup

[space.git] / src / graphics / Camera.h

diff --git a/src/graphics/Camera.h b/src/graphics/Camera.h
index ad1a997ef6383cad9283ff884321b46133822e33..911f23601feacc59b287cf2734924470b20640c8 100644 (file)
--- a/src/graphics/Camera.h
+++ b/src/graphics/Camera.h
@@ -24,10 +24,10 @@ public:
        void StopShrink();
 
        Vector<int> ToScreen(Vector<float> v) const {
-               return Vector<int>(OffsetOf(v));
+               return Vector<int>(OffsetOf(v)) + offset;
        }
        Vector<float> OffsetOf(Vector<float> v) const {
-               return ToScale(v - *target) + offset;
+               return ToScale(v - *target);
        }
        Vector<float> ToScale(Vector<float> v) const {
                return v * zoom;
@@ -35,7 +35,7 @@ public:
 
 private:
        const Vector<float> *target;
-       Vector<float> offset;
+       Vector<int> offset;
 
        float zoom;
        int zoomAcc;