X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FCamera.hh;h=8e28f5420fe4e64de32130e88716abe4e7b515b6;hp=827c47f3384de021bcef0dfe0f5f1bf9cb90067d;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hpb=31d52677b38d935297d132bdbd956c655cd3feee

diff --git a/src/Moof/Camera.hh b/src/Moof/Camera.hh
index 827c47f..8e28f54 100644
--- a/src/Moof/Camera.hh
+++ b/src/Moof/Camera.hh
@@ -31,57 +31,63 @@
 
 #include <Moof/Event.hh>
 #include <Moof/Frustum.hh>
-#include <Moof/Interpolator.hh>
 #include <Moof/Math.hh>
+#include <Moof/RigidBody.hh>
 
 
 namespace Mf {
 
 
-class Camera
+class Camera : public RigidBody3
 {
-	void calculateSecondary();
-
 public:
-	Camera() :
-		position_(0.0, 0.0, 0.0)
+
+	Camera()
 	{
-		cml::quaternion_rotation_world_y(rotation_, SCALAR(0.0));
-		calculateSecondary();
+		mState.init();
+		mPrevState.init();
+
+		cml::quaternion_rotation_world_y(mState.orientation, SCALAR(0.0));
 	}
 
-	void setPosition(const Vector3& point);
+	void setPosition(const Vector3& position);
 	void setRotation(const Quaternion& rotation);
 
+	void lookAt(const Vector3& point);
+
 	void setProjection(const Matrix4& projection);
 	void setProjection(Scalar fovy, Scalar aspect, Scalar near, Scalar far);
 
-	void uploadToGL() const;
-
-	void lookAt(const Vector3& point);
+	const Matrix4& getModelview() const
+	{
+		return mModelview;
+	}
 
-	const Matrix4& getModelviewMatrix() const
+	const Matrix4& getProjection() const
 	{
-		return modelview_;
+		return mProjection;
 	}
 
 	const Frustum& getFrustum() const
 	{
-		return frustum_;
+		return mFrustum;
 	}
 
-	void handleEvent(const Event& event);
+
+	void uploadToGL(Scalar alpha = 0) const;
+
 	void update(Scalar t, Scalar dt);
+	void draw(Scalar alpha = 0) const;
+	void handleEvent(const Event& event);
 
 private:
-	Vector3 	position_;
-	Quaternion	rotation_;
-	Matrix4		projection_;
 
-	Matrix4 	modelview_;
-	Frustum		frustum_;
+	void calculate(Scalar alpha) const;
+
+	mutable Matrix4 	mModelview;
+	Matrix4				mProjection;
 
-	Lerp3		pInterp_;
+	mutable Frustum		mFrustum;
 };