X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FAnimation.hh;h=c8cdca8ed752c4b3addfdc4ee0ccd61906cabc19;hp=ac00679809b7da11931aef0d29e393fe1b59417e;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Animation.hh b/src/Animation.hh
index ac00679..c8cdca8 100644
--- a/src/Animation.hh
+++ b/src/Animation.hh
@@ -1,13 +1,11 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, Charles McGarvey  [*****************************
 **]  All rights reserved.
 *
-* vi:ts=4 sw=4 tw=75
-*
 * Distributable under the terms and conditions of the 2-clause BSD license;
 * see the file COPYING for a complete text of the license.
 *
-**************************************************************************/
+*****************************************************************************/
 
 #ifndef _ANIMATION_HH_
 #define _ANIMATION_HH_
@@ -21,8 +19,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Math.hh>
-#include <Moof/Resource.hh>
+#include <moof/math.hh>
 
 
 class Animation;
@@ -35,12 +32,8 @@ typedef boost::shared_ptr<Animation> AnimationP;
  * is determined.  This class is generic enough that a frame can mean just
  * about anything to whatever drawing context is used to render the frame.
  */
-
-class Animation : public Mf::Resource
+class Animation
 {
-	class Impl;
-	boost::shared_ptr<Impl> mImpl;
-
 public:
 
 	Animation(const std::string& name);
@@ -50,13 +43,15 @@ public:
 		return AnimationP(new Animation(name));
 	}
 
-
 	void startSequence(const std::string& name);
 
-	void update(Mf::Scalar t, Mf::Scalar dt);
+	void update(moof::scalar t, moof::scalar dt);
 	unsigned getFrame() const;
 
-	static std::string getPath(const std::string& name);
+private:
+
+	class impl;
+	boost::shared_ptr<impl> impl_;
 };