mesh and other random adjustments

[chaz/yoink] / src / Main.hh

diff --git a/src/Main.hh b/src/Main.hh
index 91a4b4c3d2701922db35fde2f1e01fa29d81e70e..4532e41ea2e3b4a409513fea1b30df1d9ab76a64 100644 (file)
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -13,7 +13,7 @@
 #define _MAIN_HH_
 
 /**
- * @file Main.hh
+ * \file Main.hh
  * This is where all the fun begins.
  */
 
@@ -22,46 +22,49 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Dispatch.hh>
-#include <Moof/Layer.hh>
-#include <Moof/Math.hh>
+#include <moof/dispatcher.hh>
+#include <moof/math.hh>
+#include <moof/timer.hh>
+#include <moof/view.hh>
+
+
+namespace moof
+{
+       class settings;
+       class view;
+}
 
 
 class Main;
 typedef boost::shared_ptr<Main> MainP;
 
-class Main : public Mf::Layer
+class Main : public moof::view
 {
 public:
 
-       Main();
+       Main(moof::settings& settings, moof::video& video);
 
-       static MainP alloc()
-       {
-               return MainP(new Main);
-       }
+       void update(moof::scalar t, moof::scalar dt);
+       void draw(moof::scalar alpha) const;
+       bool handle_event(const moof::event& event);
 
-       void addedToCore();
+       static std::string search_paths();
+       static std::string config_paths();
 
-       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[]);
+       static void print_usage();
+       static void print_info(int argc, char* argv[]);
 
 private:
 
        /**
         * Set OpenGL to a state we can know and depend on.
         */
-       static void setupGL();
-       static void contextCreated();
+       static void setup_opengl();
+
+       static void print_option(const std::string& option, bool enabled);
 
-       Mf::Dispatch::Handler   mDispatchHandler;
+       moof::dispatcher::handle        video_reloaded_;
+       moof::timer                                     hotload_timer_;
 };