minor refactoring and state progress

[chaz/yoink] / src / MainLayer.cc

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 2e687855dd73d03a557bcf2108d9940d1706ed4c..85828c7f65dbfee150201d997ee6ffa0754e0b07 100644 (file)
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -62,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);
@@ -74,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());
 }
 
 
@@ -100,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;
 
@@ -133,7 +133,7 @@ void MainLayer::quit()
        // the operating system will take care of cleaning up
        exit(0);
 #else
-       engine->clear();
+       mEngine->clear();
 #endif
 }
 
@@ -172,7 +172,8 @@ void MainLayer::contextRecreated(const Mf::Notification* note)
 
 void printUsage()
 {
-       std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [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
@@ -250,6 +251,8 @@ void goodbye()
 }
 
 
+typedef cml::matrix< Mf::Scalar, cml::fixed<5,5>,
+               cml::col_basis, cml::col_major >                Matrix5;
 
 int main(int argc, char* argv[])
 {