X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.hh;h=65ad901ccf700a8bb1d1a59cfae0609e27e50f71;hp=aa4a0d9c028409bf75c3210f5b897f22cdf1a311;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc

diff --git a/src/Main.hh b/src/Main.hh
index aa4a0d9..65ad901 100644
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -1,19 +1,17 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, Charles McGarvey  [*****************************
 **]  All rights reserved.
 *
-* vi:ts=4 sw=4 tw=75
-*
 * Distributable under the terms and conditions of the 2-clause BSD license;
 * see the file COPYING for a complete text of the license.
 *
-**************************************************************************/
+*****************************************************************************/
 
 #ifndef _MAIN_HH_
 #define _MAIN_HH_
 
 /**
- * @file Main.hh
+ * \file Main.hh
  * This is where all the fun begins.
  */
 
@@ -22,45 +20,41 @@
 
 #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;
-}
+#include "yoink.hh"
 
 
-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);
+	explicit 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();
+
+	moof::dispatcher::handle	video_reloaded_;
+	moof::timer					hotload_timer_;
 
-	moof::dispatcher::handle mNewContextDispatch;
+	::yoink	yoink;
 };