settings subsystem now using lua

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 77f5c7318d0a9b8f7676e305f020c4d492ae2b7a..8690143d16b7356439849753bff0468ec8575a83 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -27,16 +27,16 @@
 *******************************************************************************/
 
 #include <cstdlib>             // getenv
+#include <cstring>
 #include <iostream>
 #include <string>
 
-#include <boost/bind.hpp>
-
 #include <Moof/Exception.hh>
 #include <Moof/Log.hh>
 #include <Moof/Math.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Settings.hh>
+#include <Moof/Thread.hh>
 #include <Moof/Timer.hh>
 #include <Moof/Video.hh>
 
@@ -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,13 +106,13 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
        heroine = Character::alloc("RobotTrooper");
        heroine->getAnimation().startSequence("Run");
 
-       Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -1.5, 1.0};
+       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 b[2] = {1.0, 0.0};
        fadeIn.init(b, 1.0);
 
-       octree = Mf::loadScene("Test");
+       octree = Mf::loadScene("Classic");
        heroine->treeNode = octree->insert(heroine);
 }
 
@@ -176,7 +166,6 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
 {
        //dt *= 0.7;
 
-       music.update(t, dt);
        fadeIn.update(dt);
        camera.update(t, dt);
        heroine->update(t, dt);
@@ -186,7 +175,12 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
        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.getState(dt));
@@ -294,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 <"
@@ -314,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