X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.hh;h=4532e41ea2e3b4a409513fea1b30df1d9ab76a64;hp=78d3b710a8eb9e0f0d36a952ea411f0a72763547;hb=6f1b787a10d8ab1a3117a4b8c004dd2d90599608;hpb=4f9eb9259092994de9690cf12f11437c35a6791e

diff --git a/src/Main.hh b/src/Main.hh
index 78d3b71..4532e41 100644
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -1,36 +1,19 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
-
-#ifndef _YOINKAPP_HH_
-#define _YOINKAPP_HH_
+/*]  Copyright (c) 2009-2010, 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.
  */
 
@@ -39,50 +22,51 @@
 
 #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();
-
-	static MainP alloc()
-	{
-		return MainP(new Main);
-	}
+	Main(moof::settings& settings, moof::video& video);
 
-	void addedToCore();
+	void update(moof::scalar t, moof::scalar dt);
+	void draw(moof::scalar alpha) const;
+	bool handle_event(const moof::event& event);
 
-	void update(Mf::Scalar t, Mf::Scalar dt);
-	void draw(Mf::Scalar alpha) const;
-	bool handleEvent(const Mf::Event& event);
+	static std::string search_paths();
+	static std::string config_paths();
 
-	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();
 
-	Mf::Dispatch::Handler	mDispatchHandler;
-};
+	static void print_option(const std::string& option, bool enabled);
 
+	moof::dispatcher::handle	video_reloaded_;
+	moof::timer					hotload_timer_;
+};
 
-#endif // _YOINKAPP_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
+#endif // _MAIN_HH_