X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcamera.h;h=d96ada81e45c4c26840e79c4b813f6034c1a8d82;hp=412d69ff56bb83cd222e26805ffe784dca66563e;hb=05d70b38a546f35a7687cae6ae3fcd6ab78898b2;hpb=47cfca889482f00093ee6fdeaf4f478dc5ea90f2

diff --git a/source/camera.h b/source/camera.h
index 412d69ff..d96ada81 100644
--- a/source/camera.h
+++ b/source/camera.h
@@ -1,13 +1,12 @@
 #ifndef MSP_GL_CAMERA_H_
 #define MSP_GL_CAMERA_H_
 
-#include "matrix.h"
-#include "vector.h"
+#include "placeable.h"
 
 namespace Msp {
 namespace GL {
 
-class Camera
+class Camera: public Placeable
 {
 private:
 	Geometry::Angle<float> fov;
@@ -23,7 +22,6 @@ private:
 	Vector3 look_dir;
 	Vector3 up_dir;
 	Matrix view_matrix;
-	Matrix object_matrix;
 	Matrix proj_matrix;
 
 public:
@@ -52,13 +50,18 @@ public:
 	const Vector3 &get_look_direction() const { return look_dir; }
 	const Vector3 &get_up_direction() const { return up_dir; }
 
+	virtual void set_matrix(const Matrix &m) { set_object_matrix(m); }
+
+	/** Sets the position and orientation of the camera from an object matrix. */
+	void set_object_matrix(const 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; }
+	const Matrix &get_object_matrix() const { return matrix; }
 
 	/** Returns the projection matrix. */
 	const Matrix &get_projection_matrix() const { return proj_matrix; }