Fix the keyword of the uniform scaling statement in Transform loader

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

diff --git a/source/camera.cpp b/source/camera.cpp
index df4119a9e20b663503f6a14858a4633ca064a1e9..b3cedbc62ad628813b5eee552302a2151ea586c1 100644 (file)
--- a/source/camera.cpp
+++ b/source/camera.cpp
@@ -7,6 +7,7 @@ namespace GL {
 
 Camera::Camera():
        fov(Geometry::Angle<float>::from_turns(0.125)),
+       height(0),
        aspect(4.0/3.0),
        clip_near(0.1),
        clip_far(10),
@@ -15,7 +16,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)
 {
@@ -23,7 +27,16 @@ void Camera::set_field_of_view(const Geometry::Angle<float> &f)
        update_projection_matrix();
 }
 
-void Camera::set_aspect(float a)
+void Camera::set_orthographic(float w, float h)
+{
+       fov = Geometry::Angle<float>::zero();
+       height = h;
+       if(w)
+               aspect = w/h;
+       update_projection_matrix();
+}
+
+void Camera::set_aspect_ratio(float a)
 {
        aspect = a;
        update_projection_matrix();
@@ -43,15 +56,15 @@ void Camera::set_frustum_axis(float x, float y)
        update_projection_matrix();
 }
 
-void Camera::set_position(const Vector3 &p)
+void Camera::set_frustum_rotation(const Geometry::Angle<float> &r)
 {
-       position = p;
-       update_object_matrix();
+       rotate = r;
+       update_projection_matrix();
 }
 
-void Camera::set_up_direction(const Vector3 &u)
+void Camera::set_position(const Vector3 &p)
 {
-       up_dir = normalize(u);
+       position = p;
        update_object_matrix();
 }
 
@@ -66,10 +79,24 @@ void Camera::look_at(const Vector3 &p)
        set_look_direction(p-position);
 }
 
+void Camera::set_up_direction(const Vector3 &u)
+{
+       up_dir = normalize(u);
+       update_object_matrix();
+}
+
+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);
-       return Vector3(r)/r.w;
+       return r.slice<3>(0)/r.w;
 }
 
 Vector3 Camera::project(const Vector3 &p) const
@@ -79,11 +106,16 @@ 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);
-       r = object_matrix*Vector4(r.x, r.y, r.z, p.w);
+       Vector4 r = invert(proj_matrix)*Vector4(p.x, p.y, p.z, 1.0f);
+       r = matrix*Vector4(r.x/r.w, r.y/r.w, r.z/r.w, p.w);
        return r;
 }
 
+Vector3 Camera::unproject(const Vector3 &p) const
+{
+       return unproject(Vector4(p.x, p.y, p.z, 1.0f)).slice<3>(0);
+}
+
 void Camera::apply() const
 {
        MatrixStack::projection() = proj_matrix;
@@ -92,25 +124,83 @@ void Camera::apply() const
 
 void Camera::update_projection_matrix()
 {
-       float frustum_h = tan(fov/2.0f)*clip_near;
+       float frustum_h = (fov!=Geometry::Angle<float>::zero() ? tan(fov/2.0f)*clip_near : height/2);
        float frustum_w = frustum_h*aspect;
        float left = frustum_w*(frustum_x-1.0f);
        float right = frustum_w*(frustum_x+1.0f);
        float bottom = frustum_h*(frustum_y-1.0f);
        float top = frustum_h*(frustum_y+1.0f);
-       proj_matrix = Matrix::frustum(left, right, bottom, top, clip_near, clip_far);
+       if(fov>Geometry::Angle<float>::zero())
+               proj_matrix = Matrix::frustum(left, right, bottom, top, clip_near, clip_far);
+       else
+               proj_matrix = Matrix::ortho(left, right, bottom, top, clip_near, clip_far);
+       proj_matrix = Matrix::rotation(rotate, Vector3(0, 0, 1))*proj_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);
-       object_matrix = Matrix::from_columns(columns);
-       view_matrix = invert(object_matrix);
+       Vector4 columns[4];
+       columns[0] = compose(right_dir, 0.0f);
+       columns[1] = compose(cross(right_dir, look_dir), 0.0f);
+       columns[2] = compose(-look_dir, 0.0f);
+       columns[3] = compose(position, 1.0f);
+       matrix = Matrix::from_columns(columns);
+       view_matrix = invert(matrix);
+}
+
+
+Camera::Loader::Loader(Camera &c):
+       DataFile::ObjectLoader<Camera>(c)
+{
+       add("aspect_ratio", &Loader::aspect_ratio);
+       add("depth_clip", &Loader::depth_clip);
+       add("field_of_view", &Loader::field_of_view);
+       add("look_at", &Loader::look_at);
+       add("look_direction", &Loader::look_direction);
+       add("orthographic", &Loader::orthographic);
+       add("position", &Loader::position);
+       add("up_direction", &Loader::up_direction);
+}
+
+void Camera::Loader::aspect_ratio(float a)
+{
+       obj.set_aspect_ratio(a);
+}
+
+void Camera::Loader::depth_clip(float n, float f)
+{
+       obj.set_depth_clip(n, f);
+}
+
+void Camera::Loader::field_of_view(float a)
+{
+       obj.set_field_of_view(Geometry::Angle<float>::from_degrees(a));
+}
+
+void Camera::Loader::look_at(float x, float y, float z)
+{
+       obj.look_at(Vector3(x, y, z));
+}
+
+void Camera::Loader::look_direction(float x, float y, float z)
+{
+       obj.set_look_direction(Vector3(x, y, z));
+}
+
+void Camera::Loader::orthographic(float w, float h)
+{
+       obj.set_orthographic(w, h);
+}
+
+void Camera::Loader::position(float x, float y, float z)
+{
+       obj.set_position(Vector3(x, y, z));
+}
+
+void Camera::Loader::up_direction(float x, float y, float z)
+{
+       obj.set_up_direction(Vector3(x, y, z));
 }
 
 } // namespace GL