X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcamera.cpp;h=ae35f632438df2d9a7a8a416f838deabde6b8320;hp=6cbcf6f492680f537559206d311049f26af5f1db;hb=0ab875bdc9fbf84ecfce883b188410bb45882447;hpb=50a0c7fd661fe6bfa3f929ad66e47cfab4a0fb87

diff --git a/source/camera.cpp b/source/camera.cpp
index 6cbcf6f4..ae35f632 100644
--- a/source/camera.cpp
+++ b/source/camera.cpp
@@ -56,6 +56,12 @@ void Camera::set_frustum_axis(float x, float y)
 	update_projection_matrix();
 }
 
+void Camera::set_frustum_rotation(const Geometry::Angle<float> &r)
+{
+	rotate = r;
+	update_projection_matrix();
+}
+
 void Camera::set_position(const Vector3 &p)
 {
 	position = p;
@@ -93,10 +99,15 @@ 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.y, r.z, p.w);
+	r = object_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;
@@ -105,7 +116,7 @@ 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);
@@ -115,6 +126,7 @@ void Camera::update_projection_matrix()
 		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()