new timer class

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 19564b5d903e559849bb1bb2865986a48c08eee1..24865c93fa741089fdd4b5fefdae6b097f7dfe77 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -37,14 +37,16 @@
 #include <iostream>
 #include <string>
 
+#include <Moof/Camera.hh>
 #include <Moof/Dispatcher.hh>
 #include <Moof/Engine.hh>
 #include <Moof/Interpolator.hh>
 #include <Moof/Math.hh>
 #include <Moof/Scene.hh>
+#include <Moof/Sound.hh>
 
 #include "Character.hh"
-#include "TilemapFont.hh"
+#include "Hud.hh"
 
 
 class YoinkApp : public Mf::Engine
@@ -62,20 +64,24 @@ private:
         * Set OpenGL to a state we can know and depend on.
         */
        void setupGL();
-       void contextRecreated(const Mf::Notification& note);
+       void contextRecreated(const Mf::Notification* note);
 
-       Character* someChar;
-       TilemapFont *font;
+       Mf::Sound music;
 
-       Mf::Cerpv2 interp;
-       Mf::Lerps fadeIn;
+       CharacterP heroine;
+       Mf::Sound punchSound;
 
-       Mf::Scene* testScene;
+       Mf::PolynomialInterpolator<5> interp;
+       Mf::Lerp fadeIn;
 
-       Mf::Scalar x, y, z;
+       Mf::Camera camera;
+       Mf::OctreeP octree;
 
-       Mf::Scalar state;
-       Mf::Scalar prevstate;
+       void myFunc(Mf::Timer& timer, Mf::Scalar t);
+       Mf::Timer myTimer;
+       int myThread();
+
+       Hud hud;
 };