fixed layer bugs; generalized octree

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

diff --git a/src/Moof/Camera.hh b/src/Moof/Camera.hh
index 63d00749555a13c2052027dc8b0bb069e4856ecc..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)
        {
-               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_;
 };