X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.hh;h=47163d11c5bd14232e2c3340e00a7d7c77bc4118;hp=0a3c616a685a4774a4cde93561ad0e4741a2b134;hb=d6990468d297a6cbee98e4d0d33ab37e1b2352c9;hpb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c

diff --git a/src/Main.hh b/src/Main.hh
index 0a3c616..47163d1 100644
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -22,45 +22,39 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <moof/application.hh>
 #include <moof/dispatcher.hh>
 #include <moof/math.hh>
-#include <moof/view.hh>
+#include <moof/timer.hh>
 
 
-namespace moof
-{
-	class settings;
-	class view;
-}
-
-
-class Main;
-typedef boost::shared_ptr<Main> MainP;
-
-class Main : public moof::view
+class Main : public moof::application
 {
 public:
 
-	Main(moof::settings& settings, moof::video& video);
+	Main(moof::settings& settings);
 
 	void update(moof::scalar t, moof::scalar dt);
 	void draw(moof::scalar alpha) const;
-	bool handle_event(const moof::event& event);
+	void handle_event(const moof::event& event);
 
-	static std::string getSearchPath();
-	static std::string getConfigPath();
+	static std::string search_paths();
+	static std::string config_paths();
 
-	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 setup_opengl();
+
+	static void print_option(const std::string& option, bool enabled);
 
-	moof::dispatcher::handle mNewContextDispatch;
+	moof::dispatcher::handle	video_reloaded_;
+	moof::timer					hotload_timer_;
 };