X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fcamera.cpp;h=9ecb79cd80643d4ce4e4d77f045d4354aebb37af;hb=99ca354f18119f82f1adeca100cd665a8f640317;hp=9b8b0c778d0c5fc68f784efaee4c74b886801ddb;hpb=a275d25eccad43716c5dcf91f8bc4af2a53c0445;p=libs%2Fgl.git

diff --git a/source/render/camera.cpp b/source/render/camera.cpp
index 9b8b0c77..9ecb79cd 100644
--- a/source/render/camera.cpp
+++ b/source/render/camera.cpp
@@ -7,22 +7,29 @@ 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();
+}
+
 void Camera::set_field_of_view(const Geometry::Angle<float> &f)
 {
 	fov = f;
@@ -132,7 +139,10 @@ void Camera::update_projection_matrix()
 		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()
@@ -146,6 +156,7 @@ void Camera::update_object_matrix()
 	matrix = Matrix::from_columns(columns);
 	view_matrix = invert(matrix);
 
+	shdata.uniform("world_eye_matrix", matrix);
 	shdata.uniform("eye_world_matrix", view_matrix);
 }