Rename various get/set_aspect functions to aspect_ratio

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

diff --git a/source/camera.h b/source/camera.h
index 412d69ff56bb83cd222e26805ffe784dca66563e..1c13e67d9d6de544a1aa0a73c00e0fcb4e4f0248 100644 (file)
--- a/source/camera.h
+++ b/source/camera.h
@@ -1,13 +1,12 @@
 #ifndef MSP_GL_CAMERA_H_
 #define MSP_GL_CAMERA_H_
 
-#include "matrix.h"
-#include "vector.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-class Camera
+class Camera: public Placeable
 {
 private:
        Geometry::Angle<float> fov;
@@ -23,7 +22,6 @@ private:
        Vector3 look_dir;
        Vector3 up_dir;
        Matrix view_matrix;
-       Matrix object_matrix;
        Matrix proj_matrix;
 
 public:
@@ -31,7 +29,7 @@ public:
 
        void set_field_of_view(const Geometry::Angle<float> &);
        void set_orthographic(float, float);
-       void set_aspect(float);
+       void set_aspect_ratio(float);
        void set_depth_clip(float, float);
        void set_frustum_axis(float, float);
        void set_frustum_rotation(const Geometry::Angle<float> &);
@@ -39,11 +37,15 @@ public:
        bool is_orthographic() const { return fov==Geometry::Angle<float>::zero(); }
        float get_orthographic_width() const { return height*aspect; }
        float get_orthographic_height() const { return height; }
-       float get_aspect() const { return aspect; }
+       float get_aspect_ratio() const { return aspect; }
        float get_near_clip() const { return clip_near; }
        float get_far_clip() const { return clip_far; }
        const Geometry::Angle<float> &get_frustum_rotation() const { return rotate; }
 
+       // Deprecated, use set/get_aspect_ratio instead
+       void set_aspect(float a) { set_aspect_ratio(a); }
+       float get_aspect() const { return get_aspect_ratio(); }
+
        void set_position(const Vector3 &);
        void set_look_direction(const Vector3 &);
        void look_at(const Vector3 &);
@@ -52,13 +54,18 @@ public:
        const Vector3 &get_look_direction() const { return look_dir; }
        const Vector3 &get_up_direction() const { return up_dir; }
 
+       virtual void set_matrix(const Matrix &m) { set_object_matrix(m); }
+
+       /** Sets the position and orientation of the camera from an object matrix. */
+       void set_object_matrix(const Matrix &);
+
        /** Returns the view matrix, used to transform coordinates from world space
        to eye space. */
        const Matrix &get_view_matrix() const { return view_matrix; }
 
        /** Returns the object matrix, used to transform coordinates from eye space
        to world space. */
-       const Matrix &get_object_matrix() const { return object_matrix; }
+       const Matrix &get_object_matrix() const { return matrix; }
 
        /** Returns the projection matrix. */
        const Matrix &get_projection_matrix() const { return proj_matrix; }