X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FAnimation.hh;h=3875b45f4819dccb880d4df763fbd676a8f4a708;hp=5cfd2604a32966aec745390251ba97ba6609e907;hb=e0fb747f2e647115d0b8953615c254d25c045345;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/Animation.hh b/src/Animation.hh
index 5cfd260..3875b45 100644
--- a/src/Animation.hh
+++ b/src/Animation.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, 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_
@@ -38,26 +21,23 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Math.hh>
-#include <Moof/Resource.hh>
+#include <moof/math.hh>
+#include <moof/resource.hh>
 
 
 class Animation;
 typedef boost::shared_ptr<Animation> AnimationP;
 
 /**
- * A class to manage frame-based animation.  Animation sequences can be loaded
- * from file, then named sequences are started.  The animation is updated
- * periodically (each update cycle), and the correct current frame 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.
+ * A class to manage frame-based animation.  Animation sequences can be
+ * loaded from file, then named sequences are started.  The animation is
+ * updated periodically (each update cycle), and the correct current frame
+ * 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 : public moof::resource
 {
-	class Impl;
-	boost::shared_ptr<Impl> mImpl;
-
 public:
 
 	Animation(const std::string& name);
@@ -70,14 +50,16 @@ public:
 
 	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_;
 };
 
 
 #endif // _ANIMATION_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-