Make better use of matrix operations in Camera

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

diff --git a/source/camera.h b/source/camera.h
index a0e4d6f65fb3215a5d8f64e2fbc1fef58347377f..634557607c112abdd619e622203cfafe1b9eddd0 100644 (file)
--- a/source/camera.h
+++ b/source/camera.h
@@ -20,7 +20,8 @@ private:
        Vector3 position;
        Vector3 look_dir;
        Vector3 up_dir;
-       Matrix matrix;
+       Matrix view_matrix;
+       Matrix object_matrix;
 
 public:
        Camera();
@@ -41,7 +42,17 @@ public:
        const Vector3 &get_position() const { return position; }
        const Vector3 &get_look_direction() const { return look_dir; }
        const Vector3 &get_up_direction() const { return up_dir; }
-       const Matrix &get_matrix() const { return matrix; }
+
+       /** Deprecated alias for get_view_matrix. */
+       const Matrix &get_matrix() const { return get_view_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; }
 
        Vector3 project(const Vector4 &) const;
        Vector3 project(const Vector3 &) const;
@@ -50,7 +61,7 @@ public:
        void apply() const;
 
 private:
-       void compute_matrix();
+       void update_object_matrix();
 };
 
 } // namespace GL