X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FCamera.hh;h=827c47f3384de021bcef0dfe0f5f1bf9cb90067d;hp=63d00749555a13c2052027dc8b0bb069e4856ecc;hb=a4debfe4a5f5d339410788971b698ba00cb7f09c;hpb=72d4af22710317acffab861421c4364b1780b6fe

diff --git a/src/Moof/Camera.hh b/src/Moof/Camera.hh
index 63d0074..827c47f 100644
--- a/src/Moof/Camera.hh
+++ b/src/Moof/Camera.hh
@@ -46,7 +46,7 @@ public:
 	Camera() :
 		position_(0.0, 0.0, 0.0)
 	{
-		quaternion_rotation_world_y(rotation_, 0.0);
+		cml::quaternion_rotation_world_y(rotation_, SCALAR(0.0));
 		calculateSecondary();
 	}
 
@@ -56,7 +56,7 @@ public:
 	void setProjection(const Matrix4& projection);
 	void setProjection(Scalar fovy, Scalar aspect, Scalar near, Scalar far);
 
-	void uploadProjectionToGL() const;
+	void uploadToGL() const;
 
 	void lookAt(const Vector3& point);
 
@@ -70,7 +70,7 @@ public:
 		return frustum_;
 	}
 
-	void adjustFromInput(const Event& event);
+	void handleEvent(const Event& event);
 	void update(Scalar t, Scalar dt);
 
 private:
@@ -81,7 +81,7 @@ private:
 	Matrix4 	modelview_;
 	Frustum		frustum_;
 
-	Lerpv3		pInterp_;
+	Lerp3		pInterp_;
 };