X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcamera.h;h=412d69ff56bb83cd222e26805ffe784dca66563e;hb=0807680edd94a7f14560831db4dd52e4e48d0d19;hp=bfcc2987d860b8e258e3f4fa6bcaad3906853295;hpb=ea3487f52f8621f07deb47fa1af22a85b8b23519;p=libs%2Fgl.git

diff --git a/source/camera.h b/source/camera.h
index bfcc2987..412d69ff 100644
--- a/source/camera.h
+++ b/source/camera.h
@@ -11,12 +11,14 @@ 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;
+	Geometry::Angle<float> rotate;
 	Vector3 position;
 	Vector3 look_dir;
 	Vector3 up_dir;
@@ -28,13 +30,19 @@ 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);
+	void set_frustum_rotation(const Geometry::Angle<float> &);
 	const Geometry::Angle<float> &get_field_of_view() const { return fov; }
+	bool is_orthographic() const { return fov==Geometry::Angle<float>::zero(); }
+	float get_orthographic_width() const { return height*aspect; }
+	float get_orthographic_height() const { return height; }
 	float get_aspect() const { return aspect; }
 	float get_near_clip() const { return clip_near; }
 	float get_far_clip() const { return clip_far; }
+	const Geometry::Angle<float> &get_frustum_rotation() const { return rotate; }
 
 	void set_position(const Vector3 &);
 	void set_look_direction(const Vector3 &);
@@ -44,9 +52,6 @@ public:
 	const Vector3 &get_look_direction() const { return look_dir; }
 	const Vector3 &get_up_direction() const { return up_dir; }
 
-	/** 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; }
@@ -61,6 +66,7 @@ public:
 	Vector3 project(const Vector4 &) const;
 	Vector3 project(const Vector3 &) const;
 	Vector4 unproject(const Vector4 &) const;
+	Vector3 unproject(const Vector3 &) const;
 
 	void apply() const;