From 5bd4477d4cf413e90a6b9ef5c8991798a687a0ec Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 20 Nov 2018 08:35:18 +0800 Subject: =?UTF-8?q?*=E6=9B=B4=E6=96=B0sprite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/graphics/animations/je_animation.h | 27 ++++++++++++++ src/libjin/graphics/animations/je_animator.cpp | 14 -------- src/libjin/graphics/animations/je_animator.h | 50 -------------------------- 3 files changed, 27 insertions(+), 64 deletions(-) delete mode 100644 src/libjin/graphics/animations/je_animator.cpp delete mode 100644 src/libjin/graphics/animations/je_animator.h (limited to 'src/libjin/graphics/animations') diff --git a/src/libjin/graphics/animations/je_animation.h b/src/libjin/graphics/animations/je_animation.h index 9926cf9..a13a83b 100644 --- a/src/libjin/graphics/animations/je_animation.h +++ b/src/libjin/graphics/animations/je_animation.h @@ -19,12 +19,34 @@ namespace JinEngine class Animation { public: + /// + /// + /// void update(float dt); + /// + /// + /// void start(); + + /// + /// + /// void pause(); + + /// + /// + /// void stop(); + + /// + /// Force rewind. + /// void rewind(); + + /// + /// + /// void setSpeed(float speed); /// @@ -44,6 +66,11 @@ namespace JinEngine /// void setCurrentFrame(uint frame); + /// + /// + /// + void render(float x, float y, float sx, float sy, float r); + private: /// /// Key frames. diff --git a/src/libjin/graphics/animations/je_animator.cpp b/src/libjin/graphics/animations/je_animator.cpp deleted file mode 100644 index 360bd5d..0000000 --- a/src/libjin/graphics/animations/je_animator.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "je_animator.h" - -namespace JinEngine -{ - namespace Graphics - { - namespace Animations - { - - - - } - } -} \ No newline at end of file diff --git a/src/libjin/graphics/animations/je_animator.h b/src/libjin/graphics/animations/je_animator.h deleted file mode 100644 index 6510a7d..0000000 --- a/src/libjin/graphics/animations/je_animator.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef __JE_ANIMATOR_H__ -#define __JE_ANIMATOR_H__ - -#include -#include -#include - -#include "je_animation.h" - -namespace JinEngine -{ - namespace Graphics - { - namespace Animations - { - - /// - /// - /// - class Animator - { - public: - void addAnimation(const std::string& key, Animation* clip); - bool hasKey(const std::string& key); - - void play(); - void switchAnimation(const std::string& key); - - /// - /// Control clips. - /// - void stopAnimation(); - void pauseAnimation(); - void rewindAnimation(); - void startAnimation(); - - private: - /// - /// Map a key to clips. - /// - std::map mAnimations; - Animation* mCurrentAnimation; - - }; - - } // namespace Animations - } // namespace Graphics -} // namespace JinEngine - -#endif \ No newline at end of file -- cgit v1.1-26-g67d0