Initial implementation of Vulkan backend

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

diff --git a/source/render/camera.cpp b/source/render/camera.cpp
index 3bba0eaf38e00385e68a077474095a980a10f340..9ecb79cd80643d4ce4e4d77f045d4354aebb37af 100644 (file)
--- a/source/render/camera.cpp
+++ b/source/render/camera.cpp
@@ -2,21 +2,30 @@
 #include "camera.h"
 #include "matrix.h"
 
+using namespace std;
+
 namespace Msp {
 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),
-       frustum_x(0),
-       frustum_y(0),
-       position(0, 0, 0),
-       look_dir(0, 0, -1),
-       up_dir(0, 1, 0)
+Camera::Camera()
+{
+       update_projection_matrix();
+       update_object_matrix();
+}
+
+void Camera::copy_parameters(const Camera &source)
 {
+       fov = source.fov;
+       height = source.height;
+       aspect = source.aspect;
+       clip_near = source.clip_near;
+       clip_far = source.clip_far;
+       frustum_x = source.frustum_x;
+       frustum_y = source.frustum_y;
+       rotate = source.rotate;
+       position = source.position;
+       look_dir = source.look_dir;
+       up_dir = source.up_dir;
        update_projection_matrix();
        update_object_matrix();
 }
@@ -129,6 +138,11 @@ void Camera::update_projection_matrix()
        else
                proj_matrix = Matrix::ortho(left, right, bottom, top, clip_near, clip_far);
        proj_matrix = Matrix::rotation(rotate, Vector3(0, 0, 1))*proj_matrix;
+
+       adjust_projection_matrix(proj_matrix);
+
+       shdata.uniform("clip_eye_matrix", proj_matrix);
+       shdata.uniform("eye_clip_matrix", invert(proj_matrix));
 }
 
 void Camera::update_object_matrix()
@@ -141,6 +155,18 @@ void Camera::update_object_matrix()
        columns[3] = compose(position, 1.0f);
        matrix = Matrix::from_columns(columns);
        view_matrix = invert(matrix);
+
+       shdata.uniform("world_eye_matrix", matrix);
+       shdata.uniform("eye_world_matrix", view_matrix);
+}
+
+void Camera::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+       shdata.set_debug_name(name+" [UBO]");
+#else
+       (void)name;
+#endif
 }