X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fcamera.cpp;h=8b966464fd14d2ed42eb478d4b025f95bc1fbcfa;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=3bba0eaf38e00385e68a077474095a980a10f340;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/render/camera.cpp b/source/render/camera.cpp
index 3bba0eaf..8b966464 100644
--- a/source/render/camera.cpp
+++ b/source/render/camera.cpp
@@ -2,6 +2,8 @@
 #include "camera.h"
 #include "matrix.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -129,6 +131,9 @@ 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;
+
+	shdata.uniform("clip_eye_matrix", proj_matrix);
+	shdata.uniform("eye_clip_matrix", invert(proj_matrix));
 }
 
 void Camera::update_object_matrix()
@@ -141,6 +146,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
 }