X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcamera.h;h=9a525e6b1d51077af5f06874ba0a4a56a3b6505d;hb=8dbd6316d277d2f9cbf85e7e61f2541421e01292;hp=11d42985c7bd4719a2073c4c16919b69b03b9979;hpb=60ca0094db80ea88ad546c98866f73a8d152e02b;p=libs%2Fgl.git

diff --git a/source/camera.h b/source/camera.h
index 11d42985..9a525e6b 100644
--- a/source/camera.h
+++ b/source/camera.h
@@ -11,21 +11,28 @@ class Camera
 {
 private:
 	Geometry::Angle<float> fov;
+	float height;
 	float aspect;
 	// Some compilers have "near" and "far" keywords
 	float clip_near;
 	float clip_far;
+	float frustum_x;
+	float frustum_y;
 	Vector3 position;
 	Vector3 look_dir;
 	Vector3 up_dir;
-	Matrix matrix;
+	Matrix view_matrix;
+	Matrix object_matrix;
+	Matrix proj_matrix;
 
 public:
 	Camera();
 
 	void set_field_of_view(const Geometry::Angle<float> &);
+	void set_orthographic(float, float);
 	void set_aspect(float);
 	void set_depth_clip(float, float);
+	void set_frustum_axis(float, float);
 	const Geometry::Angle<float> &get_field_of_view() const { return fov; }
 	float get_aspect() const { return aspect; }
 	float get_near_clip() const { return clip_near; }
@@ -38,7 +45,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;
@@ -47,7 +67,8 @@ public:
 	void apply() const;
 
 private:
-	void compute_matrix();
+	void update_projection_matrix();
+	void update_object_matrix();
 };
 
 } // namespace GL