minor refactoring and state progress

[chaz/yoink] / src / MainLayer.cc

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 2266326402f89b475df8c1a57b3f4abd3dba9d37..85828c7f65dbfee150201d997ee6ffa0754e0b07 100644 (file)
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -27,9 +27,9 @@
 *******************************************************************************/
 
 #include <cstdlib>             // atexit, getenv
-#include <cstring>
 #include <iostream>
 #include <string>
+#include <unistd.h>            // access
 
 #include <Moof/Dispatcher.hh>
 #include <Moof/Exception.hh>
@@ -46,6 +46,7 @@
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "version.h"
 
 
 MainLayer::MainLayer()
@@ -61,9 +62,9 @@ MainLayer::~MainLayer()
 }
 
 
-void MainLayer::pushed(Mf::Engine& e)
+void MainLayer::pushed(Mf::Engine& engine)
 {
-       engine = &e;
+       mEngine = &engine;
 
        //Mf::Scalar coeff[] = {0.0, 1.0};
        //Mf::Lerp interp(coeff, 0.25);
@@ -73,7 +74,7 @@ void MainLayer::pushed(Mf::Engine& e)
                //Mf::Transition<Mf::Lerp>::alloc(gameLayer, Mf::LayerP(), interp);
        //engine->push(transition);
        //engine->push(GameLayer::alloc());
-       engine->push(TitleLayer::alloc());
+       mEngine->push(TitleLayer::alloc());
 }
 
 
@@ -99,17 +100,17 @@ bool MainLayer::handleEvent(const Mf::Event& event)
                        }
                        else if (event.key.keysym.sym == SDLK_f)
                        {
-                               engine->getVideo().toggleFull();
+                               mEngine->getVideo().toggleFull();
                        }
                        else if (event.key.keysym.sym == SDLK_l)
                        {
-                               Mf::Video& video = engine->getVideo();
+                               Mf::Video& video = mEngine->getVideo();
                                video.toggleCursorGrab();
                                video.toggleCursorVisible();
                        }
                        else if (event.key.keysym.sym == SDLK_y)
                        {
-                               engine->push(GameLayer::alloc());
+                               mEngine->push(GameLayer::alloc());
                        }
                        break;
 
@@ -132,7 +133,7 @@ void MainLayer::quit()
        // the operating system will take care of cleaning up
        exit(0);
 #else
-       engine->clear();
+       mEngine->clear();
 #endif
 }
 
@@ -171,12 +172,15 @@ void MainLayer::contextRecreated(const Mf::Notification* note)
 
 void printUsage()
 {
-       std::cout << "Usage: "PACKAGE" [-h|--help] [OPTION=VALUE]..." << std::endl
+       std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [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
+                         << "  -i, --info" << std::endl
+                         << "      show version and build information" << std::endl
                          << "  detail=1|2|3" << std::endl
                          << "      the level of detail of game scenes" << std::endl
                          << "  fullscreen=true|false" << std::endl
@@ -187,18 +191,84 @@ void printUsage()
                          << "See documentation for more options." << std::endl;
 }
 
+void printInfo(int argc, char* argv[])
+{
+       std::string assets;
+       std::string datadir;
+       std::string config;
+
+       assets.assign(YOINK_DATADIR);
+       int accessible = access(assets.c_str(), R_OK);
+       if (accessible != 0) assets += " (no access)";
+
+       char* temp = getenv("YOINK_DATADIR");
+       if (temp)
+       {
+               datadir = temp;
+               accessible = access(temp, R_OK);
+               if (accessible != 0) datadir += " (no access)";
+       }
+
+       temp = getenv("YOINKRC");
+       if (temp)
+       {
+               config = temp;
+               accessible = access(temp, R_OK);
+               if (accessible != 0) config += " (no access)";
+       }
+
+       std::cout << "   Executable: " << argv[0] << std::endl
+                         << "      Version: "VERSION << std::endl
+#ifdef __DATE__
+                         << "        Built: "__DATE__" "__TIME__ << std::endl
+#endif
+                         << "     Compiler: "COMPILER_STRING << std::endl
+                         << "       Assets: " << assets << std::endl
+                         << "Build options: "
+#ifdef NDEBUG
+                         << "-"
+#endif
+                         << "debug "
+#ifndef USE_DOUBLE_PRECISION
+                         << "-"
+#endif
+                         << "double-precision "
+#ifndef PROFILING_ENABLED
+                         << "-"
+#endif
+                         << "profile "
+#ifndef USE_THREADS
+                         << "-"
+#endif
+                         << "threads" << std::endl
+                         << "      YOINKRC: " << config << std::endl
+                         << "YOINK_DATADIR: " << datadir << std::endl;
+}
+
 void goodbye()
 {
        std::cout << std::endl << "Goodbye..." << std::endl << std::endl;
 }
 
+
+typedef cml::matrix< Mf::Scalar, cml::fixed<5,5>,
+               cml::col_basis, cml::col_major >                Matrix5;
+
 int main(int argc, char* argv[])
 {
-       if (argc > 1 &&
-                       (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0))
+       if (argc > 1)
        {
-               printUsage();
-               return 0;
+               std::string arg(argv[1]);
+               if (arg == "-h" || arg == "--help")
+               {
+                       printUsage();
+                       return 0;
+               }
+               else if (arg == "-i" || arg == "--info")
+               {
+                       printInfo(argc, argv);
+                       return 0;
+               }
        }
 
        std::cout << std::endl << PACKAGE_STRING << std::endl