fixed layer bugs; generalized octree

[chaz/yoink] / src / Moof / Camera.hh

diff --git a/src/Moof/Camera.hh b/src/Moof/Camera.hh
index b5927f438e0d3e27f376f8e5a559da6e5d9190f5..827c47f3384de021bcef0dfe0f5f1bf9cb90067d 100644 (file)
--- 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.0f);
+               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);