X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcamera.h;h=bfcc2987d860b8e258e3f4fa6bcaad3906853295;hb=5ae4b0008b25072b5716f0cb585133315625a661;hp=a0e4d6f65fb3215a5d8f64e2fbc1fef58347377f;hpb=fac4decfa4744ac6dc7f13c0348b0ec1ec80f6a4;p=libs%2Fgl.git

diff --git a/source/camera.h b/source/camera.h
index a0e4d6f6..bfcc2987 100644
--- a/source/camera.h
+++ b/source/camera.h
@@ -20,7 +20,9 @@ private:
 	Vector3 position;
 	Vector3 look_dir;
 	Vector3 up_dir;
-	Matrix matrix;
+	Matrix view_matrix;
+	Matrix object_matrix;
+	Matrix proj_matrix;
 
 public:
 	Camera();
@@ -41,7 +43,20 @@ public:
 	const Vector3 &get_position() const { return position; }
 	const Vector3 &get_look_direction() const { return look_dir; }
 	const Vector3 &get_up_direction() const { return up_dir; }
-	const Matrix &get_matrix() const { return matrix; }
+
+	/** Deprecated alias for get_view_matrix. */
+	const Matrix &get_matrix() const { return get_view_matrix(); }
+
+	/** Returns the view matrix, used to transform coordinates from world space
+	to eye space. */
+	const Matrix &get_view_matrix() const { return view_matrix; }
+
+	/** Returns the object matrix, used to transform coordinates from eye space
+	to world space. */
+	const Matrix &get_object_matrix() const { return object_matrix; }
+
+	/** Returns the projection matrix. */
+	const Matrix &get_projection_matrix() const { return proj_matrix; }
 
 	Vector3 project(const Vector4 &) const;
 	Vector3 project(const Vector3 &) const;
@@ -50,7 +65,8 @@ public:
 	void apply() const;
 
 private:
-	void compute_matrix();
+	void update_projection_matrix();
+	void update_object_matrix();
 };
 
 } // namespace GL