further implementing runloop support

[chaz/yoink] / src / yoink.hh

diff --git a/src/GameLayer.hh b/src/yoink.hh
similarity index 75%
rename from src/GameLayer.hh
rename to src/yoink.hh
index f3814430e72417f87cd007fe29f4ab23efec5656..cc4446a387875714cb950bb3769aaa5f54e15ed1 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/yoink.hh
@@ -9,11 +9,11 @@
 *
 **************************************************************************/
 
-#ifndef _GAMELAYER_HH_
-#define _GAMELAYER_HH_
+#ifndef _YOINK_HH_
+#define _YOINK_HH_
 
 /**
- * @file GameLayer.hh
+ * \file yoink.hh
  * This is the big enchilada.
  */
 
@@ -31,26 +31,16 @@
 #include <moof/ray.hh>
 #include <moof/sphere.hh>
 #include <moof/timer.hh>
-#include <moof/view.hh>
 
 #include "GameState.hh"
 #include "Hud.hh"
 
 
-class GameLayer;
-typedef boost::shared_ptr<GameLayer> GameLayerP;
-
-class GameLayer : public moof::view
+class yoink
 {
 public:
 
-       static GameLayerP alloc()
-       {
-               return GameLayerP(new GameLayer);
-       }
-       GameLayer();
-
-       void did_add_to_view();
+       yoink();
 
        void update(moof::scalar t, moof::scalar dt);
        void draw(moof::scalar alpha) const;
@@ -58,8 +48,8 @@ public:
 
 private:
 
-       void loadSceneLoader();
-       void advanceScene(moof::settings& settings);
+       void load_scene_loader();
+       void advance_scene();
 
        void projection();
        void projection(moof::scalar width, moof::scalar height);
@@ -80,5 +70,5 @@ private:
 };
 
 
-#endif // _GAMELAYER_HH_
+#endif // _YOINK_HH_