Initialize camera matrices in constructor

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

diff --git a/source/camera.cpp b/source/camera.cpp
index df4119a9e20b663503f6a14858a4633ca064a1e9..fca3ea33d504773d90e073c598175a33d9be2f46 100644 (file)
--- a/source/camera.cpp
+++ b/source/camera.cpp
@@ -15,7 +15,10 @@ Camera::Camera():
        position(0, 0, 0),
        look_dir(0, 0, -1),
        up_dir(0, 1, 0)
-{ }
+{
+       update_projection_matrix();
+       update_object_matrix();
+}
 
 void Camera::set_field_of_view(const Geometry::Angle<float> &f)
 {
@@ -79,7 +82,7 @@ Vector3 Camera::project(const Vector3 &p) const
 
 Vector4 Camera::unproject(const Vector4 &p) const
 {
-       Vector4 r = invert(proj_matrix)*LinAl::Vector<double, 4>(p.x, p.y, p.z, 1.0f);
+       Vector4 r = invert(proj_matrix)*Vector4(p.x, p.y, p.z, 1.0f);
        r = object_matrix*Vector4(r.x, r.y, r.z, p.w);
        return r;
 }
@@ -104,11 +107,11 @@ void Camera::update_projection_matrix()
 void Camera::update_object_matrix()
 {
        Vector3 right_dir = normalize(cross(look_dir, up_dir));
-       LinAl::Vector<double, 4> columns[4];
-       columns[0] = LinAl::Vector<double, 4>(right_dir, 0.0f);
-       columns[1] = LinAl::Vector<double, 4>(cross(right_dir, look_dir), 0.0f);
-       columns[2] = LinAl::Vector<double, 4>(-look_dir, 0.0f);
-       columns[3] = LinAl::Vector<double, 4>(position, 1.0f);
+       Vector4 columns[4];
+       columns[0] = Vector4(right_dir, 0.0f);
+       columns[1] = Vector4(cross(right_dir, look_dir), 0.0f);
+       columns[2] = Vector4(-look_dir, 0.0f);
+       columns[3] = Vector4(position, 1.0f);
        object_matrix = Matrix::from_columns(columns);
        view_matrix = invert(object_matrix);
 }