X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FYoinkApp.cc;h=8690143d16b7356439849753bff0468ec8575a83;hb=ca0f7bdfba63140dca0bd20586d31980f3938eb2;hp=d36f6da3ef8f52f9f8e61d82c85a4f5cb6f655b4;hpb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;p=chaz%2Fyoink diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc index d36f6da..8690143 100644 --- a/src/YoinkApp.cc +++ b/src/YoinkApp.cc @@ -27,16 +27,16 @@ *******************************************************************************/ #include // getenv +#include #include #include -#include - #include #include #include #include #include +#include #include #include @@ -51,34 +51,24 @@ static std::string configFiles() { std::string files; - char* configFile = getenv("YOINKRC"); + // look in the configured data directory last of all char* dataDir = getenv("YOINK_DATADIR"); - - if (configFile) - { - // if a config file from the environment variable is specified, we want - // to load it first so it has precedence - files += configFile; - files += ":"; - } + files += (dataDir ? dataDir : YOINK_DATADIR); + files += "/yoinkrc"; // add the colon-delimited paths from configure + files += ":"; files += YOINK_CONFIGFILES; - if (dataDir) + char* configFile = getenv("YOINKRC"); + if (configFile) { - // if another data directory is set in the environment, look for a - // config file there + // if a config file from the environment variable is specified, we want + // to load it first so it has precedence files += ":"; - files += dataDir; - files += "/yoinkrc"; + files += configFile; } - // look in the configured data directory last of all - files += ":"; - files += (dataDir ? dataDir : YOINK_DATADIR); - files += "/yoinkrc"; - return files; } @@ -116,27 +106,18 @@ YoinkApp::YoinkApp(int argc, char* argv[]) : heroine = Character::alloc("RobotTrooper"); heroine->getAnimation().startSequence("Run"); - font = new TilemapFont; - - Mf::Scalar coeffs[4]; - coeffs[0] = 0.0; - coeffs[1] = 1.5; - coeffs[2] = -0.5; - coeffs[3] = 1.0; - interp.init(coeffs, 1.0, Mf::Interpolator::OSCILLATE); + Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0}; + interp.init(a, 2.0, Mf::Interpolator::OSCILLATE); - Mf::Scalar coeff[2] = {1.0, 0.0}; - fadeIn.init(coeff, 0.1); + Mf::Scalar b[2] = {1.0, 0.0}; + fadeIn.init(b, 1.0); - testScene = Mf::Scene::alloc("Test"); - heroine->treeNode = testScene->getOctree()->insert(heroine); + octree = Mf::loadScene("Classic"); + heroine->treeNode = octree->insert(heroine); } YoinkApp::~YoinkApp() { - //delete heroine; - delete font; - Mf::dispatcher::removeHandler(this); } @@ -175,31 +156,35 @@ void YoinkApp::setupGL() void YoinkApp::contextRecreated(const Mf::Notification* note) { - // Whenever the context and a new one created, it probably won't contain our - // state so we need to set that up again. + // Whenever the context is destroyed and a new one created, it probably + // won't contain our state so we need to set that up again. setupGL(); } void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt) { - //dt *= 0.5; + //dt *= 0.7; - music.update(t, dt); fadeIn.update(dt); camera.update(t, dt); heroine->update(t, dt); // reinsert heroine - heroine->treeNode = testScene->getOctree()->reinsert(heroine, heroine->treeNode); - testScene->getOctree()->print(heroine->treeNode); + heroine->treeNode = octree->reinsert(heroine, heroine->treeNode); + octree->print(heroine->treeNode); //camera.lookAt(heroine->getSphere().point); - camera.setPosition(Mf::Vector3(-heroine->current.position[0], -heroine->current.position[1], -256)); + camera.setPosition(Mf::Vector3(-heroine->current.position[0], + -heroine->current.position[1], -256)); + + Mf::Vector3 heroinePosition; + Mf::promoteVector(heroinePosition, heroine->current.position); + Mf::Sound::setListenerPosition(heroinePosition); interp.update(dt); - hud.setBar1Progress(interp.getValue()); - hud.setBar2Progress(1.0 - interp.getValue()); + hud.setBar1Progress(interp.getState(dt)); + hud.setBar2Progress(1.0 - interp.getState(dt)); } @@ -212,7 +197,11 @@ void YoinkApp::draw(Mf::Scalar alpha) // DRAW THE SCENE Mf::Texture::resetBind(); - testScene->draw(alpha, camera); + + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + + octree->drawIfVisible(alpha, camera.getFrustum()); //heroine->draw(alpha); heroine->getAabb().draw(); @@ -267,11 +256,6 @@ void YoinkApp::handleEvent(const Mf::Event& event) punchSound.play(); break; } - else if (event.key.keysym.sym == SDLK_r) - { - testScene->refresh(); - break; - } else if (event.key.keysym.sym == SDLK_t) { Mf::dispatcher::dispatch("video.context_recreated"); @@ -304,16 +288,41 @@ void YoinkApp::handleEvent(const Mf::Event& event) case SDL_VIDEORESIZE: glViewport(0, 0, event.resize.w, event.resize.h); hud.resize(event.resize.w, event.resize.h); - camera.setProjection(cml::rad(60.0), double(event.resize.w / event.resize.h), 32.0, 2500.0); + camera.setProjection(cml::rad(60.0), + double(event.resize.w) / double(event.resize.h), 32.0, 2500.0); camera.uploadProjectionToGL(); break; } } +void printUsage() +{ + std::cout << "Usage: "PACKAGE" [-h|--help] [OPTION=VALUE]..." << std::endl + << "The alien-smashing action game." << std::endl + << std::endl + << "Options:" << std::endl + << " -h, --help" << std::endl + << " show this help and exit" << std::endl + << " detail=1|2|3" << std::endl + << " the level of detail of game scenes" << std::endl + << " fullscreen=true|false" << std::endl + << " if true, uses the entire display" << std::endl + << " maxfps=num" << std::endl + << " the maximum number of frames per second" << std::endl + << std::endl + << "See documentation for more options." << std::endl; +} int main(int argc, char* argv[]) { + if (argc > 1 && + (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)) + { + printUsage(); + return 0; + } + std::cout << std::endl << PACKAGE_STRING << std::endl << "Compiled " << __TIME__ " " __DATE__ << std::endl << "Send patches and bug reports to <" @@ -324,7 +333,7 @@ int main(int argc, char* argv[]) #elif YOINK_LOGLEVEL >= 3 Mf::setLogLevel(Mf::LOG_INFO); #elif YOINK_LOGLEVEL >= 2 - Mf::setLogLevel(Mf::LOG_WARNING); + Mf::setLogLevel(Mf::LOG_SCRIPT); #elif YOINK_LOGLEVEL >= 1 Mf::setLogLevel(Mf::LOG_ERROR); #elif YOINK_LOGLEVEL @@ -342,7 +351,8 @@ int main(int argc, char* argv[]) { Mf::logError("unhandled exception: <<%s>>", e.what()); Mf::logInfo("it's time to crash now :-("); - status = 1; + //status = 1; + throw e; } std::cout << std::endl << "Goodbye..." << std::endl << std::endl;