game loop tweaks; shapes hierarchy defined

[chaz/yoink] / src / GameLayer.hh

diff --git a/src/GameLayer.hh b/src/GameLayer.hh
index 885a49daa3392d07de25369573c9f5112b3a005b..c537af6391569230118af2ee7ff72f086b5f3d1f 100644 (file)
--- a/src/GameLayer.hh
+++ b/src/GameLayer.hh
@@ -51,7 +51,7 @@ public:
                return GameLayerP(new GameLayer);
        }
 
-       void pushedOntoEngine();
+       void addedToCore();
 
        void update(Mf::Scalar t, Mf::Scalar dt);
        void draw(Mf::Scalar alpha) const;
@@ -75,9 +75,9 @@ private:
        Mf::SoundStream mMusic;
        Mf::Sound               mPunchSound;
 
-       Mf::Ray<2>              mRay;
-       Mf::Line<2>             mLine;
-       Mf::Sphere<2>   mSphere;
+       Mf::Ray2                mRay;
+       Mf::Line2               mLine;
+       Mf::Circle              mCircle;
 
        Mf::Timer               mRayTimer;
        void rayTimer();