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

diff --git a/source/camera.h b/source/camera.h
index 0390607d..11d42985 100644
--- a/source/camera.h
+++ b/source/camera.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_CAMERA_H_
 #define MSP_GL_CAMERA_H_
 
@@ -17,7 +10,7 @@ namespace GL {
 class Camera
 {
 private:
-	float fov;
+	Geometry::Angle<float> fov;
 	float aspect;
 	// Some compilers have "near" and "far" keywords
 	float clip_near;
@@ -30,10 +23,10 @@ private:
 public:
 	Camera();
 
-	void set_field_of_view(float);
+	void set_field_of_view(const Geometry::Angle<float> &);
 	void set_aspect(float);
 	void set_depth_clip(float, float);
-	float get_field_of_view() const { return fov; }
+	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; }
 	float get_far_clip() const { return clip_far; }
@@ -48,6 +41,7 @@ public:
 	const Matrix &get_matrix() const { return matrix; }
 
 	Vector3 project(const Vector4 &) const;
+	Vector3 project(const Vector3 &) const;
 	Vector4 unproject(const Vector4 &) const;
 
 	void apply() const;