Field of view is an angle too

[libs/gl.git] / source / camera.h

diff --git a/source/camera.h b/source/camera.h
index 6e83a9c3e761384f3342abb818cad714b1049004..11d42985c7bd4719a2073c4c16919b69b03b9979 100644 (file)
--- a/source/camera.h
+++ b/source/camera.h
@@ -10,7 +10,7 @@ namespace GL {
 class Camera
 {
 private:
-       float fov;
+       Geometry::Angle<float> fov;
        float aspect;
        // Some compilers have "near" and "far" keywords
        float clip_near;
@@ -23,10 +23,10 @@ private:
 public:
        Camera();
 
-       void set_field_of_view(float);
+       void set_field_of_view(const Geometry::Angle<float> &);
        void set_aspect(float);
        void set_depth_clip(float, float);
-       float get_field_of_view() const { return fov; }
+       const Geometry::Angle<float> &get_field_of_view() const { return fov; }
        float get_aspect() const { return aspect; }
        float get_near_clip() const { return clip_near; }
        float get_far_clip() const { return clip_far; }
@@ -41,6 +41,7 @@ public:
        const Matrix &get_matrix() const { return matrix; }
 
        Vector3 project(const Vector4 &) const;
+       Vector3 project(const Vector3 &) const;
        Vector4 unproject(const Vector4 &) const;
 
        void apply() const;