X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcamera.cpp;h=e7c925c99064a8f911a694fb733281f9fcca1e5f;hb=05d70b38a546f35a7687cae6ae3fcd6ab78898b2;hp=ba8ff718d136744dbff8261d73b887a21258ef76;hpb=aa4d7203c90083af7fbcbe8368e55ad2f29d5ff1;p=libs%2Fgl.git

diff --git a/source/camera.cpp b/source/camera.cpp
index ba8ff718..e7c925c9 100644
--- a/source/camera.cpp
+++ b/source/camera.cpp
@@ -85,6 +85,14 @@ void Camera::look_at(const Vector3 &p)
 	set_look_direction(p-position);
 }
 
+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);
@@ -99,10 +107,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 = 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;
@@ -132,8 +145,8 @@ void Camera::update_object_matrix()
 	columns[1] = compose(cross(right_dir, look_dir), 0.0f);
 	columns[2] = compose(-look_dir, 0.0f);
 	columns[3] = compose(position, 1.0f);
-	object_matrix = Matrix::from_columns(columns);
-	view_matrix = invert(object_matrix);
+	matrix = Matrix::from_columns(columns);
+	view_matrix = invert(matrix);
 }
 
 } // namespace GL