refactoring needed for win32 crash

[chaz/yoink] / src / Main.hh

diff --git a/src/MainLayer.hh b/src/Main.hh
similarity index 82%
rename from src/MainLayer.hh
rename to src/Main.hh
index 4f0fc77d3b2d254905b301734fc7f22895d85d66..1e9ecc9a29a755b569424d29178769eb54b47e3b 100644 (file)
--- a/src/MainLayer.hh
+++ b/src/Main.hh
@@ -26,11 +26,11 @@
 
 *******************************************************************************/
 
-#ifndef _MAINLAYER_HH_
-#define _MAINLAYER_HH_
+#ifndef _YOINKAPP_HH_
+#define _YOINKAPP_HH_
 
 /**
- * @file MainLayer.hh
+ * @file Main.hh
  * This is where all the fun begins.
  */
 
@@ -40,44 +40,49 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Dispatch.hh>
-#include <Moof/Engine.hh>
 #include <Moof/Layer.hh>
 #include <Moof/Math.hh>
 
 
-class MainLayer;
-typedef boost::shared_ptr<MainLayer> MainLayerP;
+class Main;
+typedef boost::shared_ptr<Main> MainP;
 
-class MainLayer : public Mf::Layer
+class Main : public Mf::Layer
 {
 public:
 
-       MainLayer();
+       Main();
 
-       static MainLayerP alloc()
+       static MainP alloc()
        {
-               return MainLayerP(new MainLayer);
+               return MainP(new Main);
        }
 
-       void pushedOntoEngine();
+       void addedToCore();
 
        void update(Mf::Scalar t, Mf::Scalar dt);
        void draw(Mf::Scalar alpha) const;
        bool handleEvent(const Mf::Event& event);
 
+       static std::string getSearchPath();
+       static std::string getConfigPath();
+
+       static void printUsage();
+       static void printInfo(int argc, char* argv[]);
+
 private:
 
        /**
         * Set OpenGL to a state we can know and depend on.
         */
-       void setupGL();
-       void contextRecreated();
+       static void setupGL();
+       static void contextRecreated();
 
        Mf::Dispatch::Handler   mDispatchHandler;
 };
 
 
-#endif // _MAINLAYER_HH_
+#endif // _YOINKAPP_HH_
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/