music.stream();
heroine = Heroine::alloc();
- heroine->getAnimation().startSequence("FlyDiagonallyUp");
+ heroine->animation.startSequence("FlyDiagonallyUp");
Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0};
interp.init(a, 2.0, Mf::Interpolator::OSCILLATE);
camera.update(t, dt);
heroine->update(t, dt);
+ scene->checkForCollision(*heroine);
+
//camera.lookAt(heroine->getSphere().point);
camera.setPosition(Mf::Vector3(-heroine->current.position[0],
-heroine->current.position[1], -256));
case SDL_KEYDOWN:
if (event.key.keysym.sym == SDLK_SPACE)
{
- heroine->getAnimation().startSequence("Flattened");
+ heroine->animation.startSequence("Flattened");
Mf::logInfo("thump!");
punchSound.play();
return true;
}
case SDL_KEYUP:
- heroine->handleEvent(event);
- break;
+ return heroine->handleEvent(event);
case SDL_MOUSEMOTION:
case SDL_MOUSEBUTTONDOWN: