remove some unused stlplus modules

[chaz/yoink] / src / Main.hh

diff --git a/src/Main.hh b/src/Main.hh
index 78d3b710a8eb9e0f0d36a952ea411f0a72763547..65ad901ccf700a8bb1d1a59cfae0609e27e50f71 100644 (file)
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -1,36 +1,17 @@
 
-/*******************************************************************************
-
- 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-2011, Charles McGarvey  [*****************************
+**]  All rights reserved.
+*
+* 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 +20,43 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Dispatch.hh>
-#include <Moof/Layer.hh>
-#include <Moof/Math.hh>
+#include <moof/application.hh>
+#include <moof/dispatcher.hh>
+#include <moof/math.hh>
+#include <moof/timer.hh>
 
+#include "yoink.hh"
 
-class Main;
-typedef boost::shared_ptr<Main> MainP;
 
-class Main : public Mf::Layer
+class Main : public moof::application
 {
 public:
 
-       Main();
-
-       static MainP alloc()
-       {
-               return MainP(new Main);
-       }
-
-       void addedToCore();
+       explicit Main(moof::settings& settings);
 
-       void update(Mf::Scalar t, Mf::Scalar dt);
-       void draw(Mf::Scalar alpha) const;
-       bool handleEvent(const Mf::Event& event);
+       void update(moof::scalar t, moof::scalar dt);
+       void draw(moof::scalar alpha) const;
+       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 contextCreated();
+       static void setup_opengl();
 
-       Mf::Dispatch::Handler   mDispatchHandler;
-};
+       moof::dispatcher::handle        video_reloaded_;
+       moof::timer                                     hotload_timer_;
 
+       ::yoink yoink;
+};
 
-#endif // _YOINKAPP_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
+#endif // _MAIN_HH_