X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FCamera.hh;h=827c47f3384de021bcef0dfe0f5f1bf9cb90067d;hb=64bd443538f57ad1bdff6c6b35953e72141129b2;hp=72df5db6703fcc3d90e3c25fb615ccc3c250f7d5;hpb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc;p=chaz%2Fyoink

diff --git a/src/Moof/Camera.hh b/src/Moof/Camera.hh
index 72df5db..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)
 	{
-		cml::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);
 
@@ -81,7 +81,7 @@ private:
 	Matrix4 	modelview_;
 	Frustum		frustum_;
 
-	Lerpv3		pInterp_;
+	Lerp3		pInterp_;
 };