finally fixed broken main loop

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 7a8e98cc32471455749b47cf933df38e816d541c..46c32631aad077b362f9db36bebc7513bd179c10 100644 (file)
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -122,7 +122,7 @@ GameLayer::GameLayer() :
                        0.1, Mf::Timer::REPEAT);
 
        mState.heroine = Heroine::alloc();
-       mState.heroine->animation.startSequence("GreenDiamond");
+       mState.heroine->animation.startSequence("FlyDiagonallyUp");
 
        Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0};
        mState.interp.init(a, 5.0, Mf::Interpolator::OSCILLATE);
@@ -155,7 +155,7 @@ void GameLayer::update(Mf::Scalar t, Mf::Scalar dt)
        mState.scene->checkForCollision(*mState.heroine);
 
        mState.camera.setPosition(Mf::Vector3(-mState.heroine->getState().position[0],
-                               -mState.heroine->getState().position[1], -6));
+                               -mState.heroine->getState().position[1], -8));
        //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position));
 
        mRay.point = mState.heroine->getState().position;
@@ -193,9 +193,9 @@ void GameLayer::rayTimer()
        {
                hits.front().normal.normalize();
                mRay.solve(point, hits.front().distance);
-               Mf::logInfo << "scene: d = " << hits.front().distance << std::endl;
-               Mf::logInfo << "       P = " << point << std::endl;
-               Mf::logInfo << "       n = " << hits.front().normal << std::endl;
+               //Mf::logInfo << "scene: d = " << hits.front().distance << std::endl;
+               //Mf::logInfo << "       P = " << point << std::endl;
+               //Mf::logInfo << "       n = " << hits.front().normal << std::endl;
        }
 }
 
@@ -291,7 +291,7 @@ void GameLayer::setProjection()
 
 void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height)
 {
-       mState.camera.setProjection(cml::rad(60.0), width / height, 1.0, 200.0);
+       mState.camera.setProjection(cml::rad(45.0), width / height, 1.0, 200.0);
 }