Derive Camera and Light from Placeable

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

diff --git a/source/camera.cpp b/source/camera.cpp
index ae35f632438df2d9a7a8a416f838deabde6b8320..e7c925c99064a8f911a694fb733281f9fcca1e5f 100644 (file)
--- a/source/camera.cpp
+++ b/source/camera.cpp
@@ -85,6 +85,14 @@ void Camera::look_at(const Vector3 &p)
        set_look_direction(p-position);
 }
 
+void Camera::set_object_matrix(const Matrix &m)
+{
+       position = m.column(3).slice<3>(0);
+       look_dir = normalize(-m.column(2).slice<3>(0));
+       up_dir = normalize(m.column(1).slice<3>(0));
+       update_object_matrix();
+}
+
 Vector3 Camera::project(const Vector4 &p) const
 {
        Vector4 r = proj_matrix*(view_matrix*p);
@@ -99,7 +107,7 @@ Vector3 Camera::project(const Vector3 &p) const
 Vector4 Camera::unproject(const Vector4 &p) const
 {
        Vector4 r = invert(proj_matrix)*Vector4(p.x, p.y, p.z, 1.0f);
-       r = object_matrix*Vector4(r.x/r.w, r.y/r.w, r.z/r.w, p.w);
+       r = matrix*Vector4(r.x/r.w, r.y/r.w, r.z/r.w, p.w);
        return r;
 }
 
@@ -137,8 +145,8 @@ void Camera::update_object_matrix()
        columns[1] = compose(cross(right_dir, look_dir), 0.0f);
        columns[2] = compose(-look_dir, 0.0f);
        columns[3] = compose(position, 1.0f);
-       object_matrix = Matrix::from_columns(columns);
-       view_matrix = invert(object_matrix);
+       matrix = Matrix::from_columns(columns);
+       view_matrix = invert(matrix);
 }
 
 } // namespace GL