X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FYoinkApp.hh;h=ad8d694e62619aee1c947e50f901e864310db95d;hb=57b78ebe21b1b48acd337daa5a1cb8c383959cfa;hp=65e730bccbeca19729edd2ae8a3330b5b1086280;hpb=fdfba4553433b9b2804c2772c7645211b828c2ea;p=chaz%2Fyoink diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh index 65e730b..ad8d694 100644 --- a/src/YoinkApp.hh +++ b/src/YoinkApp.hh @@ -69,8 +69,7 @@ private: void setupGL(); void contextRecreated(const Mf::Notification* note); - Mf::Lerps musicFade; - Mf::SoundStream music; + Mf::Sound music; CharacterP heroine; Mf::Sound punchSound; @@ -80,10 +79,7 @@ private: Mf::Lerps fadeIn; Mf::Camera camera; - Mf::Scene* testScene; - - Mf::Scalar state; - Mf::Scalar prevstate; + Mf::SceneP testScene; Hud hud; };