*
**************************************************************************/
-#include "../config.h"
+#include "config.h"
#include <stdexcept>
state_.script.import_standard_libraries();
moof::log::import(state_.script);
- std::string path("loader");
- if (!moof::resource::find(path))
+ std::string path = moof::resource::find_file("scenes/loader.lua");
+ if (path.empty())
{
throw std::runtime_error("cannot find scene loader script");
}
GameLayer::GameLayer()
{
moof::log_info("about to load sound resource...");
- music_ = moof::resource::load("sounds/NightFusionIntro.ogg");
- if (music_)
- {
- music_->loop(true);
- music_->enqueue("NightFusionLoop");
- }
- else moof::log_error("music not loaded");
-
- //music_->position(moof::vector3(10.0, 5.0, 0.0));
+ music_.sample("sounds/NightFusionIntro.ogg");
+ music_.loop(true);
+ music_.enqueue("sounds/NightFusionLoop.ogg");
+ music_.position(moof::vector3(10.0, 5.0, 0.0));
mThinkTimer.init(boost::bind(&GameLayer::thinkTimer, this),
0.1, moof::timer::repeat);
state_.heroine->animation.startSequence("FlyDiagonallyUp");
state_.interp.init(0.0, 1.0, 4.0, moof::lerp_scalar::oscillate);
+
+ sceneMesh = moof::resource::load("classic.ac");
}
{
bool isMute = false;
settings().get("nomusic", isMute);
- if (!isMute) music_->play();
+ music_.stream();
loadSceneLoader();
advanceScene(settings()); // load the first scene
state_.camera.upload_to_gl(alpha);
// DRAW THE SCENE
- moof::texture::reset_binding();
+ moof::image::reset_binding();
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
- state_.scene->draw_if_visible(alpha, state_.camera.frustum());
+ //state_.scene->draw_if_visible(alpha, state_.camera.frustum());
+ sceneMesh->draw(alpha);
state_.heroine->draw(alpha);
mRay.draw();
{
state_.heroine->animation.startSequence("Flattened");
moof::log_info("thump!");
- //mPunchSound.play();
+ punch_sound_.play();
return true;
}
else if (event.key.keysym.sym == SDLK_m)
{
- music_->toggle();
+ music_.toggle();
return true;
}
else if (event.key.keysym.sym == SDLK_PAGEUP)