[deploy] Merge pull request #66 from KiwanoEngine/animation

Refactoring animation

.gitignore

@@ -13,6 +13,7 @@ Release/
 # Application folders
 .vs
 .idea
+._Kiwano.sln
 
 # vs2010
 ipch/

projects/kiwano/kiwano.vcxproj

@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="..\..\src\kiwano\2d\action\Action.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionDelay.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionGroup.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionScheduler.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionWalk.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionTween.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\action\Animation.h" />
     <ClInclude Include="..\..\src\kiwano\2d\Actor.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\Animation.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\DelayAnimation.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\AnimationGroup.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\Animator.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\FrameSequence.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\TweenAnimation.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\PathAnimation.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\AnimationWrapper.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\CustomAnimation.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\FrameAnimation.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\animation\EaseFunc.h" />
     <ClInclude Include="..\..\src\kiwano\2d\GifSprite.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\SpriteFrame.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\transition\BoxTransition.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\transition\FadeTransition.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\transition\MoveTransition.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\transition\RotationTransition.h" />
+    <ClInclude Include="..\..\src\kiwano\2d\transition\Transition.h" />
     <ClInclude Include="..\..\src\kiwano\base\component\Button.h" />
     <ClInclude Include="..\..\src\kiwano\base\component\Component.h" />
     <ClInclude Include="..\..\src\kiwano\base\component\ComponentManager.h" />
@@ -20,6 +30,7 @@
     <ClInclude Include="..\..\src\kiwano\base\RefPtr.h" />
     <ClInclude Include="..\..\src\kiwano\core\Allocator.h" />
     <ClInclude Include="..\..\src\kiwano\core\Any.h" />
+    <ClInclude Include="..\..\src\kiwano\core\BinaryData.h" />
     <ClInclude Include="..\..\src\kiwano\core\BitOperator.h" />
     <ClInclude Include="..\..\src\kiwano\core\Cloneable.h" />
     <ClInclude Include="..\..\src\kiwano\core\Common.h" />
@@ -29,7 +40,6 @@
     <ClInclude Include="..\..\src\kiwano\core\Flag.h" />
     <ClInclude Include="..\..\src\kiwano\core\Function.h" />
     <ClInclude Include="..\..\src\kiwano\core\IntrusiveList.h" />
-    <ClInclude Include="..\..\src\kiwano\core\Keys.h" />
     <ClInclude Include="..\..\src\kiwano\core\Library.h" />
     <ClInclude Include="..\..\src\kiwano\core\Serializable.h" />
     <ClInclude Include="..\..\src\kiwano\core\Singleton.h" />
@@ -54,7 +64,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\Stage.h" />
     <ClInclude Include="..\..\src\kiwano\2d\Sprite.h" />
     <ClInclude Include="..\..\src\kiwano\2d\TextActor.h" />
-    <ClInclude Include="..\..\src\kiwano\2d\Transition.h" />
     <ClInclude Include="..\..\src\kiwano\core\Resource.h" />
     <ClInclude Include="..\..\src\kiwano\core\RefBasePtr.hpp" />
     <ClInclude Include="..\..\src\kiwano\math\Constants.h" />
@@ -69,6 +78,7 @@
     <ClInclude Include="..\..\src\kiwano\platform\Application.h" />
     <ClInclude Include="..\..\src\kiwano\platform\FileSystem.h" />
     <ClInclude Include="..\..\src\kiwano\platform\Input.h" />
+    <ClInclude Include="..\..\src\kiwano\platform\Keys.h" />
     <ClInclude Include="..\..\src\kiwano\platform\Runner.h" />
     <ClInclude Include="..\..\src\kiwano\platform\win32\ComPtr.hpp" />
     <ClInclude Include="..\..\src\kiwano\platform\win32\libraries.h" />
@@ -87,8 +97,6 @@
     <ClInclude Include="..\..\src\kiwano\render\DirectX\RendererImpl.h" />
     <ClInclude Include="..\..\src\kiwano\render\DirectX\TextRenderer.h" />
     <ClInclude Include="..\..\src\kiwano\render\Font.h" />
-    <ClInclude Include="..\..\src\kiwano\render\Frame.h" />
-    <ClInclude Include="..\..\src\kiwano\render\FrameSequence.h" />
     <ClInclude Include="..\..\src\kiwano\render\NativeObject.h" />
     <ClInclude Include="..\..\src\kiwano\render\Shape.h" />
     <ClInclude Include="..\..\src\kiwano\render\ShapeMaker.h" />
@@ -115,23 +123,31 @@
     <ClInclude Include="..\..\src\kiwano\utils\Xml.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\kiwano\2d\action\Action.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionDelay.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionGroup.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionScheduler.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionWalk.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionTween.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\action\Animation.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Actor.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\Animation.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\DelayAnimation.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\AnimationGroup.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\Animator.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\FrameSequence.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\TweenAnimation.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\PathAnimation.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\CustomAnimation.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\FrameAnimation.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\animation\EaseFunc.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\DebugActor.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\GifSprite.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\LayerActor.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.h.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Stage.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp" />
     <ClCompile Include="..\..\src\kiwano\2d\TextActor.cpp" />
-    <ClCompile Include="..\..\src\kiwano\2d\Transition.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\transition\BoxTransition.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\transition\FadeTransition.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\transition\MoveTransition.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\transition\RotationTransition.cpp" />
+    <ClCompile Include="..\..\src\kiwano\2d\transition\Transition.cpp" />
     <ClCompile Include="..\..\src\kiwano\base\component\Button.cpp" />
     <ClCompile Include="..\..\src\kiwano\base\component\Component.cpp" />
     <ClCompile Include="..\..\src\kiwano\base\component\ComponentManager.cpp" />
@@ -169,8 +185,6 @@
     <ClCompile Include="..\..\src\kiwano\render\DirectX\RendererImpl.cpp" />
     <ClCompile Include="..\..\src\kiwano\render\DirectX\TextRenderer.cpp" />
     <ClCompile Include="..\..\src\kiwano\render\Font.cpp" />
-    <ClCompile Include="..\..\src\kiwano\render\Frame.cpp" />
-    <ClCompile Include="..\..\src\kiwano\render\FrameSequence.cpp" />
     <ClCompile Include="..\..\src\kiwano\render\NativeObject.cpp" />
     <ClCompile Include="..\..\src\kiwano\render\Shape.cpp" />
     <ClCompile Include="..\..\src\kiwano\render\ShapeMaker.cpp" />

projects/kiwano/kiwano.vcxproj.filters

@@ -16,9 +16,6 @@
     <Filter Include="core">
       <UniqueIdentifier>{2e18d99a-e906-499a-9e29-4e0783202644}</UniqueIdentifier>
     </Filter>
-    <Filter Include="2d\action">
-      <UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="platform\win32">
       <UniqueIdentifier>{e84dcf9a-e650-473e-8c9c-193804ab9e76}</UniqueIdentifier>
     </Filter>
@@ -37,6 +34,12 @@
     <Filter Include="base\component">
       <UniqueIdentifier>{d15f4de1-7c2c-40d6-a3ce-68860b95a61e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="2d\animation">
+      <UniqueIdentifier>{9314f30d-5742-48b6-94e5-e3b4284106f6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="2d\transition">
+      <UniqueIdentifier>{f70cecd8-6d5b-405d-8466-d3ca2db9b806}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\kiwano\2d\Canvas.h">
@@ -45,9 +48,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\Sprite.h">
       <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\Transition.h">
-      <Filter>2d</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\core\Resource.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -72,15 +72,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\Stage.h">
       <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionGroup.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionTween.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\Animation.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\utils\ResourceCache.h">
       <Filter>utils</Filter>
     </ClInclude>
@@ -90,12 +81,6 @@
     <ClInclude Include="..\..\src\kiwano\2d\ShapeActor.h">
       <Filter>2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionDelay.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionWalk.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\utils\UserData.h">
       <Filter>utils</Filter>
     </ClInclude>
@@ -126,9 +111,6 @@
     <ClInclude Include="..\..\src\kiwano\core\Common.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\core\Keys.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\core\Time.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -255,12 +237,6 @@
     <ClInclude Include="..\..\src\kiwano\core\Serializable.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\render\Frame.h">
-      <Filter>render</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\render\FrameSequence.h">
-      <Filter>render</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\utils\EventTicker.h">
       <Filter>utils</Filter>
     </ClInclude>
@@ -282,9 +258,6 @@
     <ClInclude Include="..\..\src\kiwano\utils\TaskScheduler.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\ActionScheduler.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\render\DirectX\D3DDeviceResources.h">
       <Filter>render\DirectX</Filter>
     </ClInclude>
@@ -342,9 +315,6 @@
     <ClInclude Include="..\..\src\kiwano\core\Defer.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kiwano\2d\action\Action.h">
-      <Filter>2d\action</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\kiwano\base\RefObject.h">
       <Filter>base</Filter>
     </ClInclude>
@@ -369,6 +339,63 @@
     <ClInclude Include="..\..\src\kiwano\core\Value.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\EaseFunc.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\FrameAnimation.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\CustomAnimation.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\Animation.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\DelayAnimation.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\AnimationGroup.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\TweenAnimation.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\PathAnimation.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\Animator.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\FrameSequence.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\animation\AnimationWrapper.h">
+      <Filter>2d\animation</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\core\BinaryData.h">
+      <Filter>core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\SpriteFrame.h">
+      <Filter>2d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\platform\Keys.h">
+      <Filter>platform</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\transition\Transition.h">
+      <Filter>2d\transition</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\transition\FadeTransition.h">
+      <Filter>2d\transition</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\transition\MoveTransition.h">
+      <Filter>2d\transition</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\transition\RotationTransition.h">
+      <Filter>2d\transition</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kiwano\2d\transition\BoxTransition.h">
+      <Filter>2d\transition</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\kiwano\2d\Canvas.cpp">
@@ -377,9 +404,6 @@
     <ClCompile Include="..\..\src\kiwano\2d\Sprite.cpp">
       <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\Transition.cpp">
-      <Filter>2d</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\core\Resource.cpp">
       <Filter>core</Filter>
     </ClCompile>
@@ -392,15 +416,6 @@
     <ClCompile Include="..\..\src\kiwano\2d\Stage.cpp">
       <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionGroup.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionTween.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\Animation.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\utils\ResourceCache.cpp">
       <Filter>utils</Filter>
     </ClCompile>
@@ -410,12 +425,6 @@
     <ClCompile Include="..\..\src\kiwano\2d\ShapeActor.cpp">
       <Filter>2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionDelay.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionWalk.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\utils\UserData.cpp">
       <Filter>utils</Filter>
     </ClCompile>
@@ -518,12 +527,6 @@
     <ClCompile Include="..\..\src\kiwano\core\Allocator.cpp">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\render\Frame.cpp">
-      <Filter>render</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\render\FrameSequence.cpp">
-      <Filter>render</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\utils\EventTicker.cpp">
       <Filter>utils</Filter>
     </ClCompile>
@@ -539,9 +542,6 @@
     <ClCompile Include="..\..\src\kiwano\utils\TaskScheduler.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\ActionScheduler.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\utils\Logger.cpp">
       <Filter>utils</Filter>
     </ClCompile>
@@ -587,9 +587,6 @@
     <ClCompile Include="..\..\src\kiwano\utils\ConfigIni.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kiwano\2d\action\Action.cpp">
-      <Filter>2d\action</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\kiwano\base\RefObject.cpp">
       <Filter>base</Filter>
     </ClCompile>
@@ -605,6 +602,54 @@
     <ClCompile Include="..\..\src\kiwano\core\Duration.cpp">
       <Filter>core</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\EaseFunc.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\FrameAnimation.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\CustomAnimation.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\Animation.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\DelayAnimation.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\AnimationGroup.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\TweenAnimation.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\PathAnimation.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\Animator.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\animation\FrameSequence.cpp">
+      <Filter>2d\animation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\SpriteFrame.h.cpp">
+      <Filter>2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\transition\Transition.cpp">
+      <Filter>2d\transition</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\transition\FadeTransition.cpp">
+      <Filter>2d\transition</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\transition\MoveTransition.cpp">
+      <Filter>2d\transition</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\transition\RotationTransition.cpp">
+      <Filter>2d\transition</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kiwano\2d\transition\BoxTransition.cpp">
+      <Filter>2d\transition</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="suppress_warning.ruleset" />

src/kiwano-audio/Transcoder.cpp

@@ -94,7 +94,7 @@ HRESULT Transcoder::LoadMediaResource(const Resource& res)
     ComPtr<IMFByteStream>   byte_stream;
     ComPtr<IMFSourceReader> reader;
 
-    Resource::Data data = res.GetData();
+    BinaryData data = res.GetData();
     if (!data.IsValid())
     {
         return E_FAIL;

src/kiwano/2d/Actor.cpp

@@ -70,7 +70,7 @@ Actor::~Actor()
 
 void Actor::Update(Duration dt)
 {
-    ActionScheduler::Update(this, dt);
+    Animator::Update(this, dt);
     TaskScheduler::Update(dt);
     ComponentManager::Update(dt);
 

src/kiwano/2d/Actor.h

@@ -25,7 +25,7 @@
 #include <kiwano/base/component/ComponentManager.h>
 #include <kiwano/event/EventDispatcher.h>
 #include <kiwano/utils/TaskScheduler.h>
-#include <kiwano/2d/action/ActionScheduler.h>
+#include <kiwano/2d/animation/Animator.h>
 
 namespace kiwano
 {
@@ -62,8 +62,8 @@ typedef IntrusiveList<ActorPtr> ActorList;
  */
 class KGE_API Actor
     : public ObjectBase
+    , public Animator
     , public TaskScheduler
-    , public ActionScheduler
     , public EventDispatcher
     , public ComponentManager
     , protected IntrusiveListValue<ActorPtr>

src/kiwano/2d/Canvas.h

@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/2d/Actor.h>
-#include <kiwano/render/Frame.h>
+#include <kiwano/2d/SpriteFrame.h>
 #include <kiwano/render/ShapeMaker.h>
 #include <kiwano/render/RenderContext.h>
 
@@ -150,17 +150,32 @@ public:
     void FillRoundedRect(const Rect& rect, const Vec2& radius);
 
     /// \~chinese
-    /// @brief 绘制图像帧
+    /// @brief 绘制纹理
-    /// @param frame 图像帧
+    /// @param texture 纹理
-    /// @param pos 绘制图像的位置
+    /// @param pos 绘制的目标位置
-    void DrawFrame(FramePtr frame, const Point& pos);
+    /// @param crop_rect 纹理裁剪矩形
+    void DrawTexture(TexturePtr texture, const Point& pos, const Rect* crop_rect = nullptr);
 
     /// \~chinese
-    /// @brief 绘制图像帧
+    /// @brief 绘制纹理
-    /// @param frame 图像帧
+    /// @param texture 纹理
-    /// @param pos 绘制图像的位置
+    /// @param pos 绘制的目标位置
-    /// @param size 渲染的图像大小
+    /// @param size 绘制的目标大小
-    void DrawFrame(FramePtr frame, const Point& pos, const Size& size);
+    /// @param crop_rect 纹理裁剪矩形
+    void DrawTexture(TexturePtr texture, const Point& pos, const Size& size, const Rect* crop_rect = nullptr);
+
+    /// \~chinese
+    /// @brief 绘制精灵帧
+    /// @param frame 精灵帧
+    /// @param pos 绘制的目标位置
+    void DrawSpriteFrame(const SpriteFrame& frame, const Point& pos);
+
+    /// \~chinese
+    /// @brief 绘制精灵帧
+    /// @param frame 精灵帧
+    /// @param pos 绘制的目标位置
+    /// @param size 绘制的目标大小
+    void DrawSpriteFrame(const SpriteFrame& frame, const Point& pos, const Size& size);
 
     /// \~chinese
     /// @brief »æÖÆÎÄ×Ö²¼¾Ö
@@ -381,25 +396,35 @@ inline void CanvasRenderContext::FillRoundedRect(const Rect& rect, const Vec2& r
     ctx_->FillRoundedRectangle(rect, radius);
 }
 
-inline void CanvasRenderContext::DrawFrame(FramePtr frame, const Point& pos)
+inline void CanvasRenderContext::DrawTexture(TexturePtr texture, const Point& pos, const Rect* crop_rect)
 {
-    if (frame)
+    if (texture)
     {
-        Size frame_size = frame->GetSize();
+        this->DrawTexture(texture, pos, texture->GetSize(), crop_rect);
-        this->DrawFrame(frame, pos, frame_size);
     }
 }
 
-inline void CanvasRenderContext::DrawFrame(FramePtr frame, const Point& pos, const Size& size)
+inline void CanvasRenderContext::DrawTexture(TexturePtr texture, const Point& pos, const Size& size,
+                                             const Rect* crop_rect)
 {
     KGE_ASSERT(ctx_);
 
-    if (frame)
+    if (texture)
     {
-        ctx_->DrawFrame(frame, Rect(pos, size));
+        ctx_->DrawTexture(*texture, crop_rect, &Rect(pos, size));
     }
 }
 
+inline void CanvasRenderContext::DrawSpriteFrame(const SpriteFrame& frame, const Point& pos)
+{
+    this->DrawSpriteFrame(frame, pos, frame.GetCropRect().GetSize());
+}
+
+inline void CanvasRenderContext::DrawSpriteFrame(const SpriteFrame& frame, const Point& pos, const Size& size)
+{
+    this->DrawTexture(frame.GetTexture(), pos, size, &frame.GetCropRect());
+}
+
 inline void CanvasRenderContext::DrawTextLayout(const String& text, const TextStyle& style, const Point& point)
 {
     TextLayoutPtr layout = MakePtr<TextLayout>(text, style);

src/kiwano/2d/GifSprite.h

@@ -130,7 +130,7 @@ private:
     void ComposeNextFrame();
 
     /// \~chinese
-    /// @brief 解析当前图像帧
+    /// @brief 解析当前关键帧
     void DisposeCurrentFrame();
 
     /// \~chinese
@@ -138,11 +138,11 @@ private:
     void OverlayNextFrame();
 
     /// \~chinese
-    /// @brief 保存合成后的图像帧
+    /// @brief 保存合成后的关键帧
     void SaveComposedFrame();
 
     /// \~chinese
-    /// @brief 恢复已保存的图像帧
+    /// @brief 恢复已保存的关键帧
     void RestoreSavedFrame();
 
     /// \~chinese

src/kiwano/2d/Sprite.cpp

@@ -36,127 +36,79 @@ Sprite::Sprite(const Resource& res)
     Load(res);
 }
 
-Sprite::Sprite(FramePtr frame)
+Sprite::Sprite(TexturePtr texture)
+{
+    SetFrame(SpriteFrame(texture));
+}
+
+Sprite::Sprite(const String& file_path, const Rect& crop_rect)
+{
+    SetFrame(SpriteFrame(file_path, crop_rect));
+}
+
+Sprite::Sprite(const Resource& res, const Rect& crop_rect)
+{
+    SetFrame(SpriteFrame(res, crop_rect));
+}
+
+Sprite::Sprite(TexturePtr texture, const Rect& crop_rect)
+{
+    SetFrame(SpriteFrame(texture, crop_rect));
+}
+
+Sprite::Sprite(const SpriteFrame& frame)
 {
     SetFrame(frame);
 }
 
-Sprite::Sprite(const String& file_path, const Rect& crop_rect)
-    : Sprite(file_path)
-{
-    SetCropRect(crop_rect);
-}
-
-Sprite::Sprite(const Resource& res, const Rect& crop_rect)
-    : Sprite(res)
-{
-    SetCropRect(crop_rect);
-}
-
 Sprite::~Sprite() {}
 
-bool Sprite::Load(const String& file_path, bool autoresize)
+bool Sprite::Load(const String& file_path)
 {
-    FramePtr frame = MakePtr<Frame>(file_path);
+    SpriteFrame frame(file_path);
-    if (frame && frame->IsValid())
+    if (frame.IsValid())
     {
-        SetFrame(frame, autoresize);
+        SetFrame(frame);
         return true;
     }
     Fail("Sprite::Load failed");
     return false;
 }
 
-bool Sprite::Load(const Resource& res, bool autoresize)
+bool Sprite::Load(const Resource& res)
 {
-    FramePtr frame = MakePtr<Frame>(res);
+    SpriteFrame frame(res);
-    if (frame)
+    if (frame.IsValid())
     {
-        SetFrame(frame, autoresize);
+        SetFrame(frame);
         return true;
     }
     Fail("Sprite::Load failed");
     return false;
 }
 
-float Sprite::GetSourceWidth() const
+void Sprite::SetFrame(const SpriteFrame& frame)
 {
-    if (frame_)
+    frame_ = frame;
-    {
+    SetSize(frame_.GetSize());
-        return frame_->GetSourceWidth();
-    }
-    return 0.0f;
-}
 
-float Sprite::GetSourceHeight() const
+    if (!frame_.IsValid())
-{
-    if (frame_)
     {
-        return frame_->GetSourceHeight();
+        Fail("Sprite::SetFrame failed");
-    }
-    return 0.0f;
-}
-
-Size Sprite::GetSourceSize() const
-{
-    if (frame_)
-    {
-        return frame_->GetSourceSize();
-    }
-    return Size();
-}
-
-Rect Sprite::GetCropRect() const
-{
-    if (frame_)
-    {
-        return frame_->GetCropRect();
-    }
-    return Rect();
-}
-
-void Sprite::SetCropRect(const Rect& crop_rect)
-{
-    if (frame_)
-    {
-        frame_->SetCropRect(crop_rect);
-    }
-}
-
-void Sprite::SetFrame(FramePtr frame, bool autoresize)
-{
-    if (frame_ != frame)
-    {
-        frame_ = frame;
-        if (autoresize)
-        {
-            ResetSize();
-        }
-    }
-}
-
-void Sprite::ResetSize()
-{
-    if (frame_)
-    {
-        SetSize(frame_->GetSize());
-    }
-    else
-    {
-        SetSize(Size());
     }
 }
 
 void Sprite::OnRender(RenderContext& ctx)
 {
-    if (frame_ && frame_->IsValid())
+    if (frame_.IsValid())
     {
-        ctx.DrawTexture(*frame_->GetTexture(), &frame_->GetCropRect(), &GetBounds());
+        ctx.DrawTexture(*frame_.GetTexture(), &frame_.GetCropRect(), &GetBounds());
     }
 }
 
 bool Sprite::CheckVisibility(RenderContext& ctx) const
 {
-    return frame_ && frame_->IsValid() && Actor::CheckVisibility(ctx);
+    return frame_.IsValid() && Actor::CheckVisibility(ctx);
 }
+
 }  // namespace kiwano

src/kiwano/2d/Sprite.h

@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/2d/Actor.h>
-#include <kiwano/render/Frame.h>
+#include <kiwano/2d/SpriteFrame.h>
 
 namespace kiwano
 {
@@ -53,8 +53,8 @@ public:
 
     /// \~chinese
     /// @brief 创建精灵
-    /// @param frame 图像帧
+    /// @param texture 图像
-    Sprite(FramePtr frame);
+    Sprite(TexturePtr texture);
 
     /// \~chinese
     /// @brief 创建精灵
@@ -68,61 +68,50 @@ public:
     /// @param crop_rect 裁剪矩形
     Sprite(const Resource& res, const Rect& crop_rect);
 
+    /// \~chinese
+    /// @brief 创建精灵
+    /// @param texture 图像
+    /// @param crop_rect 裁剪矩形
+    Sprite(TexturePtr texture, const Rect& crop_rect);
+
+    /// \~chinese
+    /// @brief 创建精灵
+    /// @param frame 精灵帧
+    Sprite(const SpriteFrame& frame);
+
     virtual ~Sprite();
 
     /// \~chinese
-    /// @brief 加载本地图片
+    /// @brief 加载本地图片并重置裁剪矩形
     /// @param file_path 本地图片路径
-    /// @param autoresize 是否自动调整自身大小为图像大小
+    bool Load(const String& file_path);
-    bool Load(const String& file_path, bool autoresize = true);
 
     /// \~chinese
-    /// @brief 加载图像资源
+    /// @brief 加载图像资源并重置裁剪矩形
     /// @param res 图片资源
-    /// @param autoresize 是否自动调整自身大小为图像大小
+    bool Load(const Resource& res);
-    bool Load(const Resource& res, bool autoresize = true);
 
     /// \~chinese
-    /// @brief 获取图像原宽度
+    /// @brief 获取图像
-    float GetSourceWidth() const;
+    TexturePtr GetTexture() const;
-
-    /// \~chinese
-    /// @brief 获取图像原高度
-    float GetSourceHeight() const;
-
-    /// \~chinese
-    /// @brief 获取图像原大小
-    Size GetSourceSize() const;
 
     /// \~chinese
     /// @brief 获取裁剪矩形
     Rect GetCropRect() const;
 
+    /// \~chinese
+    /// @brief 获取精灵帧
+    SpriteFrame GetFrame() const;
+
     /// \~chinese
     /// @brief 使用矩形区域裁剪精灵
     /// @param crop_rect 裁剪矩形
     void SetCropRect(const Rect& crop_rect);
 
     /// \~chinese
-    /// @brief 获取帧图像
+    /// @brief 设置精灵帧
-    FramePtr GetFrame() const;
+    /// @param[in] frame 精灵帧
-
+    void SetFrame(const SpriteFrame& frame);
-    /// \~chinese
-    /// @brief 设置图像帧
-    /// @param[in] frame 图像帧
-    /// @param autoresize 是否自动调整自身大小为图像大小
-    void SetFrame(FramePtr frame, bool autoresize = true);
-
-    /// \~chinese
-    /// @brief 重置精灵大小为图像帧大小
-    void ResetSize();
-
-    /// \~chinese
-    /// @brief 获取图像帧属性
-    inline Value<FramePtr, Function<void()>> FrameProperty()
-    {
-        return Value<FramePtr, Function<void()>>(frame_, Closure(this, &Sprite::ResetSize));
-    }
 
     void OnRender(RenderContext& ctx) override;
 
@@ -130,13 +119,29 @@ protected:
     bool CheckVisibility(RenderContext& ctx) const override;
 
 private:
-    FramePtr frame_;
+    SpriteFrame frame_;
 };
 
 /** @} */
 
-inline FramePtr Sprite::GetFrame() const
+inline TexturePtr Sprite::GetTexture() const
+{
+    return frame_.GetTexture();
+}
+
+inline Rect Sprite::GetCropRect() const
+{
+    return frame_.GetCropRect();
+}
+
+inline SpriteFrame Sprite::GetFrame() const
 {
     return frame_;
 }
+
+inline void Sprite::SetCropRect(const Rect& crop_rect)
+{
+    frame_.SetCropRect(crop_rect);
+}
+
 }  // namespace kiwano

src/kiwano/2d/SpriteFrame.h

@@ -19,38 +19,54 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/base/ObjectBase.h>
+#include <kiwano/core/Common.h>
+#include <kiwano/math/Math.h>
 #include <kiwano/render/Texture.h>
 
 namespace kiwano
 {
-KGE_DECLARE_SMART_PTR(Frame);
 
 /**
  * \~chinese
- * @brief 图像帧
+ * @brief 精灵帧
  */
-class KGE_API Frame : public ObjectBase
+class KGE_API SpriteFrame
 {
 public:
+    SpriteFrame();
+
     /// \~chinese
-    /// @brief 创建图像帧
+    /// @brief 创建精灵帧
     /// @param file_path 图像路径
-    Frame(const String& file_path);
+    SpriteFrame(const String& file_path);
 
     /// \~chinese
-    /// @brief 创建图像帧
+    /// @brief 创建精灵帧
     /// @param res 图像资源
-    Frame(const Resource& res);
+    SpriteFrame(const Resource& res);
 
     /// \~chinese
-    /// @brief 创建图像帧
+    /// @brief 创建精灵帧
     /// @param texture 纹理
-    Frame(TexturePtr texture);
+    SpriteFrame(TexturePtr texture);
 
     /// \~chinese
-    /// @brief 构建空图像帧
+    /// @brief 创建精灵帧
-    Frame();
+    /// @param file_path 图像路径
+    /// @param crop_rect 裁剪矩形
+    SpriteFrame(const String& file_path, const Rect& crop_rect);
+
+    /// \~chinese
+    /// @brief 创建精灵帧
+    /// @param res 图像资源
+    /// @param crop_rect 裁剪矩形
+    SpriteFrame(const Resource& res, const Rect& crop_rect);
+
+    /// \~chinese
+    /// @brief 创建精灵帧
+    /// @param texture 纹理
+    /// @param crop_rect 裁剪矩形
+    SpriteFrame(TexturePtr texture, const Rect& crop_rect);
 
     /// \~chinese
     /// @brief 加载图像
@@ -62,121 +78,64 @@ public:
     /// @param res 图像资源
     bool Load(const Resource& res);
 
-    /// \~chinese
-    /// @brief 裁剪图像帧为矩形
-    /// @param crop_rect 裁剪矩形定义
-    void SetCropRect(const Rect& crop_rect);
-
-    /// \~chinese
-    /// @brief 设置纹理
-    /// @param texture 纹理
-    void SetTexture(TexturePtr texture);
-
     /// \~chinese
     /// @brief 是否有效
     bool IsValid() const;
 
-    /// \~chinese
-    /// @brief 获取宽度
-    float GetWidth() const;
-
-    /// \~chinese
-    /// @brief 获取高度
-    float GetHeight() const;
-
-    /// \~chinese
-    /// @brief 获取大小
-    Size GetSize() const;
-
-    /// \~chinese
-    /// @brief 获取裁剪位置
-    Point GetCropPoint() const;
-
     /// \~chinese
     /// @brief 获取裁剪矩形
     const Rect& GetCropRect() const;
 
-    /// \~chinese
-    /// @brief 获取图像原宽度
-    float GetSourceWidth() const;
-
-    /// \~chinese
-    /// @brief 获取图像原高度
-    float GetSourceHeight() const;
-
-    /// \~chinese
-    /// @brief 获取图像原大小
-    Size GetSourceSize() const;
-
     /// \~chinese
     /// @brief 获取纹理
     TexturePtr GetTexture() const;
 
+    /// \~chinese
+    /// @brief 获取精灵帧大小
+    Size GetSize() const;
+
+    /// \~chinese
+    /// @brief 裁剪精灵帧为矩形
+    /// @param crop_rect 裁剪矩形
+    void SetCropRect(const Rect& crop_rect);
+
+    /// \~chinese
+    /// @brief 设置纹理并重置裁剪矩形
+    /// @param texture 纹理
+    void SetTexture(TexturePtr texture);
+
+    /// \~chinese
+    /// @brief 按行列分割精灵帧
+    /// @param cols 列数
+    /// @param rows 行数
+    /// @param max_num 最大帧数量，设-1为将分割后的图像全部作为序列帧
+    /// @param padding_x X方向间隔
+    /// @param padding_y Y方向间隔
+    Vector<SpriteFrame> Split(int cols, int rows, int max_num = -1, float padding_x = 0, float padding_y = 0);
+
 private:
     TexturePtr texture_;
     Rect       crop_rect_;
 };
 
-inline bool Frame::IsValid() const
+inline bool SpriteFrame::IsValid() const
 {
     return texture_ && texture_->IsValid();
 }
 
-inline float Frame::GetWidth() const
+inline const Rect& SpriteFrame::GetCropRect() const
-{
-    return crop_rect_.GetWidth();
-}
-
-inline float Frame::GetHeight() const
-{
-    return crop_rect_.GetHeight();
-}
-
-inline Size Frame::GetSize() const
-{
-    return crop_rect_.GetSize();
-}
-
-inline Point Frame::GetCropPoint() const
-{
-    return crop_rect_.GetLeftTop();
-}
-
-inline const Rect& Frame::GetCropRect() const
 {
     return crop_rect_;
 }
 
-inline float Frame::GetSourceWidth() const
+inline TexturePtr SpriteFrame::GetTexture() const
-{
-    if (texture_)
-    {
-        return texture_->GetWidth();
-    }
-    return 0.0f;
-}
-
-inline float Frame::GetSourceHeight() const
-{
-    if (texture_)
-    {
-        return texture_->GetHeight();
-    }
-    return 0.0f;
-}
-
-inline Size Frame::GetSourceSize() const
-{
-    if (texture_)
-    {
-        return texture_->GetSize();
-    }
-    return Size();
-}
-
-inline TexturePtr Frame::GetTexture() const
 {
     return texture_;
 }
 
+inline Size SpriteFrame::GetSize() const
+{
+    return crop_rect_.GetSize();
+}
+
 }  // namespace kiwano

src/kiwano/2d/SpriteFrame.h.cpp

@@ -0,0 +1,138 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/SpriteFrame.h>
+
+namespace kiwano
+{
+
+SpriteFrame::SpriteFrame() {}
+
+SpriteFrame::SpriteFrame(const String& file_path)
+{
+    Load(file_path);
+}
+
+SpriteFrame::SpriteFrame(const Resource& res)
+{
+    Load(res);
+}
+
+SpriteFrame::SpriteFrame(TexturePtr texture)
+{
+    SetTexture(texture);
+}
+
+SpriteFrame::SpriteFrame(const String& file_path, const Rect& crop_rect)
+    : SpriteFrame(file_path)
+{
+    SetCropRect(crop_rect);
+}
+
+SpriteFrame::SpriteFrame(const Resource& res, const Rect& crop_rect)
+    : SpriteFrame(res)
+{
+    SetCropRect(crop_rect);
+}
+
+SpriteFrame::SpriteFrame(TexturePtr texture, const Rect& crop_rect)
+    : SpriteFrame(texture)
+{
+    SetCropRect(crop_rect);
+}
+
+bool SpriteFrame::Load(const String& file_path)
+{
+    TexturePtr texture = Texture::Preload(file_path);
+    if (texture->IsValid())
+    {
+        SetTexture(texture);
+        return true;
+    }
+    return false;
+}
+
+bool SpriteFrame::Load(const Resource& res)
+{
+    TexturePtr texture = Texture::Preload(res);
+    if (texture->IsValid())
+    {
+        SetTexture(texture);
+        return true;
+    }
+    return false;
+}
+
+void SpriteFrame::SetCropRect(const Rect& crop_rect)
+{
+    crop_rect_ = crop_rect;
+}
+
+void SpriteFrame::SetTexture(TexturePtr texture)
+{
+    texture_ = texture;
+
+    Size texture_size;
+    if (texture_)
+    {
+        texture_size = texture_->GetSize();
+    }
+    SetCropRect(Rect(Point(), texture_size));
+}
+
+Vector<SpriteFrame> SpriteFrame::Split(int cols, int rows, int max_num, float padding_x, float padding_y)
+{
+    if (cols <= 0 || rows <= 0 || max_num == 0)
+        return {};
+
+    if (!IsValid())
+        return {};
+
+    float raw_width  = crop_rect_.GetWidth();
+    float raw_height = crop_rect_.GetHeight();
+    float width      = (raw_width - (cols - 1) * padding_x) / cols;
+    float height     = (raw_height - (rows - 1) * padding_y) / rows;
+
+    Vector<SpriteFrame> frames;
+    frames.reserve((max_num > 0) ? max_num : (rows * cols));
+
+    int current_num = 0;
+
+    float dty = crop_rect_.GetTop();
+    for (int i = 0; i < rows; i++)
+    {
+        float dtx = crop_rect_.GetLeft();
+
+        for (int j = 0; j < cols; j++)
+        {
+            frames.emplace_back(texture_, Rect{ dtx, dty, dtx + width, dty + height });
+            ++current_num;
+
+            dtx += (width + padding_x);
+        }
+        dty += (height + padding_y);
+
+        if (max_num > 0 && current_num == max_num)
+            break;
+    }
+    return frames;
+}
+
+}  // namespace kiwano

src/kiwano/2d/Transition.cpp

@@ -1,388 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include <kiwano/2d/Actor.h>
-#include <kiwano/2d/Stage.h>
-#include <kiwano/2d/Transition.h>
-#include <kiwano/utils/Logger.h>
-#include <kiwano/platform/Window.h>
-#include <kiwano/render/Renderer.h>
-
-namespace kiwano
-{
-//-------------------------------------------------------
-// Transition
-//-------------------------------------------------------
-
-Transition::Transition()
-    : done_(false)
-    , duration_()
-    , delta_()
-    , process_(0)
-    , window_size_()
-    , out_stage_(nullptr)
-    , in_stage_(nullptr)
-    , out_layer_()
-    , in_layer_()
-{
-}
-
-Transition::~Transition() {}
-
-bool Transition::IsDone()
-{
-    return done_;
-}
-
-void Transition::Init(Stage* prev, Stage* next)
-{
-    process_ = 0;
-    delta_   = Duration{};
-
-    out_stage_   = prev;
-    in_stage_    = next;
-    window_size_ = Renderer::GetInstance().GetOutputSize();
-
-    if (in_stage_)
-    {
-        in_layer_.SetClipRect(Rect{ Point(), window_size_ });
-    }
-
-    if (out_stage_)
-    {
-        out_layer_.SetClipRect(Rect{ Point(), window_size_ });
-    }
-}
-
-void Transition::Update(Duration dt)
-{
-    if (duration_.IsZero())
-    {
-        process_ = 1;
-    }
-    else
-    {
-        delta_ += dt;
-        process_ = std::min(delta_ / duration_, 1.f);
-    }
-
-    if (process_ >= 1)
-    {
-        this->Stop();
-    }
-}
-
-void Transition::Render(RenderContext& ctx)
-{
-    if (out_stage_)
-    {
-        out_stage_->PrepareToRender(ctx);
-        ctx.PushClipRect(Rect{ Point{}, window_size_ });
-        ctx.PushLayer(out_layer_);
-
-        out_stage_->Render(ctx);
-
-        ctx.PopLayer();
-        ctx.PopClipRect();
-    }
-
-    if (in_stage_)
-    {
-        in_stage_->PrepareToRender(ctx);
-        ctx.PushClipRect(Rect{ Point{}, window_size_ });
-        ctx.PushLayer(in_layer_);
-
-        in_stage_->Render(ctx);
-
-        ctx.PopLayer();
-        ctx.PopClipRect();
-    }
-}
-
-void Transition::Stop()
-{
-    done_ = true;
-    Reset();
-}
-
-//-------------------------------------------------------
-// BoxTransition
-//-------------------------------------------------------
-
-BoxTransition::BoxTransition(Duration duration)
-{
-    SetDuration(duration);
-}
-
-BoxTransition::BoxTransition() {}
-
-void BoxTransition::Init(Stage* prev, Stage* next)
-{
-    Transition::Init(prev, next);
-
-    in_layer_.SetOpacity(0.f);
-}
-
-void BoxTransition::Update(Duration dt)
-{
-    Transition::Update(dt);
-
-    if (process_ < .5f)
-    {
-        out_layer_.SetClipRect(Rect(window_size_.x * process_, window_size_.y * process_,
-                                    window_size_.x * (1 - process_), window_size_.y * (1 - process_)));
-    }
-    else
-    {
-        out_layer_.SetOpacity(0.f);
-        in_layer_.SetOpacity(1.f);
-        in_layer_.SetClipRect(Rect(window_size_.x * (1 - process_), window_size_.y * (1 - process_),
-                                   window_size_.x * process_, window_size_.y * process_));
-    }
-}
-
-//-------------------------------------------------------
-// EmergeTransition
-//-------------------------------------------------------
-
-EmergeTransition::EmergeTransition(Duration duration)
-{
-    SetDuration(duration);
-}
-
-EmergeTransition::EmergeTransition() {}
-
-void EmergeTransition::Init(Stage* prev, Stage* next)
-{
-    Transition::Init(prev, next);
-
-    out_layer_.SetOpacity(1.f);
-    in_layer_.SetOpacity(0.f);
-}
-
-void EmergeTransition::Update(Duration dt)
-{
-    Transition::Update(dt);
-
-    out_layer_.SetOpacity(1 - process_);
-    in_layer_.SetOpacity(process_);
-}
-
-//-------------------------------------------------------
-// FadeTransition
-//-------------------------------------------------------
-
-FadeTransition::FadeTransition(Duration duration)
-{
-    SetDuration(duration);
-}
-
-FadeTransition::FadeTransition() {}
-
-void FadeTransition::Init(Stage* prev, Stage* next)
-{
-    Transition::Init(prev, next);
-
-    out_layer_.SetOpacity(1.f);
-    in_layer_.SetOpacity(0.f);
-}
-
-void FadeTransition::Update(Duration dt)
-{
-    Transition::Update(dt);
-
-    if (process_ < 0.5)
-    {
-        out_layer_.SetOpacity(1 - process_ * 2);
-        in_layer_.SetOpacity(0.f);
-    }
-    else
-    {
-        out_layer_.SetOpacity(0.f);
-        in_layer_.SetOpacity((process_ - 0.5f) * 2);
-    }
-}
-
-//-------------------------------------------------------
-// MoveTransition
-//-------------------------------------------------------
-
-MoveTransition::MoveTransition(Duration duration, Type type)
-    : type_(type)
-{
-    SetDuration(duration);
-}
-
-MoveTransition::MoveTransition()
-    : type_(Type::Left)
-{
-}
-
-void MoveTransition::Init(Stage* prev, Stage* next)
-{
-    Transition::Init(prev, next);
-
-    switch (type_)
-    {
-    case Type::Up:
-        pos_delta_ = Point(0, -window_size_.y);
-        start_pos_ = Point(0, window_size_.y);
-        break;
-    case Type::Down:
-        pos_delta_ = Point(0, window_size_.y);
-        start_pos_ = Point(0, -window_size_.y);
-        break;
-    case Type::Left:
-        pos_delta_ = Point(-window_size_.x, 0);
-        start_pos_ = Point(window_size_.x, 0);
-        break;
-    case Type::Right:
-        pos_delta_ = Point(window_size_.x, 0);
-        start_pos_ = Point(-window_size_.x, 0);
-        break;
-    }
-
-    if (out_stage_)
-    {
-        out_stage_->SetTransform(Transform{});
-    }
-
-    if (in_stage_)
-    {
-        auto transform     = Transform{};
-        transform.position = start_pos_;
-        in_stage_->SetTransform(transform);
-    }
-}
-
-void MoveTransition::Update(Duration dt)
-{
-    Transition::Update(dt);
-
-    if (out_stage_)
-    {
-        auto transform     = Transform{};
-        transform.position = pos_delta_ * process_;
-        out_stage_->SetTransform(transform);
-    }
-
-    if (in_stage_)
-    {
-        auto transform     = Transform{};
-        transform.position = start_pos_ + pos_delta_ * process_;
-        in_stage_->SetTransform(transform);
-    }
-}
-
-void MoveTransition::Reset()
-{
-    if (out_stage_)
-    {
-        out_stage_->SetTransform(Transform{});
-    }
-
-    if (in_stage_)
-    {
-        in_stage_->SetTransform(Transform{});
-    }
-}
-
-//-------------------------------------------------------
-// RotationTransition
-//-------------------------------------------------------
-
-RotationTransition::RotationTransition(Duration duration, float rotation)
-    : rotation_(rotation)
-{
-    SetDuration(duration);
-}
-
-RotationTransition::RotationTransition()
-    : rotation_(0.0f)
-{
-}
-
-void RotationTransition::Init(Stage* prev, Stage* next)
-{
-    Transition::Init(prev, next);
-
-    auto transform     = Transform{};
-    transform.position = Point{ window_size_.x / 2, window_size_.y / 2 };
-
-    if (out_stage_)
-    {
-        out_stage_->SetTransform(transform);
-        out_stage_->SetAnchor(Vec2{ 0.5f, 0.5f });
-    }
-
-    if (in_stage_)
-    {
-        in_stage_->SetTransform(transform);
-        in_stage_->SetAnchor(Vec2{ 0.5f, 0.5f });
-    }
-
-    in_layer_.SetOpacity(0.f);
-}
-
-void RotationTransition::Update(Duration dt)
-{
-    Transition::Update(dt);
-
-    if (process_ < .5f)
-    {
-        if (out_stage_)
-        {
-            auto transform     = out_stage_->GetTransform();
-            transform.scale    = Point{ (.5f - process_) * 2, (.5f - process_) * 2 };
-            transform.rotation = rotation_ * (.5f - process_) * 2;
-            out_stage_->SetTransform(transform);
-        }
-    }
-    else
-    {
-        if (in_stage_)
-        {
-            out_layer_.SetOpacity(0.f);
-            in_layer_.SetOpacity(1.f);
-
-            auto transform     = in_stage_->GetTransform();
-            transform.scale    = Point{ (process_ - .5f) * 2, (process_ - .5f) * 2 };
-            transform.rotation = rotation_ * (process_ - .5f) * 2;
-
-            in_stage_->SetTransform(transform);
-        }
-    }
-}
-
-void RotationTransition::Reset()
-{
-    if (out_stage_)
-    {
-        out_stage_->SetTransform(Transform{});
-        out_stage_->SetAnchor(Vec2{ 0.f, 0.f });
-    }
-
-    if (in_stage_)
-    {
-        in_stage_->SetTransform(Transform{});
-        in_stage_->SetAnchor(Vec2{ 0.f, 0.f });
-    }
-}
-}  // namespace kiwano

src/kiwano/2d/Transition.h

@@ -1,256 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#pragma once
-#include <kiwano/2d/Stage.h>
-#include <kiwano/render/Layer.h>
-
-namespace kiwano
-{
-class Director;
-class RenderContext;
-
-KGE_DECLARE_SMART_PTR(Transition);
-KGE_DECLARE_SMART_PTR(FadeTransition);
-KGE_DECLARE_SMART_PTR(EmergeTransition);
-KGE_DECLARE_SMART_PTR(BoxTransition);
-KGE_DECLARE_SMART_PTR(MoveTransition);
-KGE_DECLARE_SMART_PTR(RotationTransition);
-
-/**
- * \~chinese
- * @brief 舞台过渡动画
- */
-class KGE_API Transition : public ObjectBase
-{
-    friend class Director;
-
-public:
-    Transition();
-
-    virtual ~Transition();
-
-    /**
-     * \~chinese
-     * @brief 设置动画时长
-     */
-    void SetDuration(Duration dt);
-
-    /**
-     * \~chinese
-     * @brief 场景过渡动画是否已结束
-     */
-    bool IsDone();
-
-protected:
-    /**
-     * \~chinese
-     * @brief 初始化场景过渡动画
-     * @param[in] prev 转出场景
-     * @param[in] next 转入场景
-     */
-    virtual void Init(Stage* prev, Stage* next);
-
-    /**
-     * \~chinese
-     * @brief 更新过渡动画
-     * @param dt 距上一次更新的时间间隔
-     */
-    virtual void Update(Duration dt);
-
-    /**
-     * \~chinese
-     * @brief 渲染过度动画
-     * @param[in] ctx 渲染上下文
-     */
-    virtual void Render(RenderContext& ctx);
-
-    /**
-     * \~chinese
-     * @brief 停止动画
-     */
-    virtual void Stop();
-
-    /**
-     * \~chinese
-     * @brief 重置动画
-     */
-    virtual void Reset() {}
-
-protected:
-    bool     done_;
-    float    process_;
-    Duration duration_;
-    Duration delta_;
-    Size     window_size_;
-    StagePtr out_stage_;
-    StagePtr in_stage_;
-    Layer    out_layer_;
-    Layer    in_layer_;
-};
-
-/**
- * \~chinese
- * @brief 淡入淡出过渡动画
- * @details 前一场景淡出动画结束后，后一场景淡入
- */
-class FadeTransition : public Transition
-{
-public:
-    /**
-     * \~chinese
-     * @brief 创建淡入淡出过渡动画
-     * @param duration 动画时长
-     */
-    FadeTransition(Duration duration);
-
-    FadeTransition();
-
-protected:
-    void Update(Duration dt) override;
-
-    virtual void Init(Stage* prev, Stage* next) override;
-};
-
-/**
- * \~chinese
- * @brief 渐变过渡动画
- * @details 前一场景淡出动画的同时，后一场景淡入
- */
-class EmergeTransition : public Transition
-{
-public:
-    /**
-     * \~chinese
-     * @brief 创建渐变过渡动画
-     * @param duration 动画时长
-     */
-    EmergeTransition(Duration duration);
-
-    EmergeTransition();
-
-protected:
-    void Update(Duration dt) override;
-
-    virtual void Init(Stage* prev, Stage* next) override;
-};
-
-/**
- * \~chinese
- * @brief 盒状过渡动画
- * @details 前一场景以盒状收缩至消失，后一场景以盒状扩大
- */
-class BoxTransition : public Transition
-{
-public:
-    /**
-     * \~chinese
-     * @brief 创建盒状过渡动画
-     * @param duration 动画时长
-     */
-    BoxTransition(Duration duration);
-
-    BoxTransition();
-
-protected:
-    void Update(Duration dt) override;
-
-    virtual void Init(Stage* prev, Stage* next) override;
-};
-
-/**
- * \~chinese
- * @brief 位移过渡动画
- * @details 两场景以位移的方式切换
- */
-class MoveTransition : public Transition
-{
-public:
-    /**
-     * \~chinese
-     * @brief 位移方式
-     */
-    enum class Type : int
-    {
-        Up,    ///< 上移
-        Down,  ///< 下移
-        Left,  ///< 左移
-        Right  ///< 右移
-    };
-
-    /**
-     * \~chinese
-     * @brief 创建位移过渡动画
-     * @param duration 动画时长
-     * @param type 位移方式
-     */
-    MoveTransition(Duration duration, Type type);
-
-    MoveTransition();
-
-protected:
-    void Update(Duration dt) override;
-
-    virtual void Init(Stage* prev, Stage* next) override;
-
-    void Reset() override;
-
-private:
-    Type  type_;
-    Point pos_delta_;
-    Point start_pos_;
-};
-
-/**
- * \~chinese
- * @brief 旋转过渡动画
- * @details 前一场景以旋转方式收缩至消失，后一场景以旋转方式扩大
- */
-class RotationTransition : public Transition
-{
-public:
-    /**
-     * \~chinese
-     * @brief 创建旋转过渡动画
-     * @param duration 动画时长
-     * @param rotation 旋转度数
-     */
-    RotationTransition(Duration duration, float rotation = 360.0f);
-
-    RotationTransition();
-
-protected:
-    void Update(Duration dt) override;
-
-    virtual void Init(Stage* prev, Stage* next) override;
-
-    void Reset() override;
-
-private:
-    float rotation_;
-};
-
-
-inline void Transition::SetDuration(Duration dt)
-{
-    duration_ = dt;
-}
-
-}  // namespace kiwano

src/kiwano/2d/action/Action.cpp

@@ -1,121 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include <kiwano/2d/Actor.h>
-#include <kiwano/2d/action/Action.h>
-
-namespace kiwano
-{
-ActionEntity::ActionEntity()
-    : running_(true)
-    , detach_target_(false)
-    , loops_done_(0)
-    , loops_(0)
-    , status_(Status::NotStarted)
-{
-}
-
-ActionEntity::~ActionEntity() {}
-
-void ActionEntity::Init(Actor* target) {}
-
-void ActionEntity::Update(Actor* target, Duration dt)
-{
-    Complete(target);
-}
-
-void ActionEntity::UpdateStep(Actor* target, Duration dt)
-{
-    KGE_ASSERT(target != nullptr && "ActionEntity target should NOT be nullptr!");
-
-    elapsed_ += dt;
-
-    if (status_ == Status::NotStarted)
-    {
-        status_ = delay_.IsZero() ? Status::Started : Status::Delayed;
-        Init(target);
-    }
-
-    switch (status_)
-    {
-    case Status::Delayed:
-        if (elapsed_ >= delay_)
-        {
-            status_ = Status::Started;
-        }
-        break;
-
-    case Status::Started:
-        Update(target, dt);
-        break;
-
-    default:
-        break;
-    }
-
-    if (status_ == Status::Done)
-    {
-        if (cb_done_)
-            cb_done_(target);
-
-        if (detach_target_)
-            target->RemoveFromParent();
-
-        status_ = Status::Removeable;
-    }
-}
-
-void ActionEntity::Complete(Actor* target)
-{
-    if (cb_loop_done_)
-        cb_loop_done_(target);
-
-    if (loops_ >= 0 && loops_done_ >= loops_)
-    {
-        Done();
-    }
-    else
-    {
-        Init(target);  // reinit when a loop is done
-    }
-
-    ++loops_done_;
-}
-
-void ActionEntity::Reset()
-{
-    status_     = Status::NotStarted;
-    elapsed_    = 0;
-    loops_done_ = 0;
-}
-
-void ActionEntity::DoClone(ActionEntity* to) const
-{
-    if (to)
-    {
-        to->SetDelay(this->GetDelay());
-        to->SetDoneCallback(this->GetDoneCallback());
-        to->SetLoopDoneCallback(this->GetLoopDoneCallback());
-        to->SetLoops(this->GetLoops());
-        to->SetName(this->GetName());
-    }
-}
-
-}  // namespace kiwano

src/kiwano/2d/action/Action.h

@@ -1,417 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#pragma once
-#include <kiwano/core/Common.h>
-#include <kiwano/core/Cloneable.h>
-#include <kiwano/base/ObjectBase.h>
-#include <kiwano/core/Time.h>
-#include <kiwano/core/IntrusiveList.h>
-#include <kiwano/math/Math.h>
-
-namespace kiwano
-{
-class Actor;
-class ActionScheduler;
-
-KGE_DECLARE_SMART_PTR(ActionEntity);
-
-/**
- * \~chinese
- * \defgroup Actions 动画
- */
-
-/**
- * \addtogroup Actions
- * @{
- */
-
-/// \~chinese
-/// @brief 动画列表
-typedef IntrusiveList<ActionEntityPtr> ActionList;
-
-/// \~chinese
-/// @brief 动画结束时的回调函数
-typedef Function<void(Actor* /* target */)> ActionDoneCallback;
-
-/// \~chinese
-/// @brief 动画实体
-class KGE_API ActionEntity
-    : public ObjectBase
-    , public Cloneable<ActionEntity>
-    , protected IntrusiveListValue<ActionEntityPtr>
-{
-    friend class ActionScheduler;
-    friend class ActionGroupEntity;
-    friend IntrusiveList<ActionEntityPtr>;
-
-public:
-    ActionEntity();
-
-    virtual ~ActionEntity();
-
-    /// \~chinese
-    /// @brief 继续动画
-    void Resume();
-
-    /// \~chinese
-    /// @brief 暂停动画
-    void Pause();
-
-    /// \~chinese
-    /// @brief 停止动画
-    void Stop();
-
-    /// \~chinese
-    /// @brief 设置动画延时
-    void SetDelay(Duration delay);
-
-    /// \~chinese
-    /// @brief 设置循环次数
-    /// @param loops 循环次数，-1 为永久循环
-    void SetLoops(int loops);
-
-    /// \~chinese
-    /// @brief 动画结束时移除目标角色
-    void RemoveTargetWhenDone();
-
-    /// \~chinese
-    /// @brief 设置动画结束时的回调函数
-    void SetDoneCallback(const ActionDoneCallback& cb);
-
-    /// \~chinese
-    /// @brief 设置动画循环结束时的回调函数
-    void SetLoopDoneCallback(const ActionDoneCallback& cb);
-
-    /// \~chinese
-    /// @brief 获取动画的倒转
-    virtual ActionEntity* Reverse() const = 0;
-
-    /// \~chinese
-    /// @brief 获取动画的运行状态
-    bool IsRunning() const;
-
-    /// \~chinese
-    /// @brief 获取动画的循环次数
-    int GetLoops() const;
-
-    /// \~chinese
-    /// @brief 获取动画的延时
-    Duration GetDelay() const;
-
-    /// \~chinese
-    /// @brief 获取动画结束时的回调函数
-    ActionDoneCallback GetDoneCallback() const;
-
-    /// \~chinese
-    /// @brief 获取动画循环结束时的回调函数
-    ActionDoneCallback GetLoopDoneCallback() const;
-
-protected:
-    /// \~chinese
-    /// @brief 初始化动画
-    virtual void Init(Actor* target);
-
-    /// \~chinese
-    /// @brief 更新动画
-    virtual void Update(Actor* target, Duration dt);
-
-    /// \~chinese
-    /// @brief 更新一个时间步
-    void UpdateStep(Actor* target, Duration dt);
-
-    /// \~chinese
-    /// @brief 完成动画
-    void Complete(Actor* target);
-
-    /// \~chinese
-    /// @brief 重置动画
-    void Reset();
-
-    /// \~chinese
-    /// @brief 动画状态
-    enum class Status
-    {
-        NotStarted,  ///< 未开始
-        Delayed,     ///< 等待延时
-        Started,     ///< 已开始
-        Done,        ///< 已结束
-        Removeable   ///< 可移除
-    };
-
-    /// \~chinese
-    /// @brief 获取动画状态
-    Status GetStatus() const;
-
-    /// \~chinese
-    /// @brief 获取消逝时间
-    Duration GetElapsed() const;
-
-    /// \~chinese
-    /// @brief 获取完成的循环次数
-    int GetLoopsDone() const;
-
-    /// \~chinese
-    /// @brief 结束动画
-    void Done();
-
-    /// \~chinese
-    /// @brief 是否已结束
-    bool IsDone() const;
-
-    /// \~chinese
-    /// @brief 是否可移除
-    bool IsRemoveable() const;
-
-    /// \~chinese
-    /// @brief 执行克隆
-    void DoClone(ActionEntity* to) const;
-
-private:
-    Status             status_;
-    bool               running_;
-    bool               detach_target_;
-    int                loops_;
-    int                loops_done_;
-    Duration           delay_;
-    Duration           elapsed_;
-    ActionDoneCallback cb_done_;
-    ActionDoneCallback cb_loop_done_;
-};
-
-/// \~chinese
-/// @brief 动画
-class KGE_API Action
-{
-public:
-    Action() = default;
-
-    inline Action(ActionEntityPtr ptr)
-        : ptr(ptr)
-    {
-    }
-
-    /// \~chinese
-    /// @brief 设置循环次数
-    inline Action& Loops(int loops)
-    {
-        if (ptr)
-            ptr->SetLoops(loops);
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 设置动画延迟
-    inline Action& Delay(Duration delay)
-    {
-        if (ptr)
-            ptr->SetDelay(delay);
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 设置动画结束回调函数
-    inline Action& DoneCallback(const ActionDoneCallback& cb)
-    {
-        if (ptr)
-            ptr->SetDoneCallback(cb);
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 设置动画循环结束时的回调函数
-    inline Action& LoopDoneCallback(const ActionDoneCallback& cb)
-    {
-        if (ptr)
-            ptr->SetLoopDoneCallback(cb);
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 动画结束时移除目标角色
-    inline Action& RemoveTargetWhenDone()
-    {
-        if (ptr)
-            ptr->RemoveTargetWhenDone();
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 设置名称
-    inline Action& Name(const String& name)
-    {
-        if (ptr)
-            ptr->SetName(name);
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 克隆动画
-    inline Action Clone() const
-    {
-        if (ptr)
-            return Action(ptr->Clone());
-        return Action();
-    }
-
-    /// \~chinese
-    /// @brief 获取反向动画
-    inline Action Reverse() const
-    {
-        if (ptr)
-            return Action(ptr->Reverse());
-        return Action();
-    }
-
-    /// \~chinese
-    /// @brief 获取指针
-    inline ActionEntity* Get() const
-    {
-        return const_cast<ActionEntity*>(ptr.Get());
-    }
-
-    /// \~chinese
-    /// @brief 设置动画实体
-    inline void SetEntity(ActionEntityPtr ptr)
-    {
-        this->ptr = ptr;
-    }
-
-    inline ActionEntity* operator->() const
-    {
-        return Get();
-    }
-
-    inline operator ActionEntity*() const
-    {
-        return Get();
-    }
-
-    inline operator ActionEntityPtr() const
-    {
-        return ptr;
-    }
-
-    inline operator bool() const
-    {
-        return ptr != nullptr;
-    }
-
-protected:
-    ActionEntityPtr ptr;
-};
-
-/** @} */
-
-inline void ActionEntity::Resume()
-{
-    running_ = true;
-}
-
-inline void ActionEntity::Pause()
-{
-    running_ = false;
-}
-
-inline void ActionEntity::Stop()
-{
-    Done();
-}
-
-inline void ActionEntity::SetDelay(Duration delay)
-{
-    delay_ = delay;
-}
-
-inline void ActionEntity::SetLoops(int loops)
-{
-    loops_ = loops;
-}
-
-inline void ActionEntity::RemoveTargetWhenDone()
-{
-    detach_target_ = true;
-}
-
-inline void ActionEntity::SetDoneCallback(const ActionDoneCallback& cb)
-{
-    cb_done_ = cb;
-}
-
-inline void ActionEntity::SetLoopDoneCallback(const ActionDoneCallback& cb)
-{
-    cb_loop_done_ = cb;
-}
-
-inline void ActionEntity::Done()
-{
-    status_ = Status::Done;
-}
-
-inline ActionEntity::Status ActionEntity::GetStatus() const
-{
-    return status_;
-}
-
-inline bool ActionEntity::IsRunning() const
-{
-    return running_;
-}
-
-inline bool ActionEntity::IsDone() const
-{
-    return status_ == Status::Done || status_ == Status::Removeable;
-}
-
-inline bool ActionEntity::IsRemoveable() const
-{
-    return status_ == Status::Removeable;
-}
-
-inline int ActionEntity::GetLoops() const
-{
-    return loops_;
-}
-
-inline Duration ActionEntity::GetDelay() const
-{
-    return delay_;
-}
-
-inline Duration ActionEntity::GetElapsed() const
-{
-    return elapsed_;
-}
-
-inline int ActionEntity::GetLoopsDone() const
-{
-    return loops_done_;
-}
-
-inline ActionDoneCallback ActionEntity::GetDoneCallback() const
-{
-    return cb_done_;
-}
-
-inline ActionDoneCallback ActionEntity::GetLoopDoneCallback() const
-{
-    return cb_loop_done_;
-}
-}  // namespace kiwano

src/kiwano/2d/action/ActionTween.cpp

@@ -1,528 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include <functional>
-#include <kiwano/2d/Actor.h>
-#include <kiwano/2d/action/ActionTween.h>
-
-namespace kiwano
-{
-//-------------------------------------------------------
-// Ease Functions
-//-------------------------------------------------------
-
-inline EaseFunc MakeEaseIn(float rate)
-{
-    return std::bind(math::EaseIn, std::placeholders::_1, rate);
-}
-inline EaseFunc MakeEaseOut(float rate)
-{
-    return std::bind(math::EaseOut, std::placeholders::_1, rate);
-}
-inline EaseFunc MakeEaseInOut(float rate)
-{
-    return std::bind(math::EaseInOut, std::placeholders::_1, rate);
-}
-inline EaseFunc MakeEaseElasticIn(float period)
-{
-    return std::bind(math::EaseElasticIn, std::placeholders::_1, period);
-}
-inline EaseFunc MakeEaseElasticOut(float period)
-{
-    return std::bind(math::EaseElasticOut, std::placeholders::_1, period);
-}
-inline EaseFunc MakeEaseElasticInOut(float period)
-{
-    return std::bind(math::EaseElasticInOut, std::placeholders::_1, period);
-}
-
-KGE_API EaseFunc Ease::Linear       = math::Linear;
-KGE_API EaseFunc Ease::EaseIn       = MakeEaseIn(2.f);
-KGE_API EaseFunc Ease::EaseOut      = MakeEaseOut(2.f);
-KGE_API EaseFunc Ease::EaseInOut    = MakeEaseInOut(2.f);
-KGE_API EaseFunc Ease::ExpoIn       = math::EaseExponentialIn;
-KGE_API EaseFunc Ease::ExpoOut      = math::EaseExponentialOut;
-KGE_API EaseFunc Ease::ExpoInOut    = math::EaseExponentialInOut;
-KGE_API EaseFunc Ease::BounceIn     = math::EaseBounceIn;
-KGE_API EaseFunc Ease::BounceOut    = math::EaseBounceOut;
-KGE_API EaseFunc Ease::BounceInOut  = math::EaseBounceInOut;
-KGE_API EaseFunc Ease::ElasticIn    = MakeEaseElasticIn(0.3f);
-KGE_API EaseFunc Ease::ElasticOut   = MakeEaseElasticOut(0.3f);
-KGE_API EaseFunc Ease::ElasticInOut = MakeEaseElasticInOut(0.3f);
-KGE_API EaseFunc Ease::SineIn       = math::EaseSineIn;
-KGE_API EaseFunc Ease::SineOut      = math::EaseSineOut;
-KGE_API EaseFunc Ease::SineInOut    = math::EaseSineInOut;
-KGE_API EaseFunc Ease::BackIn       = math::EaseBackIn;
-KGE_API EaseFunc Ease::BackOut      = math::EaseBackOut;
-KGE_API EaseFunc Ease::BackInOut    = math::EaseBackInOut;
-KGE_API EaseFunc Ease::QuadIn       = math::EaseQuadIn;
-KGE_API EaseFunc Ease::QuadOut      = math::EaseQuadOut;
-KGE_API EaseFunc Ease::QuadInOut    = math::EaseQuadInOut;
-KGE_API EaseFunc Ease::CubicIn      = math::EaseCubicIn;
-KGE_API EaseFunc Ease::CubicOut     = math::EaseCubicOut;
-KGE_API EaseFunc Ease::CubicInOut   = math::EaseCubicInOut;
-KGE_API EaseFunc Ease::QuartIn      = math::EaseQuartIn;
-KGE_API EaseFunc Ease::QuartOut     = math::EaseQuartOut;
-KGE_API EaseFunc Ease::QuartInOut   = math::EaseQuartInOut;
-KGE_API EaseFunc Ease::QuintIn      = math::EaseQuintIn;
-KGE_API EaseFunc Ease::QuintOut     = math::EaseQuintOut;
-KGE_API EaseFunc Ease::QuintInOut   = math::EaseQuintInOut;
-
-//-------------------------------------------------------
-// ActionTweenEntity
-//-------------------------------------------------------
-
-ActionTweenEntity::ActionTweenEntity()
-    : dur_()
-    , ease_func_(nullptr)
-{
-}
-
-ActionTweenEntity::ActionTweenEntity(Duration duration)
-    : dur_(duration)
-    , ease_func_(nullptr)
-{
-}
-
-void ActionTweenEntity::Update(Actor* target, Duration dt)
-{
-    float percent;
-
-    if (dur_.IsZero())
-    {
-        percent = 1.f;
-        Complete(target);
-    }
-    else
-    {
-        Duration elapsed    = GetElapsed() - GetDelay();
-        float    loops_done = elapsed / dur_;
-
-        while (GetLoopsDone() < static_cast<int>(loops_done))
-        {
-            Complete(target);  // loops_done_++
-        }
-
-        percent = (GetStatus() == Status::Done) ? 1.f : (loops_done - static_cast<float>(GetLoopsDone()));
-    }
-
-    if (ease_func_)
-        percent = ease_func_(percent);
-
-    UpdateTween(target, percent);
-}
-
-void ActionTweenEntity::DoClone(ActionTweenEntity* to) const
-{
-    if (to)
-    {
-        ActionEntity::DoClone(to);
-        to->SetDuration(this->GetDuration());
-        to->SetEaseFunc(this->GetEaseFunc());
-    }
-}
-
-//-------------------------------------------------------
-// Move Action
-//-------------------------------------------------------
-
-ActionMoveByEntity::ActionMoveByEntity(Duration duration, const Vec2& displacement)
-    : ActionTweenEntity(duration)
-    , displacement_(displacement)
-{
-}
-
-void ActionMoveByEntity::Init(Actor* target)
-{
-    if (target)
-    {
-        prev_pos_ = start_pos_ = target->GetPosition();
-    }
-}
-
-void ActionMoveByEntity::UpdateTween(Actor* target, float percent)
-{
-    Point diff = target->GetPosition() - prev_pos_;
-    start_pos_ = start_pos_ + diff;
-
-    Point new_pos = start_pos_ + (displacement_ * percent);
-    target->SetPosition(new_pos);
-
-    prev_pos_ = new_pos;
-}
-
-ActionMoveByEntity* ActionMoveByEntity::Clone() const
-{
-    ActionMoveByEntity* ptr = new ActionMoveByEntity(GetDuration(), displacement_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionMoveByEntity* ActionMoveByEntity::Reverse() const
-{
-    ActionMoveByEntity* ptr = new ActionMoveByEntity(GetDuration(), -displacement_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionMoveToEntity::ActionMoveToEntity(Duration duration, const Point& distination)
-    : ActionMoveByEntity(duration, Vec2())
-    , distination_(distination)
-{
-}
-
-ActionMoveToEntity* ActionMoveToEntity::Clone() const
-{
-    ActionMoveToEntity* ptr = new ActionMoveToEntity(GetDuration(), distination_);
-    DoClone(ptr);
-    return ptr;
-}
-
-void ActionMoveToEntity::Init(Actor* target)
-{
-    ActionMoveByEntity::Init(target);
-    displacement_ = distination_ - start_pos_;
-}
-
-//-------------------------------------------------------
-// Jump Action
-//-------------------------------------------------------
-
-ActionJumpByEntity::ActionJumpByEntity(Duration duration, const Vec2& displacement, float height, int count)
-    : ActionTweenEntity(duration)
-    , height_(height)
-    , jump_count_(count)
-    , displacement_(displacement)
-{
-}
-
-ActionJumpByEntity* ActionJumpByEntity::Clone() const
-{
-    ActionJumpByEntity* ptr = new ActionJumpByEntity(GetDuration(), displacement_, height_, jump_count_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionJumpByEntity* ActionJumpByEntity::Reverse() const
-{
-    ActionJumpByEntity* ptr = new ActionJumpByEntity(GetDuration(), -displacement_, height_, jump_count_);
-    DoClone(ptr);
-    return ptr;
-}
-
-void ActionJumpByEntity::Init(Actor* target)
-{
-    if (target)
-    {
-        prev_pos_ = start_pos_ = target->GetPosition();
-    }
-}
-
-void ActionJumpByEntity::UpdateTween(Actor* target, float percent)
-{
-    float frac = fmod(percent * jump_count_, 1.f);
-    float x    = displacement_.x * percent;
-    float y    = height_ * 4 * frac * (1 - frac);
-    y += displacement_.y * percent;
-
-    Point diff = target->GetPosition() - prev_pos_;
-    start_pos_ = diff + start_pos_;
-
-    Point new_pos = start_pos_ + Point(x, y);
-    target->SetPosition(new_pos);
-
-    prev_pos_ = new_pos;
-}
-
-ActionJumpToEntity::ActionJumpToEntity(Duration duration, const Point& distination, float height, int count)
-    : ActionJumpByEntity(duration, Vec2(), height, count)
-    , distination_(distination)
-{
-}
-
-ActionJumpToEntity* ActionJumpToEntity::Clone() const
-{
-    ActionJumpToEntity* ptr = new ActionJumpToEntity(GetDuration(), distination_, height_, jump_count_);
-    DoClone(ptr);
-    return ptr;
-}
-
-void ActionJumpToEntity::Init(Actor* target)
-{
-    ActionJumpByEntity::Init(target);
-    displacement_ = distination_ - start_pos_;
-}
-
-//-------------------------------------------------------
-// Scale Action
-//-------------------------------------------------------
-
-ActionScaleByEntity::ActionScaleByEntity(Duration duration, float scale_x, float scale_y)
-    : ActionTweenEntity(duration)
-    , delta_x_(scale_x)
-    , delta_y_(scale_y)
-    , start_scale_x_(0.f)
-    , start_scale_y_(0.f)
-{
-}
-
-void ActionScaleByEntity::Init(Actor* target)
-{
-    if (target)
-    {
-        start_scale_x_ = target->GetScaleX();
-        start_scale_y_ = target->GetScaleY();
-    }
-}
-
-void ActionScaleByEntity::UpdateTween(Actor* target, float percent)
-{
-    target->SetScale(Vec2{ start_scale_x_ + delta_x_ * percent, start_scale_y_ + delta_y_ * percent });
-}
-
-ActionScaleByEntity* ActionScaleByEntity::Clone() const
-{
-    ActionScaleByEntity* ptr = new ActionScaleByEntity(GetDuration(), delta_x_, delta_y_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionScaleByEntity* ActionScaleByEntity::Reverse() const
-{
-    ActionScaleByEntity* ptr = new ActionScaleByEntity(GetDuration(), -delta_x_, -delta_y_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionScaleToEntity::ActionScaleToEntity(Duration duration, float scale_x, float scale_y)
-    : ActionScaleByEntity(duration, 0, 0)
-    , end_scale_x_(scale_x)
-    , end_scale_y_(scale_y)
-{
-}
-
-ActionScaleToEntity* ActionScaleToEntity::Clone() const
-{
-    ActionScaleToEntity* ptr = new ActionScaleToEntity(GetDuration(), end_scale_x_, end_scale_y_);
-    DoClone(ptr);
-    return ptr;
-}
-
-void ActionScaleToEntity::Init(Actor* target)
-{
-    ActionScaleByEntity::Init(target);
-    delta_x_ = end_scale_x_ - start_scale_x_;
-    delta_y_ = end_scale_y_ - start_scale_y_;
-}
-
-//-------------------------------------------------------
-// Opacity Action
-//-------------------------------------------------------
-
-ActionFadeToEntity::ActionFadeToEntity(Duration duration, float opacity)
-    : ActionTweenEntity(duration)
-    , delta_val_(0.0f)
-    , start_val_(0.f)
-    , end_val_(opacity)
-{
-}
-
-void ActionFadeToEntity::Init(Actor* target)
-{
-    if (target)
-    {
-        start_val_ = target->GetOpacity();
-        delta_val_ = end_val_ - start_val_;
-    }
-}
-
-void ActionFadeToEntity::UpdateTween(Actor* target, float percent)
-{
-    target->SetOpacity(start_val_ + delta_val_ * percent);
-}
-
-ActionFadeToEntity* ActionFadeToEntity::Clone() const
-{
-    ActionFadeToEntity* ptr = new ActionFadeToEntity(GetDuration(), end_val_);
-    DoClone(ptr);
-    return ptr;
-}
-
-//-------------------------------------------------------
-// Rotate Action
-//-------------------------------------------------------
-
-ActionRotateByEntity::ActionRotateByEntity(Duration duration, float rotation)
-    : ActionTweenEntity(duration)
-    , delta_val_(rotation)
-    , start_val_(0.0f)
-{
-}
-
-void ActionRotateByEntity::Init(Actor* target)
-{
-    if (target)
-    {
-        start_val_ = target->GetRotation();
-    }
-}
-
-void ActionRotateByEntity::UpdateTween(Actor* target, float percent)
-{
-    float rotation = start_val_ + delta_val_ * percent;
-    if (rotation > 360.f)
-        rotation -= 360.f;
-
-    target->SetRotation(rotation);
-}
-
-ActionRotateByEntity* ActionRotateByEntity::Clone() const
-{
-    ActionRotateByEntity* ptr = new ActionRotateByEntity(GetDuration(), delta_val_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionRotateByEntity* ActionRotateByEntity::Reverse() const
-{
-    ActionRotateByEntity* ptr = new ActionRotateByEntity(GetDuration(), -delta_val_);
-    DoClone(ptr);
-    return ptr;
-}
-
-ActionRotateToEntity::ActionRotateToEntity(Duration duration, float rotation)
-    : ActionRotateByEntity(duration, 0)
-    , end_val_(rotation)
-{
-}
-
-ActionRotateToEntity* ActionRotateToEntity::Clone() const
-{
-    ActionRotateToEntity* ptr = new ActionRotateToEntity(GetDuration(), end_val_);
-    DoClone(ptr);
-    return ptr;
-}
-
-void ActionRotateToEntity::Init(Actor* target)
-{
-    ActionRotateByEntity::Init(target);
-    delta_val_ = end_val_ - start_val_;
-}
-
-//-------------------------------------------------------
-// ActionCustomEntity
-//-------------------------------------------------------
-
-ActionCustomEntity::ActionCustomEntity(Duration duration, ActionCustom::TweenFunc tween_func)
-    : ActionTweenEntity(duration)
-    , tween_func_(tween_func)
-{
-}
-
-ActionCustomEntity* ActionCustomEntity::Clone() const
-{
-    ActionCustomEntity* ptr = new ActionCustomEntity(GetDuration(), tween_func_);
-    DoClone(ptr);
-    return ptr;
-}
-
-void ActionCustomEntity::Init(Actor* target)
-{
-    if (!tween_func_)
-        this->Done();
-}
-
-void ActionCustomEntity::UpdateTween(Actor* target, float percent)
-{
-    if (tween_func_)
-        tween_func_(target, percent);
-}
-
-ActionMoveBy::ActionMoveBy(Duration duration, const Vec2& displacement)
-{
-    SetEntity(MakePtr<ActionMoveByEntity>(duration, displacement));
-}
-
-ActionMoveTo::ActionMoveTo(Duration duration, const Point& distination)
-{
-    SetEntity(MakePtr<ActionMoveToEntity>(duration, distination));
-}
-
-ActionJumpBy::ActionJumpBy(Duration duration, const Vec2& displacement, float height, int count)
-{
-    SetEntity(MakePtr<ActionJumpByEntity>(duration, displacement, height, count));
-}
-
-ActionJumpTo::ActionJumpTo(Duration duration, const Point& distination, float height, int count)
-{
-    SetEntity(MakePtr<ActionJumpToEntity>(duration, distination, height, count));
-}
-
-ActionScaleBy::ActionScaleBy(Duration duration, float scale_x, float scale_y)
-{
-    SetEntity(MakePtr<ActionScaleByEntity>(duration, scale_x, scale_y));
-}
-
-ActionScaleBy::ActionScaleBy(Duration duration, Vec2 scale)
-{
-    SetEntity(MakePtr<ActionScaleByEntity>(duration, scale.x, scale.y));
-}
-
-ActionScaleTo::ActionScaleTo(Duration duration, float scale_x, float scale_y)
-{
-    SetEntity(MakePtr<ActionScaleToEntity>(duration, scale_x, scale_y));
-}
-
-ActionScaleTo::ActionScaleTo(Duration duration, Vec2 scale)
-{
-    SetEntity(MakePtr<ActionScaleToEntity>(duration, scale.x, scale.y));
-}
-
-ActionFadeTo::ActionFadeTo(Duration duration, float opacity)
-{
-    SetEntity(MakePtr<ActionFadeToEntity>(duration, opacity));
-}
-
-ActionFadeIn::ActionFadeIn(Duration duration)
-{
-    SetEntity(MakePtr<ActionFadeToEntity>(duration, 1.0f));
-}
-
-ActionFadeOut::ActionFadeOut(Duration duration)
-{
-    SetEntity(MakePtr<ActionFadeToEntity>(duration, 0.0f));
-}
-
-ActionRotateBy::ActionRotateBy(Duration duration, float rotation)
-{
-    SetEntity(MakePtr<ActionRotateByEntity>(duration, rotation));
-}
-
-ActionRotateTo::ActionRotateTo(Duration duration, float rotation)
-{
-    SetEntity(MakePtr<ActionRotateToEntity>(duration, rotation));
-}
-
-ActionCustom::ActionCustom(Duration duration, TweenFunc tween_func)
-{
-    SetEntity(MakePtr<ActionCustomEntity>(duration, tween_func));
-}
-
-}  // namespace kiwano

src/kiwano/2d/action/ActionTween.h

@@ -1,923 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#pragma once
-#include <kiwano/2d/action/Action.h>
-#include <kiwano/utils/Logger.h>
-
-namespace kiwano
-{
-/// \~chinese
-/// @brief 缓动函数
-using EaseFunc = Function<float(float)>;
-
-/// \~chinese
-/// @brief 缓动函数枚举
-/// @details 查看 https://easings.net 获取更多信息
-struct Ease
-{
-    static KGE_API EaseFunc Linear;        ///< 线性
-    static KGE_API EaseFunc EaseIn;        ///< 由慢变快
-    static KGE_API EaseFunc EaseOut;       ///< 由快变慢
-    static KGE_API EaseFunc EaseInOut;     ///< 由慢变快, 再由快变慢
-    static KGE_API EaseFunc ExpoIn;        ///< 由慢变极快
-    static KGE_API EaseFunc ExpoOut;       ///< 由极快变慢
-    static KGE_API EaseFunc ExpoInOut;     ///< 由慢至极快, 再由极快边慢
-    static KGE_API EaseFunc ElasticIn;     ///< 自起点赋予弹性
-    static KGE_API EaseFunc ElasticOut;    ///< 自终点赋予弹性
-    static KGE_API EaseFunc ElasticInOut;  ///< 再起点和终点赋予弹性
-    static KGE_API EaseFunc BounceIn;      ///< 自起点赋予反弹力
-    static KGE_API EaseFunc BounceOut;     ///< 自终点赋予反弹力
-    static KGE_API EaseFunc BounceInOut;   ///< 在起点和终点赋予反弹力
-    static KGE_API EaseFunc BackIn;
-    static KGE_API EaseFunc BackOut;
-    static KGE_API EaseFunc BackInOut;
-    static KGE_API EaseFunc QuadIn;
-    static KGE_API EaseFunc QuadOut;
-    static KGE_API EaseFunc QuadInOut;
-    static KGE_API EaseFunc CubicIn;
-    static KGE_API EaseFunc CubicOut;
-    static KGE_API EaseFunc CubicInOut;
-    static KGE_API EaseFunc QuartIn;
-    static KGE_API EaseFunc QuartOut;
-    static KGE_API EaseFunc QuartInOut;
-    static KGE_API EaseFunc QuintIn;
-    static KGE_API EaseFunc QuintOut;
-    static KGE_API EaseFunc QuintInOut;
-    static KGE_API EaseFunc SineIn;
-    static KGE_API EaseFunc SineOut;
-    static KGE_API EaseFunc SineInOut;
-};
-
-KGE_DECLARE_SMART_PTR(ActionTweenEntity);
-KGE_DECLARE_SMART_PTR(ActionMoveByEntity);
-KGE_DECLARE_SMART_PTR(ActionMoveToEntity);
-KGE_DECLARE_SMART_PTR(ActionJumpByEntity);
-KGE_DECLARE_SMART_PTR(ActionJumpToEntity);
-KGE_DECLARE_SMART_PTR(ActionScaleByEntity);
-KGE_DECLARE_SMART_PTR(ActionScaleToEntity);
-KGE_DECLARE_SMART_PTR(ActionFadeToEntity);
-KGE_DECLARE_SMART_PTR(ActionRotateByEntity);
-KGE_DECLARE_SMART_PTR(ActionRotateToEntity);
-KGE_DECLARE_SMART_PTR(ActionCustomEntity);
-
-/**
- * \addtogroup Actions
- * @{
- */
-
-/// \~chinese
-/// @brief 补间动画实体
-class KGE_API ActionTweenEntity : public ActionEntity
-{
-public:
-    /// \~chinese
-    /// @brief 获取动画时长
-    Duration GetDuration() const;
-
-    /// \~chinese
-    /// @brief 设置动画时长
-    void SetDuration(Duration duration);
-
-    /// \~chinese
-    /// @brief 获取动画速度缓动函数
-    const EaseFunc& GetEaseFunc() const;
-
-    /// \~chinese
-    /// @brief 设置动画速度缓动函数
-    void SetEaseFunc(const EaseFunc& func);
-
-protected:
-    ActionTweenEntity();
-
-    /// \~chinese
-    /// @brief 补间动画
-    /// @param duration 动画时长
-    /// @param func 动画速度缓动函数
-    ActionTweenEntity(Duration duration);
-
-    void Update(Actor* target, Duration dt) override;
-
-    virtual void UpdateTween(Actor* target, float percent) = 0;
-
-    void DoClone(ActionTweenEntity* to) const;
-
-private:
-    Duration dur_;
-    EaseFunc ease_func_;
-};
-
-/// \~chinese
-/// @brief 补间动画
-class ActionTween : public Action
-{
-public:
-    ActionTween() = default;
-
-    inline ActionTween(ActionTweenEntityPtr ptr)
-    {
-        SetEntity(ptr);
-    }
-
-    /// \~chinese
-    /// @brief 设置缓动函数
-    inline ActionTween& Ease(EaseFunc ease)
-    {
-        auto tween_ptr = Get();
-        if (tween_ptr)
-            tween_ptr->SetEaseFunc(ease);
-        return (*this);
-    }
-
-    /// \~chinese
-    /// @brief 获取指针
-    inline ActionTweenEntity* Get() const
-    {
-        return static_cast<ActionTweenEntity*>(Action::Get());
-    }
-
-    /// \~chinese
-    /// @brief 设置动画实体
-    inline void SetEntity(ActionTweenEntityPtr tween_ptr)
-    {
-        Action::SetEntity(tween_ptr.Get());
-    }
-
-    inline ActionTweenEntity* operator->() const
-    {
-        return Get();
-    }
-};
-
-/// \~chinese
-/// @brief 相对位移动画
-class KGE_API ActionMoveBy : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对位移动画
-    /// @param duration 动画时长
-    /// @param displacement 位移向量
-    ActionMoveBy(Duration duration, const Vec2& displacement);
-};
-
-/// \~chinese
-/// @brief 相对位移动画实体
-class KGE_API ActionMoveByEntity : public ActionTweenEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对位移动画
-    /// @param duration 动画时长
-    /// @param displacement 位移向量
-    ActionMoveByEntity(Duration duration, const Vec2& displacement);
-
-    /// \~chinese
-    /// @brief 获取位移向量
-    Vec2 GetDisplacement() const;
-
-    /// \~chinese
-    /// @brief 设置位移向量
-    void SetDisplacement(const Vec2& displacement);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionMoveByEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionMoveByEntity* Reverse() const override;
-
-protected:
-    void Init(Actor* target) override;
-
-    void UpdateTween(Actor* target, float percent) override;
-
-protected:
-    Point start_pos_;
-    Point prev_pos_;
-    Vec2  displacement_;
-};
-
-/// \~chinese
-/// @brief 位移动画
-class KGE_API ActionMoveTo : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建位移动画
-    /// @param duration 动画时长
-    /// @param distination 目的坐标
-    ActionMoveTo(Duration duration, const Point& distination);
-};
-
-/// \~chinese
-/// @brief 位移动画实体
-class KGE_API ActionMoveToEntity : public ActionMoveByEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建位移动画
-    /// @param duration 动画时长
-    /// @param distination 目的坐标
-    ActionMoveToEntity(Duration duration, const Point& distination);
-
-    /// \~chinese
-    /// @brief 获取目的坐标
-    Point GetDistination() const;
-
-    /// \~chinese
-    /// @brief 设置目的坐标
-    void SetDistination(const Point& distination);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionMoveToEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionMoveToEntity* Reverse() const override
-    {
-        KGE_ERRORF("Reverse() not supported in ActionMoveToEntity");
-        return nullptr;
-    }
-
-protected:
-    void Init(Actor* target) override;
-
-private:
-    Point distination_;
-};
-
-/// \~chinese
-/// @brief 相对跳跃动画
-class KGE_API ActionJumpBy : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对跳跃动画
-    /// @param duration 动画时长
-    /// @param displacement 跳跃位移向量
-    /// @param height 跳跃高度
-    /// @param count 跳跃次数
-    ActionJumpBy(Duration duration, const Vec2& displacement, float height, int count = 1);
-};
-
-/// \~chinese
-/// @brief 相对跳跃动画实体
-class KGE_API ActionJumpByEntity : public ActionTweenEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对跳跃动画
-    /// @param duration 动画时长
-    /// @param displacement 跳跃位移向量
-    /// @param height 跳跃高度
-    /// @param count 跳跃次数
-    ActionJumpByEntity(Duration duration, const Vec2& displacement, float height, int count = 1);
-
-    /// \~chinese
-    /// @brief 获取跳跃位移
-    Vec2 GetDisplacement() const;
-
-    /// \~chinese
-    /// @brief 获取跳跃高度
-    float GetJumpHeight() const;
-
-    /// \~chinese
-    /// @brief 获取跳跃次数
-    int GetJumpCount() const;
-
-    /// \~chinese
-    /// @brief 设置跳跃位移
-    void SetDisplacement(const Vec2& displacement);
-
-    /// \~chinese
-    /// @brief 设置跳跃高度
-    void SetJumpHeight(float height);
-
-    /// \~chinese
-    /// @brief 设置跳跃次数
-    void SetJumpCount(int count);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionJumpByEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionJumpByEntity* Reverse() const override;
-
-protected:
-    void Init(Actor* target) override;
-
-    void UpdateTween(Actor* target, float percent) override;
-
-protected:
-    float height_;
-    int   jump_count_;
-    Point start_pos_;
-    Point displacement_;
-    Point prev_pos_;
-};
-
-/// \~chinese
-/// @brief 跳跃动画
-class KGE_API ActionJumpTo : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建跳跃动画
-    /// @param duration 动画时长
-    /// @param distination 目的坐标
-    /// @param height 跳跃高度
-    /// @param count 跳跃次数
-    ActionJumpTo(Duration duration, const Point& distination, float height, int count = 1);
-};
-
-/// \~chinese
-/// @brief 跳跃动画实体
-class KGE_API ActionJumpToEntity : public ActionJumpByEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建跳跃动画
-    /// @param duration 动画时长
-    /// @param distination 目的坐标
-    /// @param height 跳跃高度
-    /// @param count 跳跃次数
-    ActionJumpToEntity(Duration duration, const Point& distination, float height, int count = 1);
-
-    /// \~chinese
-    /// @brief 获取目的坐标
-    Point GetDistination() const;
-
-    /// \~chinese
-    /// @brief 设置目的坐标
-    void SetDistination(const Point& distination);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionJumpToEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionJumpToEntity* Reverse() const override
-    {
-        KGE_ERRORF("Reverse() not supported in ActionJumpToEntity");
-        return nullptr;
-    }
-
-protected:
-    void Init(Actor* target) override;
-
-private:
-    Point distination_;
-};
-
-/// \~chinese
-/// @brief 相对缩放动画
-class KGE_API ActionScaleBy : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对缩放动画
-    /// @param duration 动画时长
-    /// @param scale_x 横向缩放相对变化值
-    /// @param scale_y 纵向缩放相对变化值
-    ActionScaleBy(Duration duration, float scale_x, float scale_y);
-
-    /// \~chinese
-    /// @brief 创建相对缩放动画
-    /// @param duration 动画时长
-    /// @param scale 缩放相对变化值
-    ActionScaleBy(Duration duration, Vec2 scale);
-};
-
-/// \~chinese
-/// @brief 相对缩放动画实体
-class KGE_API ActionScaleByEntity : public ActionTweenEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对缩放动画
-    /// @param duration 动画时长
-    /// @param scale_x 横向缩放相对变化值
-    /// @param scale_y 纵向缩放相对变化值
-    ActionScaleByEntity(Duration duration, float scale_x, float scale_y);
-
-    /// \~chinese
-    /// @brief 获取横向缩放相对变化值
-    float GetScaleX() const;
-
-    /// \~chinese
-    /// @brief 获取横向缩放相对变化值
-    float GetScaleY() const;
-
-    /// \~chinese
-    /// @brief 设置纵向缩放相对变化值
-    void SetScaleX(float scale_x);
-
-    /// \~chinese
-    /// @brief 设置纵向缩放相对变化值
-    void SetScaleY(float scale_y);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionScaleByEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionScaleByEntity* Reverse() const override;
-
-protected:
-    void Init(Actor* target) override;
-
-    void UpdateTween(Actor* target, float percent) override;
-
-protected:
-    float start_scale_x_;
-    float start_scale_y_;
-    float delta_x_;
-    float delta_y_;
-};
-
-/// \~chinese
-/// @brief 缩放动画
-class KGE_API ActionScaleTo : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建缩放动画
-    /// @param duration 动画时长
-    /// @param scale_x 横向缩放目标值
-    /// @param scale_y 纵向缩放目标值
-    ActionScaleTo(Duration duration, float scale_x, float scale_y);
-
-    /// \~chinese
-    /// @brief 创建缩放动画
-    /// @param duration 动画时长
-    /// @param scale 缩放目标值
-    ActionScaleTo(Duration duration, Vec2 scale);
-};
-
-/// \~chinese
-/// @brief 缩放动画实体
-class KGE_API ActionScaleToEntity : public ActionScaleByEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建缩放动画
-    /// @param duration 动画时长
-    /// @param scale_x 横向缩放目标值
-    /// @param scale_y 纵向缩放目标值
-    ActionScaleToEntity(Duration duration, float scale_x, float scale_y);
-
-    /// \~chinese
-    /// @brief 获取横向缩放目标值
-    float GetTargetScaleX() const;
-
-    /// \~chinese
-    /// @brief 获取横向缩放目标值
-    float GetTargetScaleY() const;
-
-    /// \~chinese
-    /// @brief 设置纵向缩放目标值
-    void SetTargetScaleX(float scale_x);
-
-    /// \~chinese
-    /// @brief 设置纵向缩放目标值
-    void SetTargetScaleY(float scale_y);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionScaleToEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionScaleToEntity* Reverse() const override
-    {
-        KGE_ERRORF("Reverse() not supported in ActionScaleToEntity");
-        return nullptr;
-    }
-
-protected:
-    void Init(Actor* target) override;
-
-private:
-    float end_scale_x_;
-    float end_scale_y_;
-};
-
-/// \~chinese
-/// @brief 透明度渐变动画
-class KGE_API ActionFadeTo : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建透明度渐变动画
-    /// @param duration 动画时长
-    /// @param opacity 目标透明度
-    ActionFadeTo(Duration duration, float opacity);
-};
-
-/// \~chinese
-/// @brief 淡入动画
-class KGE_API ActionFadeIn : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建淡入动画
-    /// @param duration 动画时长
-    ActionFadeIn(Duration duration);
-};
-
-/// \~chinese
-/// @brief 淡出动画
-class KGE_API ActionFadeOut : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建淡出动画
-    /// @param duration 动画时长
-    ActionFadeOut(Duration duration);
-};
-
-/// \~chinese
-/// @brief 透明度渐变动画实体
-class KGE_API ActionFadeToEntity : public ActionTweenEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建透明度渐变动画
-    /// @param duration 动画时长
-    /// @param opacity 目标透明度
-    ActionFadeToEntity(Duration duration, float opacity);
-
-    /// \~chinese
-    /// @brief 获取目标透明度
-    float GetTargetOpacity() const;
-
-    /// \~chinese
-    /// @brief 设置目标透明度
-    void SetTargetOpacity(float opacity);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionFadeToEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionFadeToEntity* Reverse() const override
-    {
-        KGE_ERRORF("Reverse() not supported in ActionFadeToEntity");
-        return nullptr;
-    }
-
-protected:
-    void Init(Actor* target) override;
-
-    void UpdateTween(Actor* target, float percent) override;
-
-private:
-    float start_val_;
-    float delta_val_;
-    float end_val_;
-};
-
-/// \~chinese
-/// @brief 相对旋转动画
-class KGE_API ActionRotateBy : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对旋转动画
-    /// @param duration 动画时长
-    /// @param rotation 角度相对变化值
-    ActionRotateBy(Duration duration, float rotation);
-};
-
-/// \~chinese
-/// @brief 相对旋转动画实体
-class KGE_API ActionRotateByEntity : public ActionTweenEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建相对旋转动画
-    /// @param duration 动画时长
-    /// @param rotation 角度相对变化值
-    ActionRotateByEntity(Duration duration, float rotation);
-
-    /// \~chinese
-    /// @brief 获取角度相对变化值
-    float GetRotation() const;
-
-    /// \~chinese
-    /// @brief 设置角度相对变化值
-    void SetRotation(float rotation);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionRotateByEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionRotateByEntity* Reverse() const override;
-
-protected:
-    void Init(Actor* target) override;
-
-    void UpdateTween(Actor* target, float percent) override;
-
-protected:
-    float start_val_;
-    float delta_val_;
-};
-
-/// \~chinese
-/// @brief 旋转动画
-class KGE_API ActionRotateTo : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建旋转动画
-    /// @param duration 动画时长
-    /// @param rotation 目标角度
-    ActionRotateTo(Duration duration, float rotation);
-};
-
-/// \~chinese
-/// @brief 旋转动画实体
-class KGE_API ActionRotateToEntity : public ActionRotateByEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建旋转动画
-    /// @param duration 动画时长
-    /// @param rotation 目标角度
-    ActionRotateToEntity(Duration duration, float rotation);
-
-    /// \~chinese
-    /// @brief 获取目标角度
-    float GetTargetRotation() const;
-
-    /// \~chinese
-    /// @brief 设置目标角度
-    void SetTargetRotation(float rotation);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionRotateToEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionRotateToEntity* Reverse() const override
-    {
-        KGE_ERRORF("Reverse() not supported in ActionRotateToEntity");
-        return nullptr;
-    }
-
-protected:
-    void Init(Actor* target) override;
-
-private:
-    float end_val_;
-};
-
-/// \~chinese
-/// @brief 自定义动画
-class KGE_API ActionCustom : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 动画回调函数
-    /// @details 在动画更新时回调该函数，第一个参数是执行动画的目标，第二个参数是动画进度（0.0 - 1.0）
-    using TweenFunc = Function<void(Actor* /* target */, float /* percent */)>;
-
-    /// \~chinese
-    /// @brief 创建自定义动画
-    /// @param duration 动画时长
-    /// @param tween_func 动画回调函数
-    ActionCustom(Duration duration, TweenFunc tween_func);
-};
-
-/// \~chinese
-/// @brief 自定义动画实体
-class KGE_API ActionCustomEntity : public ActionTweenEntity
-{
-public:
-    /// \~chinese
-    /// @brief 创建自定义动画
-    /// @param duration 动画时长
-    /// @param tween_func 动画回调函数
-    ActionCustomEntity(Duration duration, ActionCustom::TweenFunc tween_func);
-
-    /// \~chinese
-    /// @brief 获取动画回调函数
-    ActionCustom::TweenFunc GetTweenFunc() const;
-
-    /// \~chinese
-    /// @brief 设置动画回调函数
-    void SetTweenFunc(const ActionCustom::TweenFunc& tween_func);
-
-    /// \~chinese
-    /// @brief 获取该动画的拷贝对象
-    ActionCustomEntity* Clone() const override;
-
-    /// \~chinese
-    /// @brief 获取该动画的倒转
-    ActionCustomEntity* Reverse() const override
-    {
-        KGE_ERRORF("Reverse() not supported in ActionCustomEntity");
-        return nullptr;
-    }
-
-protected:
-    void Init(Actor* target) override;
-
-    void UpdateTween(Actor* target, float percent) override;
-
-private:
-    ActionCustom::TweenFunc tween_func_;
-};
-
-/** @} */
-
-inline const EaseFunc& ActionTweenEntity::GetEaseFunc() const
-{
-    return ease_func_;
-}
-
-inline Duration ActionTweenEntity::GetDuration() const
-{
-    return dur_;
-}
-
-inline void ActionTweenEntity::SetDuration(Duration duration)
-{
-    dur_ = duration;
-}
-
-inline void ActionTweenEntity::SetEaseFunc(const EaseFunc& func)
-{
-    ease_func_ = func;
-}
-
-inline Vec2 ActionMoveByEntity::GetDisplacement() const
-{
-    return displacement_;
-}
-
-inline void ActionMoveByEntity::SetDisplacement(const Vec2& displacement)
-{
-    displacement_ = displacement;
-}
-
-inline Point ActionMoveToEntity::GetDistination() const
-{
-    return distination_;
-}
-
-inline void ActionMoveToEntity::SetDistination(const Point& distination)
-{
-    distination_ = distination;
-}
-
-inline Vec2 ActionJumpByEntity::GetDisplacement() const
-{
-    return displacement_;
-}
-
-inline float ActionJumpByEntity::GetJumpHeight() const
-{
-    return height_;
-}
-
-inline int ActionJumpByEntity::GetJumpCount() const
-{
-    return jump_count_;
-}
-
-inline void ActionJumpByEntity::SetDisplacement(const Vec2& displacement)
-{
-    displacement_ = displacement;
-}
-
-inline void ActionJumpByEntity::SetJumpHeight(float height)
-{
-    height_ = height;
-}
-
-inline void ActionJumpByEntity::SetJumpCount(int count)
-{
-    jump_count_ = count;
-}
-
-inline Point ActionJumpToEntity::GetDistination() const
-{
-    return distination_;
-}
-
-inline void ActionJumpToEntity::SetDistination(const Point& distination)
-{
-    distination_ = distination;
-}
-
-inline float ActionScaleByEntity::GetScaleX() const
-{
-    return delta_x_;
-}
-
-inline float ActionScaleByEntity::GetScaleY() const
-{
-    return delta_y_;
-}
-
-inline void ActionScaleByEntity::SetScaleX(float scale_x)
-{
-    delta_x_ = scale_x;
-}
-
-inline void ActionScaleByEntity::SetScaleY(float scale_y)
-{
-    delta_y_ = scale_y;
-}
-
-inline float ActionScaleToEntity::GetTargetScaleX() const
-{
-    return end_scale_x_;
-}
-
-inline float ActionScaleToEntity::GetTargetScaleY() const
-{
-    return end_scale_y_;
-}
-
-inline void ActionScaleToEntity::SetTargetScaleX(float scale_x)
-{
-    end_scale_x_ = scale_x;
-}
-
-inline void ActionScaleToEntity::SetTargetScaleY(float scale_y)
-{
-    end_scale_y_ = scale_y;
-}
-
-inline float ActionFadeToEntity::GetTargetOpacity() const
-{
-    return end_val_;
-}
-
-inline void ActionFadeToEntity::SetTargetOpacity(float opacity)
-{
-    end_val_ = opacity;
-}
-
-inline float ActionRotateByEntity::GetRotation() const
-{
-    return delta_val_;
-}
-
-inline void ActionRotateByEntity::SetRotation(float rotation)
-{
-    delta_val_ = rotation;
-}
-
-inline float ActionRotateToEntity::GetTargetRotation() const
-{
-    return end_val_;
-}
-
-inline void ActionRotateToEntity::SetTargetRotation(float rotation)
-{
-    end_val_ = rotation;
-}
-
-inline ActionCustom::TweenFunc ActionCustomEntity::GetTweenFunc() const
-{
-    return tween_func_;
-}
-
-inline void ActionCustomEntity::SetTweenFunc(const ActionCustom::TweenFunc& tween_func)
-{
-    tween_func_ = tween_func;
-}
-
-}  // namespace kiwano

src/kiwano/2d/animation/Animation.cpp

@@ -0,0 +1,194 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/Actor.h>
+#include <kiwano/2d/animation/Animation.h>
+
+namespace kiwano
+{
+Animation::Animation()
+    : running_(true)
+    , detach_target_(false)
+    , loops_done_(0)
+    , loops_(0)
+    , status_(Status::NotStarted)
+{
+}
+
+Animation::~Animation() {}
+
+void Animation::Init(Actor* target) {}
+
+void Animation::Update(Actor* target, Duration dt)
+{
+    Complete(target);
+}
+
+void Animation::UpdateStep(Actor* target, Duration dt)
+{
+    KGE_ASSERT(target != nullptr && "Animation target should NOT be nullptr!");
+
+    elapsed_ += dt;
+
+    if (status_ == Status::NotStarted)
+    {
+        if (delay_.IsZero())
+        {
+            status_ = Status::Started;
+            EmitEvent(target, AnimationEvent::Started);
+        }
+        else
+        {
+            status_ = Status::Delayed;
+        }
+        Init(target);
+    }
+
+    switch (status_)
+    {
+    case Status::Delayed:
+        if (elapsed_ >= delay_)
+        {
+            status_ = Status::Started;
+            EmitEvent(target, AnimationEvent::Started);
+        }
+        break;
+
+    case Status::Started:
+        Update(target, dt);
+        break;
+
+    default:
+        break;
+    }
+
+    if (status_ == Status::Done)
+    {
+        EmitEvent(target, AnimationEvent::Done);
+
+        if (detach_target_)
+            target->RemoveFromParent();
+
+        status_ = Status::Removeable;
+    }
+}
+
+void Animation::Complete(Actor* target)
+{
+    EmitEvent(target, AnimationEvent::LoopDone);
+
+    if (loops_ >= 0 && loops_done_ >= loops_)
+    {
+        Done();
+    }
+    else
+    {
+        Init(target);  // reinit when a loop is done
+    }
+
+    ++loops_done_;
+}
+
+void Animation::Reset()
+{
+    status_     = Status::NotStarted;
+    elapsed_    = 0;
+    loops_done_ = 0;
+}
+
+void Animation::DoClone(Animation* to) const
+{
+    if (to)
+    {
+        to->SetDelay(this->GetDelay());
+        to->SetHandler(this->GetHandler());
+        to->SetLoops(this->GetLoops());
+        to->SetName(this->GetName());
+    }
+}
+
+AnimationEventHandlerPtr AnimationEventHandler::Create(const Function<void(Animation*, Actor*, AnimationEvent)>& handler)
+{
+    class CallbackAnimationEventHandler : public AnimationEventHandler
+    {
+    public:
+        typedef Function<void(Animation*, Actor*, AnimationEvent)> Callback;
+
+        Callback handler;
+
+        CallbackAnimationEventHandler(const Callback& handler) : handler(handler) {}
+
+        void Handle(Animation* anim, Actor* target, AnimationEvent evt) override
+        {
+            if (handler)
+            {
+                handler(anim, target, evt);
+            }
+        }
+    };
+    return AnimationEventHandlerPtr(new CallbackAnimationEventHandler(handler));
+}
+
+AnimationEventHandlerPtr AnimationEventHandler::Create(AnimationEvent evt, const Function<void(Animation*, Actor*)>& handler)
+{
+    class OneEventAnimationEventHandler : public AnimationEventHandler
+    {
+    public:
+        typedef Function<void(Animation*, Actor*)> Callback;
+
+        AnimationEvent evt;
+        Callback       handler;
+
+        OneEventAnimationEventHandler(AnimationEvent evt, const Callback& handler)
+            : handler(handler)
+            , evt(evt)
+        {
+        }
+
+        void Handle(Animation* anim, Actor* target, AnimationEvent evt) override
+        {
+            if (this->evt != evt)
+                return;
+
+            if (handler)
+            {
+                handler(anim, target);
+            }
+        }
+    };
+    return AnimationEventHandlerPtr(new OneEventAnimationEventHandler(evt, handler));
+}
+
+AnimationEventHandlerPtr AnimationEventHandler::HandleStarted(const Function<void(Animation*, Actor*)>& handler)
+{
+    return AnimationEventHandler::Create(AnimationEvent::Started, handler);
+}
+
+AnimationEventHandlerPtr AnimationEventHandler::HandleLoopDone(const Function<void(Animation*, Actor*)>& handler)
+{
+    return AnimationEventHandler::Create(AnimationEvent::LoopDone, handler);
+}
+
+AnimationEventHandlerPtr AnimationEventHandler::HandleDone(const Function<void(Animation*, Actor*)>& handler)
+{
+    return AnimationEventHandler::Create(AnimationEvent::Done, handler);
+}
+
+}  // namespace kiwano

src/kiwano/2d/animation/Animation.h

@@ -0,0 +1,335 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/core/Common.h>
+#include <kiwano/core/Cloneable.h>
+#include <kiwano/base/ObjectBase.h>
+#include <kiwano/core/Time.h>
+#include <kiwano/core/IntrusiveList.h>
+#include <kiwano/math/Math.h>
+
+namespace kiwano
+{
+class Actor;
+class Animator;
+
+KGE_DECLARE_SMART_PTR(Animation);
+KGE_DECLARE_SMART_PTR(AnimationEventHandler);
+
+/**
+ * \~chinese
+ * \defgroup Animation 动画
+ */
+
+/**
+ * \addtogroup Animation
+ * @{
+ */
+
+/// \~chinese
+/// @brief 动画事件
+enum class AnimationEvent
+{
+    Started,   ///< 动画开始
+    LoopDone,  ///< 动画一次循环结束
+    Done,      ///< 动画结束
+};
+
+/// \~chinese
+/// @brief 动画事件处理器
+class KGE_API AnimationEventHandler : public RefObject
+{
+public:
+    /// \~chinese
+    /// @brief 处理动画事件
+    /// @param anim 动画对象
+    /// @param target 执行动画的对象
+    /// @param evt 动画事件
+    virtual void Handle(Animation* anim, Actor* target, AnimationEvent evt) = 0;
+
+    /// \~chinese
+    /// @brief 创建动画事件处理器
+    /// @param handler 处理动画事件回调函数
+    static AnimationEventHandlerPtr Create(const Function<void(Animation*, Actor*, AnimationEvent)>& handler);
+
+    /// \~chinese
+    /// @brief 创建动画事件处理器
+    /// @param evt 处理的动画事件
+    /// @param handler 处理动画事件回调函数
+    static AnimationEventHandlerPtr Create(AnimationEvent evt, const Function<void(Animation*, Actor*)>& handler);
+
+    /// \~chinese
+    /// @brief 创建Started动画事件处理器
+    /// @param handler 处理动画事件回调函数
+    static AnimationEventHandlerPtr HandleStarted(const Function<void(Animation*, Actor*)>& handler);
+
+    /// \~chinese
+    /// @brief 创建LoopDone动画事件处理器
+    /// @param handler 处理动画事件回调函数
+    static AnimationEventHandlerPtr HandleLoopDone(const Function<void(Animation*, Actor*)>& handler);
+
+    /// \~chinese
+    /// @brief 创建Done动画事件处理器
+    /// @param handler 处理动画事件回调函数
+    static AnimationEventHandlerPtr HandleDone(const Function<void(Animation*, Actor*)>& handler);
+};
+
+/// \~chinese
+/// @brief 动画列表
+typedef IntrusiveList<AnimationPtr> AnimationList;
+
+/// \~chinese
+/// @brief 动画
+class KGE_API Animation
+    : public ObjectBase
+    , public Cloneable<Animation>
+    , protected IntrusiveListValue<AnimationPtr>
+{
+    friend class Animator;
+    friend class AnimationGroup;
+    friend IntrusiveList<AnimationPtr>;
+
+public:
+    Animation();
+
+    virtual ~Animation();
+
+    /// \~chinese
+    /// @brief 继续动画
+    void Resume();
+
+    /// \~chinese
+    /// @brief 暂停动画
+    void Pause();
+
+    /// \~chinese
+    /// @brief 停止动画
+    void Stop();
+
+    /// \~chinese
+    /// @brief 设置动画延时
+    void SetDelay(Duration delay);
+
+    /// \~chinese
+    /// @brief 设置循环次数
+    /// @param loops 循环次数，-1 为永久循环
+    void SetLoops(int loops);
+
+    /// \~chinese
+    /// @brief 动画结束时移除目标角色
+    void RemoveTargetWhenDone();
+
+    /// \~chinese
+    /// @brief 获取动画的倒转
+    virtual Animation* Reverse() const = 0;
+
+    /// \~chinese
+    /// @brief 获取动画的运行状态
+    bool IsRunning() const;
+
+    /// \~chinese
+    /// @brief 获取动画的循环次数
+    int GetLoops() const;
+
+    /// \~chinese
+    /// @brief 获取动画的延时
+    Duration GetDelay() const;
+
+    /// \~chinese
+    /// @brief 设置动画事件处理
+    void SetHandler(AnimationEventHandlerPtr handler);
+
+    /// \~chinese
+    /// @brief 获取动画事件处理
+    AnimationEventHandlerPtr GetHandler() const;
+
+protected:
+    /// \~chinese
+    /// @brief 初始化动画
+    virtual void Init(Actor* target);
+
+    /// \~chinese
+    /// @brief 更新动画
+    virtual void Update(Actor* target, Duration dt);
+
+    /// \~chinese
+    /// @brief 更新一个时间步
+    void UpdateStep(Actor* target, Duration dt);
+
+    /// \~chinese
+    /// @brief 完成动画
+    void Complete(Actor* target);
+
+    /// \~chinese
+    /// @brief 重置动画
+    void Reset();
+
+    /// \~chinese
+    /// @brief 动画状态
+    enum class Status
+    {
+        NotStarted,  ///< 未开始
+        Delayed,     ///< 等待延时
+        Started,     ///< 已开始
+        Done,        ///< 已结束
+        Removeable   ///< 可移除
+    };
+
+    /// \~chinese
+    /// @brief 获取动画状态
+    Status GetStatus() const;
+
+    /// \~chinese
+    /// @brief 获取消逝时间
+    Duration GetElapsed() const;
+
+    /// \~chinese
+    /// @brief 获取完成的循环次数
+    int GetLoopsDone() const;
+
+    /// \~chinese
+    /// @brief 结束动画
+    void Done();
+
+    /// \~chinese
+    /// @brief 是否已结束
+    bool IsDone() const;
+
+    /// \~chinese
+    /// @brief 是否可移除
+    bool IsRemoveable() const;
+
+    /// \~chinese
+    /// @brief 发出动画事件
+    void EmitEvent(Actor* target, AnimationEvent evt);
+
+    /// \~chinese
+    /// @brief 执行克隆
+    void DoClone(Animation* to) const;
+
+private:
+    Status   status_;
+    bool     running_;
+    bool     detach_target_;
+    int      loops_;
+    int      loops_done_;
+    Duration delay_;
+    Duration elapsed_;
+
+    AnimationEventHandlerPtr handler_;
+};
+
+/** @} */
+
+inline void Animation::Resume()
+{
+    running_ = true;
+}
+
+inline void Animation::Pause()
+{
+    running_ = false;
+}
+
+inline void Animation::Stop()
+{
+    Done();
+}
+
+inline void Animation::SetDelay(Duration delay)
+{
+    delay_ = delay;
+}
+
+inline void Animation::SetLoops(int loops)
+{
+    loops_ = loops;
+}
+
+inline void Animation::RemoveTargetWhenDone()
+{
+    detach_target_ = true;
+}
+
+inline void Animation::Done()
+{
+    status_ = Status::Done;
+}
+
+inline Animation::Status Animation::GetStatus() const
+{
+    return status_;
+}
+
+inline bool Animation::IsRunning() const
+{
+    return running_;
+}
+
+inline bool Animation::IsDone() const
+{
+    return status_ == Status::Done || status_ == Status::Removeable;
+}
+
+inline bool Animation::IsRemoveable() const
+{
+    return status_ == Status::Removeable;
+}
+
+inline void Animation::EmitEvent(Actor* target, AnimationEvent evt)
+{
+    if (handler_)
+    {
+        handler_->Handle(this, target, evt);
+    }
+}
+
+inline int Animation::GetLoops() const
+{
+    return loops_;
+}
+
+inline Duration Animation::GetDelay() const
+{
+    return delay_;
+}
+
+inline void Animation::SetHandler(AnimationEventHandlerPtr handler)
+{
+    handler_ = handler;
+}
+
+inline AnimationEventHandlerPtr Animation::GetHandler() const
+{
+    return handler_;
+}
+
+inline Duration Animation::GetElapsed() const
+{
+    return elapsed_;
+}
+
+inline int Animation::GetLoopsDone() const
+{
+    return loops_done_;
+}
+
+}  // namespace kiwano

src/kiwano/2d/animation/AnimationGroup.cpp

@@ -18,52 +18,45 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/2d/Actor.h>
+#include <kiwano/2d/animation/AnimationGroup.h>
-#include <kiwano/2d/action/ActionGroup.h>
-#include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
 
-ActionGroup::ActionGroup(const Vector<ActionEntityPtr>& actions, bool parallel)
+AnimationGroup::AnimationGroup()
-{
-    SetEntity(MakePtr<ActionGroupEntity>(actions, parallel));
-}
-
-ActionGroupEntity::ActionGroupEntity()
     : parallel_(false)
 {
 }
 
-ActionGroupEntity::ActionGroupEntity(const Vector<ActionEntityPtr>& actions, bool parallel)
+AnimationGroup::AnimationGroup(const Vector<AnimationPtr>& animations, bool parallel)
     : parallel_(parallel)
 {
-    AddActions(actions);
+    AddAnimation(animations);
 }
 
-ActionGroupEntity::~ActionGroupEntity() {}
+AnimationGroup::~AnimationGroup() {}
 
-void ActionGroupEntity::Init(Actor* target)
+void AnimationGroup::Init(Actor* target)
 {
-    if (actions_.IsEmpty())
+    if (animations_.IsEmpty())
     {
         Done();
         return;
     }
 
-    // reset all actions
+    // reset all animations
-    for (current_ = actions_.GetFirst(); current_; current_ = current_->GetNext())
+    for (current_ = animations_.GetFirst(); current_; current_ = current_->GetNext())
     {
         current_->Reset();
     }
 
     if (!parallel_)
     {
-        current_ = actions_.GetFirst();
+        current_ = animations_.GetFirst();
     }
 }
 
-void ActionGroupEntity::Update(Actor* target, Duration dt)
+void AnimationGroup::Update(Actor* target, Duration dt)
 {
     if (!parallel_)
     {
@@ -83,7 +76,7 @@ void ActionGroupEntity::Update(Actor* target, Duration dt)
     else
     {
         bool done = true;
-        for (current_ = actions_.GetFirst(); current_; current_ = current_->GetNext())
+        for (current_ = animations_.GetFirst(); current_; current_ = current_->GetNext())
         {
             if (!current_->IsDone())
             {
@@ -99,46 +92,46 @@ void ActionGroupEntity::Update(Actor* target, Duration dt)
     }
 }
 
-void ActionGroupEntity::AddAction(ActionEntityPtr action)
+void AnimationGroup::AddAnimation(AnimationPtr animation)
 {
-    if (action)
+    if (animation)
     {
-        actions_.PushBack(action);
+        animations_.PushBack(animation);
     }
 }
 
-void ActionGroupEntity::AddActions(const Vector<ActionEntityPtr>& actions)
+void AnimationGroup::AddAnimation(const Vector<AnimationPtr>& animations)
 {
-    for (const auto& action : actions)
+    for (const auto& animation : animations)
-        AddAction(action);
+        AddAnimation(animation);
 }
 
-ActionGroupEntity* ActionGroupEntity::Clone() const
+AnimationGroup* AnimationGroup::Clone() const
 {
-    Vector<ActionEntityPtr> actions;
+    Vector<AnimationPtr> animations;
-    if (!actions_.IsEmpty())
+    if (!animations_.IsEmpty())
     {
-        for (auto action = actions_.GetFirst(); action; action = action->GetNext())
+        for (auto animation = animations_.GetFirst(); animation; animation = animation->GetNext())
         {
-            actions.push_back(action->Clone());
+            animations.push_back(animation->Clone());
         }
     }
-    ActionGroupEntity* ptr = new ActionGroupEntity(actions, parallel_);
+    AnimationGroup* ptr = new AnimationGroup(animations, parallel_);
     DoClone(ptr);
     return ptr;
 }
 
-ActionGroupEntity* ActionGroupEntity::Reverse() const
+AnimationGroup* AnimationGroup::Reverse() const
 {
-    Vector<ActionEntityPtr> actions;
+    Vector<AnimationPtr> animations;
-    if (!actions_.IsEmpty())
+    if (!animations_.IsEmpty())
     {
-        for (auto action = actions_.GetLast(); action; action = action->GetPrev())
+        for (auto animation = animations_.GetLast(); animation; animation = animation->GetPrev())
         {
-            actions.push_back(action->Reverse());
+            animations.push_back(animation->Reverse());
         }
     }
-    ActionGroupEntity* ptr = new ActionGroupEntity(actions, parallel_);
+    AnimationGroup* ptr = new AnimationGroup(animations, parallel_);
     DoClone(ptr);
     return ptr;
 }

src/kiwano/2d/animation/AnimationGroup.h

@@ -19,65 +19,54 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/2d/action/Action.h>
+#include <kiwano/2d/animation/Animation.h>
 
 namespace kiwano
 {
-KGE_DECLARE_SMART_PTR(ActionGroupEntity);
+KGE_DECLARE_SMART_PTR(AnimationGroup);
 
 /**
- * \addtogroup Actions
+ * \addtogroup Animation
  * @{
  */
 
+
 /// \~chinese
 /// @brief 动画组合
-class KGE_API ActionGroup : public Action
+class KGE_API AnimationGroup : public Animation
 {
 public:
-    /// \~chinese
+    AnimationGroup();
-    /// @brief 创建动画组合
-    /// @param actions 动画集合
-    /// @param parallel 同步执行
-    ActionGroup(const Vector<ActionEntityPtr>& actions, bool parallel = false);
-};
-
-/// \~chinese
-/// @brief 动画组合实体
-class KGE_API ActionGroupEntity : public ActionEntity
-{
-public:
-    ActionGroupEntity();
 
     /// \~chinese
     /// @brief 创建动画组合
-    /// @param actions 动画集合
+    /// @param animations ¶¯»­¼¯ºÏ
     /// @param parallel 同步执行
-    ActionGroupEntity(const Vector<ActionEntityPtr>& actions, bool parallel = false);
+    AnimationGroup(const Vector<AnimationPtr>& animations, bool parallel = false);
 
-    virtual ~ActionGroupEntity();
+    virtual ~AnimationGroup();
 
     /// \~chinese
     /// @brief 添加动画
-    /// @param action 动画
+    /// @param animation ¶¯»­
-    void AddAction(ActionEntityPtr action);
+    void AddAnimation(AnimationPtr animation);
 
     /// \~chinese
     /// @brief 添加多个动画
-    /// @param actions 动画集合
+    /// @param animations ¶¯»­¼¯ºÏ
-    void AddActions(const Vector<ActionEntityPtr>& actions);
+    void AddAnimation(const Vector<AnimationPtr>& animations);
 
     /// \~chinese
     /// @brief 获取所有动画
-    const ActionList& GetActions() const;
+    const AnimationList& GetAnimations() const;
 
     /// \~chinese
     /// @brief 获取该动画的拷贝对象
-    ActionGroupEntity* Clone() const override;
+    AnimationGroup* Clone() const override;
 
     /// \~chinese
     /// @brief 获取该动画的倒转
-    ActionGroupEntity* Reverse() const override;
+    AnimationGroup* Reverse() const override;
 
 protected:
     void Init(Actor* target) override;
@@ -86,15 +75,15 @@ protected:
 
 private:
     bool            parallel_;
-    ActionEntityPtr current_;
+    AnimationPtr current_;
-    ActionList      actions_;
+    AnimationList      animations_;
 };
 
 /** @} */
 
-inline const ActionList& ActionGroupEntity::GetActions() const
+inline const AnimationList& AnimationGroup::GetAnimations() const
 {
-    return actions_;
+    return animations_;
 }
 
 }  // namespace kiwano

src/kiwano/2d/animation/AnimationWrapper.h

@@ -0,0 +1,311 @@
+// Copyright (c) 2020-2021 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/animation/Animation.h>
+#include <kiwano/2d/animation/TweenAnimation.h>
+#include <kiwano/2d/animation/PathAnimation.h>
+#include <kiwano/2d/animation/DelayAnimation.h>
+#include <kiwano/2d/animation/FrameAnimation.h>
+#include <kiwano/2d/animation/CustomAnimation.h>
+#include <kiwano/2d/animation/AnimationGroup.h>
+
+namespace kiwano
+{
+
+/// \~chinese
+/// @brief 动画包装器
+class KGE_API AnimationWrapper
+{
+public:
+    AnimationWrapper() = default;
+
+    inline AnimationWrapper(AnimationPtr ptr)
+        : ptr(ptr)
+    {
+    }
+
+    /// \~chinese
+    /// @brief 设置循环次数
+    inline AnimationWrapper& Loops(int loops)
+    {
+        if (ptr)
+            ptr->SetLoops(loops);
+        return (*this);
+    }
+
+    /// \~chinese
+    /// @brief 设置动画延迟
+    inline AnimationWrapper& Delay(Duration delay)
+    {
+        if (ptr)
+            ptr->SetDelay(delay);
+        return (*this);
+    }
+
+    /// \~chinese
+    /// @brief 设置动画结束回调函数
+    inline AnimationWrapper& Handler(AnimationEventHandlerPtr handler)
+    {
+        if (ptr)
+            ptr->SetHandler(handler);
+        return (*this);
+    }
+
+    /// \~chinese
+    /// @brief 动画结束时移除目标角色
+    inline AnimationWrapper& RemoveTargetWhenDone()
+    {
+        if (ptr)
+            ptr->RemoveTargetWhenDone();
+        return (*this);
+    }
+
+    /// \~chinese
+    /// @brief 设置名称
+    inline AnimationWrapper& Name(const String& name)
+    {
+        if (ptr)
+            ptr->SetName(name);
+        return (*this);
+    }
+
+    /// \~chinese
+    /// @brief 设置缓动函数
+    inline AnimationWrapper& Ease(const EaseFunc& ease)
+    {
+        auto tween = dynamic_cast<TweenAnimation*>(ptr.Get());
+        if (tween)
+        {
+            tween->SetEaseFunc(ease);
+        }
+        return (*this);
+    }
+
+    /// \~chinese
+    /// @brief 克隆动画
+    inline AnimationWrapper Clone() const
+    {
+        if (ptr)
+            return AnimationWrapper(ptr->Clone());
+        return AnimationWrapper();
+    }
+
+    /// \~chinese
+    /// @brief 获取反向动画
+    inline AnimationWrapper Reverse() const
+    {
+        if (ptr)
+            return AnimationWrapper(ptr->Reverse());
+        return AnimationWrapper();
+    }
+
+    /// \~chinese
+    /// @brief 获取指针
+    inline Animation* Get() const
+    {
+        return const_cast<Animation*>(ptr.Get());
+    }
+
+    /// \~chinese
+    /// @brief 设置动画
+    inline void SetEntity(AnimationPtr ptr)
+    {
+        this->ptr = ptr;
+    }
+
+    inline Animation* operator->() const
+    {
+        return Get();
+    }
+
+    inline operator Animation*() const
+    {
+        return Get();
+    }
+
+    inline operator AnimationPtr() const
+    {
+        return ptr;
+    }
+
+    inline operator bool() const
+    {
+        return ptr != nullptr;
+    }
+
+protected:
+    AnimationPtr ptr;
+};
+
+namespace animation
+{
+
+/// \~chinese
+/// @brief 创建相对位移动画
+/// @param duration 动画时长
+/// @param displacement 位移向量
+inline AnimationWrapper MoveBy(kiwano::Duration duration, const Vec2& displacement)
+{
+    return AnimationWrapper(new MoveByAnimation(duration, displacement));
+}
+
+/// \~chinese
+/// @brief 创建位移动画
+/// @param duration 动画时长
+/// @param distination 目的坐标
+inline AnimationWrapper MoveTo(kiwano::Duration duration, const Point& distination)
+{
+    return AnimationWrapper(new MoveToAnimation(duration, distination));
+}
+
+/// \~chinese
+/// @brief 创建相对跳跃动画
+/// @param duration 动画时长
+/// @param displacement 跳跃位移向量
+/// @param height 跳跃高度
+/// @param count 跳跃次数
+inline AnimationWrapper JumpBy(kiwano::Duration duration, const Vec2& displacement, float height, int count = 1)
+{
+    return AnimationWrapper(new JumpByAnimation(duration, displacement, height, count));
+}
+
+/// \~chinese
+/// @brief 创建跳跃动画
+/// @param duration 动画时长
+/// @param distination 目的坐标
+/// @param height 跳跃高度
+/// @param count 跳跃次数
+inline AnimationWrapper JumpTo(kiwano::Duration duration, const Point& distination, float height, int count = 1)
+{
+    return AnimationWrapper(new JumpToAnimation(duration, distination, height, count));
+}
+
+/// \~chinese
+/// @brief 创建相对缩放动画
+/// @param duration 动画时长
+/// @param scale 缩放相对变化值
+inline AnimationWrapper ScaleBy(kiwano::Duration duration, Vec2 scale)
+{
+    return AnimationWrapper(new ScaleByAnimation(duration, scale));
+}
+
+/// \~chinese
+/// @brief 创建缩放动画
+/// @param duration 动画时长
+/// @param scale 缩放目标值
+inline AnimationWrapper ScaleTo(kiwano::Duration duration, Vec2 scale)
+{
+    return AnimationWrapper(new ScaleToAnimation(duration, scale));
+}
+
+/// \~chinese
+/// @brief 创建透明度渐变动画
+/// @param duration 动画时长
+/// @param opacity 目标透明度
+inline AnimationWrapper FadeTo(kiwano::Duration duration, float opacity)
+{
+    return AnimationWrapper(new FadeToAnimation(duration, opacity));
+}
+
+/// \~chinese
+/// @brief 创建淡入动画
+/// @param duration 动画时长
+inline AnimationWrapper FadeIn(kiwano::Duration duration)
+{
+    return AnimationWrapper(new FadeToAnimation(duration, 1.0f));
+}
+
+/// \~chinese
+/// @brief 创建淡出动画
+/// @param duration 动画时长
+inline AnimationWrapper FadeOut(kiwano::Duration duration)
+{
+    return AnimationWrapper(new FadeToAnimation(duration, 0.0f));
+}
+
+/// \~chinese
+/// @brief 创建相对旋转动画
+/// @param duration 动画时长
+/// @param rotation 角度相对变化值
+inline AnimationWrapper RotateBy(kiwano::Duration duration, float rotation)
+{
+    return AnimationWrapper(new RotateByAnimation(duration, rotation));
+}
+
+/// \~chinese
+/// @brief 创建旋转动画
+/// @param duration 动画时长
+/// @param rotation 目标角度
+inline AnimationWrapper RotateTo(kiwano::Duration duration, float rotation)
+{
+    return AnimationWrapper(new RotateToAnimation(duration, rotation));
+}
+
+/// \~chinese
+/// @brief 创建自定义动画
+/// @param duration 动画时长
+/// @param tween_func 动画回调函数
+inline AnimationWrapper Custom(kiwano::Duration duration, TweenFunc tween_func)
+{
+    return AnimationWrapper(new CustomAnimation(duration, tween_func));
+}
+
+/// \~chinese
+/// @brief 创建路径行走动画
+/// @param duration 持续时长
+/// @param path 路径形状
+/// @param rotating 是否沿路径切线方向旋转
+/// @param start 路径起点（百分比）
+/// @param end 路径终点（百分比）
+inline AnimationWrapper Path(kiwano::Duration duration, ShapePtr path, bool rotating = false, float start = 0.f,
+                             float end = 1.f)
+{
+    return AnimationWrapper(new PathAnimation(duration, path, rotating, start, end));
+}
+
+/// \~chinese
+/// @brief 创建延时动画
+/// @param delay 延时时长
+inline AnimationWrapper Delay(kiwano::Duration delay)
+{
+    return AnimationWrapper(new DelayAnimation(delay));
+}
+
+/// \~chinese
+/// @brief 创建帧动画
+/// @param duration 动画时长
+/// @param frame_seq 序列帧
+inline AnimationWrapper Frames(kiwano::Duration duration, FrameSequencePtr frame_seq)
+{
+    return AnimationWrapper(new FrameAnimation(duration, frame_seq));
+}
+
+/// \~chinese
+/// @brief 创建动画组合
+/// @param actions 动画集合
+/// @param parallel 同步执行
+inline AnimationWrapper Group(const Vector<AnimationPtr>& animations, bool parallel = false)
+{
+    return AnimationWrapper(new AnimationGroup(animations, parallel));
+}
+
+}  // namespace animation
+}  // namespace kiwano

src/kiwano/2d/animation/Animator.cpp

@@ -19,87 +19,87 @@
 // THE SOFTWARE.
 
 #include <kiwano/2d/Actor.h>
-#include <kiwano/2d/action/ActionScheduler.h>
+#include <kiwano/2d/animation/Animator.h>
 #include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
 
-void ActionScheduler::Update(Actor* target, Duration dt)
+void Animator::Update(Actor* target, Duration dt)
 {
-    if (actions_.IsEmpty() || !target)
+    if (animations_.IsEmpty() || !target)
         return;
 
-    ActionEntityPtr next;
+    AnimationPtr next;
-    for (auto action = actions_.GetFirst(); action; action = next)
+    for (auto animation = animations_.GetFirst(); animation; animation = next)
     {
-        next = action->GetNext();
+        next = animation->GetNext();
 
-        if (action->IsRunning())
+        if (animation->IsRunning())
-            action->UpdateStep(target, dt);
+            animation->UpdateStep(target, dt);
 
-        if (action->IsRemoveable())
+        if (animation->IsRemoveable())
-            actions_.Remove(action);
+            animations_.Remove(animation);
     }
 }
 
-ActionEntity* ActionScheduler::AddAction(ActionEntityPtr action)
+Animation* Animator::AddAnimation(AnimationPtr animation)
 {
-    KGE_ASSERT(action && "AddAction failed, NULL pointer exception");
+    KGE_ASSERT(animation && "AddAnimation failed, NULL pointer exception");
 
-    if (action)
+    if (animation)
     {
-        actions_.PushBack(action);
+        animations_.PushBack(animation);
     }
-    return action.Get();
+    return animation.Get();
 }
 
-void ActionScheduler::ResumeAllActions()
+void Animator::ResumeAllAnimations()
 {
-    if (actions_.IsEmpty())
+    if (animations_.IsEmpty())
         return;
 
-    for (auto& action : actions_)
+    for (auto& animation : animations_)
     {
-        action->Resume();
+        animation->Resume();
     }
 }
 
-void ActionScheduler::PauseAllActions()
+void Animator::PauseAllAnimations()
 {
-    if (actions_.IsEmpty())
+    if (animations_.IsEmpty())
         return;
 
-    for (auto& action : actions_)
+    for (auto& animation : animations_)
     {
-        action->Pause();
+        animation->Pause();
     }
 }
 
-void ActionScheduler::StopAllActions()
+void Animator::StopAllAnimations()
 {
-    if (actions_.IsEmpty())
+    if (animations_.IsEmpty())
         return;
 
-    for (auto& action : actions_)
+    for (auto& animation : animations_)
     {
-        action->Stop();
+        animation->Stop();
     }
 }
 
-ActionEntity* ActionScheduler::GetAction(const String& name)
+Animation* Animator::GetAnimation(const String& name)
 {
-    if (actions_.IsEmpty())
+    if (animations_.IsEmpty())
         return nullptr;
 
-    for (auto& action : actions_)
+    for (auto& animation : animations_)
-        if (action->IsName(name))
+        if (animation->IsName(name))
-            return action.Get();
+            return animation.Get();
     return nullptr;
 }
 
-const ActionList& ActionScheduler::GetAllActions() const
+const AnimationList& Animator::GetAllAnimations() const
 {
-    return actions_;
+    return animations_;
 }
 }  // namespace kiwano

src/kiwano/2d/animation/Animator.h

@@ -19,13 +19,13 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/2d/action/Action.h>
+#include <kiwano/2d/animation/Animation.h>
 
 namespace kiwano
 {
 
 /**
- * \addtogroup Actions
+ * \addtogroup Animation
  * @{
  */
 
@@ -33,40 +33,47 @@ namespace kiwano
  * \~chinese
  * @brief 动画调度器
  */
-class KGE_API ActionScheduler
+class KGE_API Animator
 {
 public:
     /// \~chinese
     /// @brief 添加动画
-    ActionEntity* AddAction(ActionEntityPtr action);
+    Animation* AddAnimation(AnimationPtr animation);
+
+    /// \~chinese
+    /// @brief ¿ªÊ¼¶¯»­
+    inline Animation* StartAnimation(AnimationPtr animation)
+    {
+        return AddAnimation(animation);
+    }
 
     /// \~chinese
     /// @brief 继续所有暂停动画
-    void ResumeAllActions();
+    void ResumeAllAnimations();
 
     /// \~chinese
     /// @brief 暂停所有动画
-    void PauseAllActions();
+    void PauseAllAnimations();
 
     /// \~chinese
     /// @brief 停止所有动画
-    void StopAllActions();
+    void StopAllAnimations();
 
     /// \~chinese
     /// @brief 获取指定名称的动画
     /// @param name 动画名称
-    ActionEntity* GetAction(const String& name);
+    Animation* GetAnimation(const String& name);
 
     /// \~chinese
     /// @brief 获取所有动画
-    const ActionList& GetAllActions() const;
+    const AnimationList& GetAllAnimations() const;
 
     /// \~chinese
     /// @brief 更新动画
     void Update(Actor* target, Duration dt);
 
 private:
-    ActionList actions_;
+    AnimationList animations_;
 };
 
 /** @} */

src/kiwano/2d/animation/CustomAnimation.cpp

@@ -0,0 +1,51 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/animation/CustomAnimation.h>
+
+namespace kiwano
+{
+
+CustomAnimation::CustomAnimation(Duration duration, TweenFunc tween_func)
+    : TweenAnimation(duration)
+    , tween_func_(tween_func)
+{
+}
+
+CustomAnimation* CustomAnimation::Clone() const
+{
+    CustomAnimation* ptr = new CustomAnimation(GetDuration(), tween_func_);
+    DoClone(ptr);
+    return ptr;
+}
+
+void CustomAnimation::Init(Actor* target)
+{
+    if (!tween_func_)
+        this->Done();
+}
+
+void CustomAnimation::UpdateTween(Actor* target, float frac)
+{
+    if (tween_func_)
+        tween_func_(target, frac);
+}
+
+}  // namespace kiwano

src/kiwano/2d/animation/CustomAnimation.h

@@ -0,0 +1,93 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/animation/TweenAnimation.h>
+
+namespace kiwano
+{
+KGE_DECLARE_SMART_PTR(CustomAnimation);
+
+/**
+ * \addtogroup Animation
+ * @{
+ */
+
+
+/// \~chinese
+/// @brief 补间动画回调函数
+/// @details 在动画更新时回调该函数，第一个参数是执行动画的目标，第二个参数是动画进度（0.0 - 1.0）
+using TweenFunc = Function<void(Actor* /* target */, float /* frac */)>;
+
+/// \~chinese
+/// @brief 自定义动画
+class KGE_API CustomAnimation : public TweenAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建自定义动画
+    /// @param duration 动画时长
+    /// @param tween_func 动画回调函数
+    CustomAnimation(Duration duration, TweenFunc tween_func);
+
+    /// \~chinese
+    /// @brief 获取动画回调函数
+    TweenFunc GetTweenFunc() const;
+
+    /// \~chinese
+    /// @brief 设置动画回调函数
+    void SetTweenFunc(const TweenFunc& tween_func);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    CustomAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    CustomAnimation* Reverse() const override
+    {
+        KGE_ERRORF("Reverse() not supported in CustomAnimation");
+        return nullptr;
+    }
+
+protected:
+    void Init(Actor* target) override;
+
+    void UpdateTween(Actor* target, float frac) override;
+
+private:
+    TweenFunc tween_func_;
+};
+
+/** @} */
+
+
+
+inline TweenFunc CustomAnimation::GetTweenFunc() const
+{
+    return tween_func_;
+}
+
+inline void CustomAnimation::SetTweenFunc(const TweenFunc& tween_func)
+{
+    tween_func_ = tween_func;
+}
+
+}  // namespace kiwano

src/kiwano/2d/animation/DelayAnimation.cpp

@@ -18,29 +18,24 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/2d/action/ActionDelay.h>
+#include <kiwano/2d/animation/DelayAnimation.h>
 
 namespace kiwano
 {
 
-ActionDelay::ActionDelay(Duration delay)
+DelayAnimation::DelayAnimation(Duration delay)
-{
-    SetEntity(MakePtr<ActionDelayEntity>(delay));
-}
-
-ActionDelayEntity::ActionDelayEntity(Duration delay)
 {
     this->SetDelay(delay);
 }
 
-ActionDelayEntity* ActionDelayEntity::Clone() const
+DelayAnimation* DelayAnimation::Clone() const
 {
-    ActionDelayEntity* ptr = new ActionDelayEntity(GetDelay());
+    DelayAnimation* ptr = new DelayAnimation(GetDelay());
     DoClone(ptr);
     return ptr;
 }
 
-ActionDelayEntity* ActionDelayEntity::Reverse() const
+DelayAnimation* DelayAnimation::Reverse() const
 {
     return Clone();
 }

src/kiwano/2d/animation/DelayAnimation.h

@@ -19,46 +19,36 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/2d/action/Action.h>
+#include <kiwano/2d/animation/Animation.h>
 
 namespace kiwano
 {
 
-KGE_DECLARE_SMART_PTR(ActionDelayEntity);
+KGE_DECLARE_SMART_PTR(DelayAnimation);
 
 /**
- * \addtogroup Actions
+ * \addtogroup Animation
  * @{
  */
 
-/// \~chinese
-/// @brief 延时动画
-class KGE_API ActionDelay : public Action
-{
-public:
-    /// \~chinese
-    /// @brief 创建延时动画
-    /// @param delay 延时时长
-    ActionDelay(Duration delay);
-};
 
 /// \~chinese
-/// @brief 延时动画实体
+/// @brief 延时动画
-class KGE_API ActionDelayEntity : public ActionEntity
+class KGE_API DelayAnimation : public Animation
 {
 public:
     /// \~chinese
     /// @brief 创建延时动画
     /// @param delay 延时时长
-    ActionDelayEntity(Duration delay);
+    DelayAnimation(Duration delay);
 
     /// \~chinese
     /// @brief 获取该动画的拷贝对象
-    ActionDelayEntity* Clone() const override;
+    DelayAnimation* Clone() const override;
 
     /// \~chinese
     /// @brief 获取该动画的倒转
-    ActionDelayEntity* Reverse() const override;
+    DelayAnimation* Reverse() const override;
 };
 
 /** @} */

src/kiwano/2d/animation/EaseFunc.cpp

@@ -0,0 +1,84 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/animation/EaseFunc.h>
+#include <kiwano/math/Math.h>
+
+namespace kiwano
+{
+
+inline EaseFunc MakeEaseIn(float rate)
+{
+    return std::bind(math::EaseIn, std::placeholders::_1, rate);
+}
+inline EaseFunc MakeEaseOut(float rate)
+{
+    return std::bind(math::EaseOut, std::placeholders::_1, rate);
+}
+inline EaseFunc MakeEaseInOut(float rate)
+{
+    return std::bind(math::EaseInOut, std::placeholders::_1, rate);
+}
+inline EaseFunc MakeEaseElasticIn(float period)
+{
+    return std::bind(math::EaseElasticIn, std::placeholders::_1, period);
+}
+inline EaseFunc MakeEaseElasticOut(float period)
+{
+    return std::bind(math::EaseElasticOut, std::placeholders::_1, period);
+}
+inline EaseFunc MakeEaseElasticInOut(float period)
+{
+    return std::bind(math::EaseElasticInOut, std::placeholders::_1, period);
+}
+
+KGE_API EaseFunc Ease::Linear       = math::Linear;
+KGE_API EaseFunc Ease::EaseIn       = MakeEaseIn(2.f);
+KGE_API EaseFunc Ease::EaseOut      = MakeEaseOut(2.f);
+KGE_API EaseFunc Ease::EaseInOut    = MakeEaseInOut(2.f);
+KGE_API EaseFunc Ease::ExpoIn       = math::EaseExponentialIn;
+KGE_API EaseFunc Ease::ExpoOut      = math::EaseExponentialOut;
+KGE_API EaseFunc Ease::ExpoInOut    = math::EaseExponentialInOut;
+KGE_API EaseFunc Ease::BounceIn     = math::EaseBounceIn;
+KGE_API EaseFunc Ease::BounceOut    = math::EaseBounceOut;
+KGE_API EaseFunc Ease::BounceInOut  = math::EaseBounceInOut;
+KGE_API EaseFunc Ease::ElasticIn    = MakeEaseElasticIn(0.3f);
+KGE_API EaseFunc Ease::ElasticOut   = MakeEaseElasticOut(0.3f);
+KGE_API EaseFunc Ease::ElasticInOut = MakeEaseElasticInOut(0.3f);
+KGE_API EaseFunc Ease::SineIn       = math::EaseSineIn;
+KGE_API EaseFunc Ease::SineOut      = math::EaseSineOut;
+KGE_API EaseFunc Ease::SineInOut    = math::EaseSineInOut;
+KGE_API EaseFunc Ease::BackIn       = math::EaseBackIn;
+KGE_API EaseFunc Ease::BackOut      = math::EaseBackOut;
+KGE_API EaseFunc Ease::BackInOut    = math::EaseBackInOut;
+KGE_API EaseFunc Ease::QuadIn       = math::EaseQuadIn;
+KGE_API EaseFunc Ease::QuadOut      = math::EaseQuadOut;
+KGE_API EaseFunc Ease::QuadInOut    = math::EaseQuadInOut;
+KGE_API EaseFunc Ease::CubicIn      = math::EaseCubicIn;
+KGE_API EaseFunc Ease::CubicOut     = math::EaseCubicOut;
+KGE_API EaseFunc Ease::CubicInOut   = math::EaseCubicInOut;
+KGE_API EaseFunc Ease::QuartIn      = math::EaseQuartIn;
+KGE_API EaseFunc Ease::QuartOut     = math::EaseQuartOut;
+KGE_API EaseFunc Ease::QuartInOut   = math::EaseQuartInOut;
+KGE_API EaseFunc Ease::QuintIn      = math::EaseQuintIn;
+KGE_API EaseFunc Ease::QuintOut     = math::EaseQuintOut;
+KGE_API EaseFunc Ease::QuintInOut   = math::EaseQuintInOut;
+
+}

src/kiwano/2d/animation/EaseFunc.h

@@ -0,0 +1,69 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/core/Common.h>
+
+namespace kiwano
+{
+
+/// \~chinese
+/// @brief 缓动函数
+using EaseFunc = Function<float(float)>;
+
+/// \~chinese
+/// @brief 缓动函数枚举
+/// @details 查看 https://easings.net 获取更多信息
+struct Ease
+{
+    static KGE_API EaseFunc Linear;        ///< 线性
+    static KGE_API EaseFunc EaseIn;        ///< 由慢变快
+    static KGE_API EaseFunc EaseOut;       ///< 由快变慢
+    static KGE_API EaseFunc EaseInOut;     ///< 由慢变快, 再由快变慢
+    static KGE_API EaseFunc ExpoIn;        ///< 由慢变极快
+    static KGE_API EaseFunc ExpoOut;       ///< 由极快变慢
+    static KGE_API EaseFunc ExpoInOut;     ///< 由慢至极快, 再由极快边慢
+    static KGE_API EaseFunc ElasticIn;     ///< 自起点赋予弹性
+    static KGE_API EaseFunc ElasticOut;    ///< 自终点赋予弹性
+    static KGE_API EaseFunc ElasticInOut;  ///< 再起点和终点赋予弹性
+    static KGE_API EaseFunc BounceIn;      ///< 自起点赋予反弹力
+    static KGE_API EaseFunc BounceOut;     ///< 自终点赋予反弹力
+    static KGE_API EaseFunc BounceInOut;   ///< 在起点和终点赋予反弹力
+    static KGE_API EaseFunc BackIn;
+    static KGE_API EaseFunc BackOut;
+    static KGE_API EaseFunc BackInOut;
+    static KGE_API EaseFunc QuadIn;
+    static KGE_API EaseFunc QuadOut;
+    static KGE_API EaseFunc QuadInOut;
+    static KGE_API EaseFunc CubicIn;
+    static KGE_API EaseFunc CubicOut;
+    static KGE_API EaseFunc CubicInOut;
+    static KGE_API EaseFunc QuartIn;
+    static KGE_API EaseFunc QuartOut;
+    static KGE_API EaseFunc QuartInOut;
+    static KGE_API EaseFunc QuintIn;
+    static KGE_API EaseFunc QuintOut;
+    static KGE_API EaseFunc QuintInOut;
+    static KGE_API EaseFunc SineIn;
+    static KGE_API EaseFunc SineOut;
+    static KGE_API EaseFunc SineInOut;
+};
+
+}

src/kiwano/2d/animation/FrameAnimation.cpp

@@ -18,44 +18,40 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/render/FrameSequence.h>
+#include <kiwano/2d/animation/FrameAnimation.h>
 #include <kiwano/2d/Sprite.h>
-#include <kiwano/2d/action/Animation.h>
 
 namespace kiwano
 {
 
-Animation::Animation(Duration dur, FrameSequencePtr frame_seq)
+FrameAnimation::FrameAnimation()
-{
-    SetEntity(MakePtr<AnimationEntity>(dur, frame_seq));
-}
-
-AnimationEntity::AnimationEntity()
     : frame_seq_(nullptr)
+    , current_index_(0)
 {
 }
 
-AnimationEntity::AnimationEntity(Duration dur, FrameSequencePtr frame_seq)
+FrameAnimation::FrameAnimation(Duration dur, FrameSequencePtr frame_seq)
-    : ActionTweenEntity(dur)
+    : TweenAnimation(dur)
     , frame_seq_(frame_seq)
+    , current_index_(0)
 {
 }
 
-AnimationEntity::~AnimationEntity() {}
+FrameAnimation::~FrameAnimation() {}
 
-FrameSequencePtr AnimationEntity::GetFrameSequence() const
+FrameSequencePtr FrameAnimation::GetFrameSequence() const
 {
     return frame_seq_;
 }
 
-void AnimationEntity::SetFrameSequence(FrameSequencePtr frame_seq)
+void FrameAnimation::SetFrameSequence(FrameSequencePtr frame_seq)
 {
     frame_seq_ = frame_seq;
 }
 
-void AnimationEntity::Init(Actor* target)
+void FrameAnimation::Init(Actor* target)
 {
-    KGE_ASSERT(frame_seq_ && "AnimationEntity::Init() failed: FrameSequence is NULL!");
+    KGE_ASSERT(frame_seq_ && "FrameAnimation::Init() failed: FrameSequence is NULL!");
     if (!frame_seq_ || frame_seq_->GetFrames().empty())
     {
         Done();
@@ -63,15 +59,16 @@ void AnimationEntity::Init(Actor* target)
     }
 
     auto sprite_target = dynamic_cast<Sprite*>(target);
-    KGE_ASSERT(sprite_target && "AnimationEntity only supports Sprites!");
+    KGE_ASSERT(sprite_target && "FrameAnimation only supports Sprites!");
 
     if (sprite_target && frame_seq_)
     {
         sprite_target->SetFrame(frame_seq_->GetFrames()[0]);
+        current_index_ = 0;
     }
 }
 
-void AnimationEntity::UpdateTween(Actor* target, float percent)
+void FrameAnimation::UpdateTween(Actor* target, float percent)
 {
     auto sprite_target = dynamic_cast<Sprite*>(target);
 
@@ -81,20 +78,24 @@ void AnimationEntity::UpdateTween(Actor* target, float percent)
         auto        size   = frames.size();
         auto        index  = std::min(static_cast<size_t>(math::Floor(size * percent)), size - 1);
 
-        sprite_target->SetFrame(frames[index]);
+        if (index != current_index_)
+        {
+            current_index_ = index;
+            sprite_target->SetFrame(frames[index]);
+        }
     }
 }
 
-AnimationEntity* AnimationEntity::Clone() const
+FrameAnimation* FrameAnimation::Clone() const
 {
-    AnimationEntity* ptr = new AnimationEntity(GetDuration(), frame_seq_);
+    FrameAnimation* ptr = new FrameAnimation(GetDuration(), frame_seq_);
     DoClone(ptr);
     return ptr;
 }
 
-AnimationEntity* AnimationEntity::Reverse() const
+FrameAnimation* FrameAnimation::Reverse() const
 {
-    AnimationEntity* ptr = new AnimationEntity(GetDuration(), nullptr);
+    FrameAnimation* ptr = new FrameAnimation(GetDuration(), nullptr);
     DoClone(ptr);
 
     if (frame_seq_)

src/kiwano/2d/animation/FrameAnimation.h

@@ -19,45 +19,33 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/render/FrameSequence.h>
+#include <kiwano/2d/animation/TweenAnimation.h>
-#include <kiwano/2d/action/ActionTween.h>
+#include <kiwano/2d/animation/FrameSequence.h>
 
 namespace kiwano
 {
 
-KGE_DECLARE_SMART_PTR(AnimationEntity);
+KGE_DECLARE_SMART_PTR(FrameAnimation);
 
 /**
- * \addtogroup Actions
+ * \addtogroup Animation
  * @{
  */
 
 /// \~chinese
 /// @brief 帧动画
-class KGE_API Animation : public ActionTween
+class KGE_API FrameAnimation : public TweenAnimation
 {
 public:
-    /// \~chinese
+    FrameAnimation();
-    /// @brief 创建帧动画
-    /// @param dur 动画时长
-    /// @param frame_seq 序列帧
-    Animation(Duration dur, FrameSequencePtr frame_seq);
-};
-
-/// \~chinese
-/// @brief 帧动画实体
-class KGE_API AnimationEntity : public ActionTweenEntity
-{
-public:
-    AnimationEntity();
 
     /// \~chinese
     /// @brief 创建帧动画
     /// @param dur 动画时长
     /// @param frame_seq 序列帧
-    AnimationEntity(Duration dur, FrameSequencePtr frame_seq);
+    FrameAnimation(Duration dur, FrameSequencePtr frame_seq);
 
-    virtual ~AnimationEntity();
+    virtual ~FrameAnimation();
 
     /// \~chinese
     /// @brief 获取序列帧
@@ -70,11 +58,11 @@ public:
 
     /// \~chinese
     /// @brief 获取该动画的拷贝对象
-    AnimationEntity* Clone() const override;
+    FrameAnimation* Clone() const override;
 
     /// \~chinese
     /// @brief 获取该动画的倒转
-    AnimationEntity* Reverse() const override;
+    FrameAnimation* Reverse() const override;
 
 protected:
     void Init(Actor* target) override;
@@ -82,6 +70,7 @@ protected:
     void UpdateTween(Actor* target, float percent) override;
 
 private:
+    size_t           current_index_;
     FrameSequencePtr frame_seq_;
 };
 

src/kiwano/2d/animation/FrameSequence.cpp

@@ -18,40 +18,34 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <kiwano/render/FrameSequence.h>
+#include <kiwano/2d/animation/FrameSequence.h>
 #include <kiwano/utils/Logger.h>
 
 namespace kiwano
 {
 
-FrameSequence::FrameSequence(const Vector<FramePtr>& frames)
-{
-    AddFrames(frames);
-}
-
-FrameSequence::FrameSequence(FramePtr frame, int cols, int rows, int max_num, float padding_x,
-                                       float padding_y)
-{
-    AddFrames(frame, cols, rows, max_num, padding_x, padding_y);
-}
-
 FrameSequence::FrameSequence() {}
 
 FrameSequence::~FrameSequence() {}
 
-void FrameSequence::AddFrame(FramePtr frame)
+FrameSequence::FrameSequence(const Vector<SpriteFrame>& frames)
 {
-    if (frame)
+    AddFrames(frames);
+}
+
+void FrameSequence::AddFrame(const SpriteFrame& frame)
+{
+    if (frame.IsValid())
     {
         frames_.push_back(frame);
     }
     else
     {
-        Fail("FrameSequence::Add failed, NULL pointer exception");
+        Fail("FrameSequence::AddFrame failed, frame is invalid");
     }
 }
 
-void FrameSequence::AddFrames(const Vector<FramePtr>& frames)
+void FrameSequence::AddFrames(const Vector<SpriteFrame>& frames)
 {
     if (frames_.empty())
         frames_ = frames;
@@ -63,58 +57,13 @@ void FrameSequence::AddFrames(const Vector<FramePtr>& frames)
     }
 }
 
-void FrameSequence::AddFrames(FramePtr frame, int cols, int rows, int max_num, float padding_x, float padding_y)
+const SpriteFrame& FrameSequence::GetFrame(size_t index) const
-{
-    if (cols <= 0 || rows <= 0 || max_num == 0)
-        return;
-
-    if (!frame)
-        return;
-
-    Rect  src_rect   = frame->GetCropRect();
-    float raw_width  = src_rect.GetWidth();
-    float raw_height = src_rect.GetHeight();
-    float width      = (raw_width - (cols - 1) * padding_x) / cols;
-    float height     = (raw_height - (rows - 1) * padding_y) / rows;
-
-    Vector<FramePtr> frames;
-    frames.reserve((max_num > 0) ? max_num : (rows * cols));
-
-    int current_num = 0;
-
-    float dty = src_rect.GetTop();
-    for (int i = 0; i < rows; i++)
-    {
-        float dtx = src_rect.GetLeft();
-
-        for (int j = 0; j < cols; j++)
-        {
-            FramePtr ptr = MakePtr<Frame>();
-            if (ptr)
-            {
-                ptr->SetTexture(frame->GetTexture());
-                ptr->SetCropRect(Rect{ dtx, dty, dtx + width, dty + height });
-                frames.push_back(ptr);
-                ++current_num;
-            }
-            dtx += (width + padding_x);
-        }
-        dty += (height + padding_y);
-
-        if (max_num > 0 && current_num == max_num)
-            break;
-    }
-
-    AddFrames(frames);
-}
-
-FramePtr FrameSequence::GetFrame(size_t index) const
 {
     KGE_ASSERT(index < frames_.size());
     return frames_[index];
 }
 
-const Vector<FramePtr>& FrameSequence::GetFrames() const
+const Vector<SpriteFrame>& FrameSequence::GetFrames() const
 {
     return frames_;
 }

src/kiwano/2d/animation/FrameSequence.h

@@ -19,9 +19,9 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/render/Frame.h>
 #include <kiwano/core/Common.h>
 #include <kiwano/core/Time.h>
+#include <kiwano/2d/SpriteFrame.h>
 
 namespace kiwano
 {
@@ -36,19 +36,8 @@ class KGE_API FrameSequence : public ObjectBase
 public:
     /// \~chinese
     /// @brief ´´½¨ÐòÁÐÖ¡
-    /// @param frames 图像帧集合
+    /// @param frames 精灵帧集合
-    FrameSequence(const Vector<FramePtr>& frames);
+    FrameSequence(const Vector<SpriteFrame>& frames);
-
-    /// \~chinese
-    /// @brief 按行列分割图像并创建序列帧
-    /// @param frame 图像帧
-    /// @param cols 列数
-    /// @param rows 行数
-    /// @param max_num 最大帧数量，设-1为将分割后的图像全部作为序列帧
-    /// @param padding_x X方向间隔
-    /// @param padding_y Y方向间隔
-    FrameSequence(FramePtr frame, int cols, int rows = 1, int max_num = -1, float padding_x = 0,
-                                   float padding_y = 0);
 
     /// \~chinese
     /// @brief ¹¹½¨¿ÕÐòÁÐÖ¡
@@ -57,36 +46,26 @@ public:
     virtual ~FrameSequence();
 
     /// \~chinese
-    /// @brief 添加关键帧
+    /// @brief 添加精灵帧
-    /// @param frame 图像帧
+    /// @param frame 精灵帧
-    void AddFrame(FramePtr frame);
+    void AddFrame(const SpriteFrame& frame);
 
     /// \~chinese
-    /// @brief 添加多个关键帧
+    /// @brief 添加多个精灵帧
-    /// @param frames 图像帧集合
+    /// @param frames 精灵帧集合
-    void AddFrames(const Vector<FramePtr>& frames);
+    void AddFrames(const Vector<SpriteFrame>& frames);
 
     /// \~chinese
-    /// @brief 按行列分割图像并添加序列帧
+    /// @brief 获取精灵帧
-    /// @param frame 图像帧
+    /// @param index 精灵帧下标
-    /// @param cols 列数
+    const SpriteFrame& GetFrame(size_t index) const;
-    /// @param rows 行数
-    /// @param max_num 最大帧数量，设-1为将分割后的图像全部作为序列帧
-    /// @param padding_x X方向间隔
-    /// @param padding_y Y方向间隔
-    void AddFrames(FramePtr frame, int cols, int rows = 1, int max_num = -1, float padding_x = 0, float padding_y = 0);
 
     /// \~chinese
-    /// @brief 获取关键帧
+    /// @brief 获取所有精灵帧
-    /// @param index 图像帧下标
+    const Vector<SpriteFrame>& GetFrames() const;
-    FramePtr GetFrame(size_t index) const;
 
     /// \~chinese
-    /// @brief 获取所有关键帧
+    /// @brief 获取精灵帧数量
-    const Vector<FramePtr>& GetFrames() const;
-
-    /// \~chinese
-    /// @brief 获取关键帧数量
     size_t GetFramesCount() const;
 
     /// \~chinese
@@ -98,6 +77,7 @@ public:
     FrameSequencePtr Reverse() const;
 
 private:
-    Vector<FramePtr> frames_;
+    Vector<SpriteFrame> frames_;
 };
+
 }  // namespace kiwano

src/kiwano/2d/animation/PathAnimation.cpp

@@ -18,19 +18,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#include <kiwano/2d/animation/PathAnimation.h>
 #include <kiwano/2d/Actor.h>
-#include <kiwano/2d/action/ActionWalk.h>
 
 namespace kiwano
 {
 
-ActionWalk::ActionWalk(Duration duration, ShapePtr path, bool rotating, float start, float end)
+PathAnimation::PathAnimation(Duration duration, ShapePtr path, bool rotating, float start, float end)
-{
+    : TweenAnimation(duration)
-    SetEntity(MakePtr<ActionWalkEntity>(duration, path, rotating, start, end));
-}
-
-ActionWalkEntity::ActionWalkEntity(Duration duration, ShapePtr path, bool rotating, float start, float end)
-    : ActionTweenEntity(duration)
     , start_(start)
     , end_(end)
     , rotating_(rotating)
@@ -39,21 +34,21 @@ ActionWalkEntity::ActionWalkEntity(Duration duration, ShapePtr path, bool rotati
 {
 }
 
-ActionWalkEntity* ActionWalkEntity::Clone() const
+PathAnimation* PathAnimation::Clone() const
 {
-    ActionWalkEntity* ptr = new ActionWalkEntity(GetDuration(), path_, rotating_, start_, end_);
+    PathAnimation* ptr = new PathAnimation(GetDuration(), path_, rotating_, start_, end_);
     DoClone(ptr);
     return ptr;
 }
 
-ActionWalkEntity* ActionWalkEntity::Reverse() const
+PathAnimation* PathAnimation::Reverse() const
 {
-    ActionWalkEntity* ptr = new ActionWalkEntity(GetDuration(), path_, rotating_, end_, start_);
+    PathAnimation* ptr = new PathAnimation(GetDuration(), path_, rotating_, end_, start_);
     DoClone(ptr);
     return ptr;
 }
 
-void ActionWalkEntity::Init(Actor* target)
+void PathAnimation::Init(Actor* target)
 {
     if (!path_ || !path_->IsValid())
     {
@@ -65,7 +60,7 @@ void ActionWalkEntity::Init(Actor* target)
     length_    = path_->GetLength();
 }
 
-void ActionWalkEntity::UpdateTween(Actor* target, float percent)
+void PathAnimation::UpdateTween(Actor* target, float percent)
 {
     float distance = length_ * std::min(std::max((end_ - start_) * percent + start_, 0.f), 1.f);
 

src/kiwano/2d/animation/PathAnimation.h

@@ -19,37 +19,22 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/2d/action/ActionTween.h>
+#include <kiwano/2d/animation/TweenAnimation.h>
 #include <kiwano/render/Shape.h>
-#include <kiwano/render/ShapeMaker.h>
 
 namespace kiwano
 {
-KGE_DECLARE_SMART_PTR(ActionWalkEntity);
+KGE_DECLARE_SMART_PTR(PathAnimation);
 
 /**
- * \addtogroup Actions
+ * \addtogroup Animation
  * @{
  */
 
-/// \~chinese
-/// @brief 路径行走动画
-class KGE_API ActionWalk : public ActionTween
-{
-public:
-    /// \~chinese
-    /// @brief 创建路径行走动画
-    /// @param duration 持续时长
-    /// @param path 路径形状
-    /// @param rotating 是否沿路径切线方向旋转
-    /// @param start 路径起点（百分比）
-    /// @param end 路径终点（百分比）
-    ActionWalk(Duration duration, ShapePtr path, bool rotating = false, float start = 0.f, float end = 1.f);
-};
 
 /// \~chinese
-/// @brief 路径行走动画实体
+/// @brief ·¾¶ÐÐ×߶¯»­
-class KGE_API ActionWalkEntity : public ActionTweenEntity
+class KGE_API PathAnimation : public TweenAnimation
 {
 public:
     /// \~chinese
@@ -59,7 +44,7 @@ public:
     /// @param rotating 是否沿路径切线方向旋转
     /// @param start 路径起点（百分比）
     /// @param end 路径终点（百分比）
-    ActionWalkEntity(Duration duration, ShapePtr path, bool rotating = false, float start = 0.f, float end = 1.f);
+    PathAnimation(Duration duration, ShapePtr path, bool rotating = false, float start = 0.f, float end = 1.f);
 
     /// \~chinese
     /// @brief 获取路线
@@ -95,11 +80,11 @@ public:
 
     /// \~chinese
     /// @brief 获取该动画的拷贝对象
-    ActionWalkEntity* Clone() const override;
+    PathAnimation* Clone() const override;
 
     /// \~chinese
     /// @brief 获取该动画的倒转
-    ActionWalkEntity* Reverse() const override;
+    PathAnimation* Reverse() const override;
 
 protected:
     void Init(Actor* target) override;
@@ -117,42 +102,42 @@ private:
 
 /** @} */
 
-inline ShapePtr ActionWalkEntity::GetPath() const
+inline ShapePtr PathAnimation::GetPath() const
 {
     return path_;
 }
 
-inline bool ActionWalkEntity::IsRotating() const
+inline bool PathAnimation::IsRotating() const
 {
     return rotating_;
 }
 
-inline float ActionWalkEntity::GetStartValue() const
+inline float PathAnimation::GetStartValue() const
 {
     return start_;
 }
 
-inline float ActionWalkEntity::GetEndValue() const
+inline float PathAnimation::GetEndValue() const
 {
     return end_;
 }
 
-inline void ActionWalkEntity::SetPath(ShapePtr path)
+inline void PathAnimation::SetPath(ShapePtr path)
 {
     path_ = path;
 }
 
-inline void ActionWalkEntity::SetRotating(bool rotating)
+inline void PathAnimation::SetRotating(bool rotating)
 {
     rotating_ = rotating;
 }
 
-inline void ActionWalkEntity::SetStartValue(float start)
+inline void PathAnimation::SetStartValue(float start)
 {
     start_ = start;
 }
 
-inline void ActionWalkEntity::SetEndValue(float end)
+inline void PathAnimation::SetEndValue(float end)
 {
     end_ = end;
 }

src/kiwano/2d/animation/TweenAnimation.cpp

@@ -0,0 +1,369 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/Actor.h>
+#include <kiwano/2d/animation/TweenAnimation.h>
+
+namespace kiwano
+{
+
+//-------------------------------------------------------
+// TweenAnimation
+//-------------------------------------------------------
+
+TweenAnimation::TweenAnimation()
+    : dur_()
+    , ease_func_(nullptr)
+{
+}
+
+TweenAnimation::TweenAnimation(Duration duration)
+    : dur_(duration)
+    , ease_func_(nullptr)
+{
+}
+
+float TweenAnimation::Interpolate(float frac)
+{
+    if (ease_func_)
+        frac = ease_func_(frac);
+    return frac;
+}
+
+void TweenAnimation::Update(Actor* target, Duration dt)
+{
+    float frac;
+
+    if (dur_.IsZero())
+    {
+        frac = 1.f;
+        Complete(target);
+    }
+    else
+    {
+        Duration elapsed    = GetElapsed() - GetDelay();
+        float    loops_done = elapsed / dur_;
+
+        while (GetLoopsDone() < static_cast<int>(loops_done))
+        {
+            Complete(target);  // loops_done_++
+        }
+
+        frac = (GetStatus() == Status::Done) ? 1.f : (loops_done - static_cast<float>(GetLoopsDone()));
+    }
+
+    frac = Interpolate(frac);
+
+    UpdateTween(target, frac);
+}
+
+void TweenAnimation::DoClone(TweenAnimation* to) const
+{
+    if (to)
+    {
+        Animation::DoClone(to);
+        to->SetDuration(this->GetDuration());
+        to->SetEaseFunc(this->GetEaseFunc());
+    }
+}
+
+//-------------------------------------------------------
+// Move Animation
+//-------------------------------------------------------
+
+MoveByAnimation::MoveByAnimation(Duration duration, const Vec2& displacement)
+    : TweenAnimation(duration)
+    , displacement_(displacement)
+{
+}
+
+void MoveByAnimation::Init(Actor* target)
+{
+    if (target)
+    {
+        prev_pos_ = start_pos_ = target->GetPosition();
+    }
+}
+
+void MoveByAnimation::UpdateTween(Actor* target, float frac)
+{
+    Point diff = target->GetPosition() - prev_pos_;
+    start_pos_ = start_pos_ + diff;
+
+    Point new_pos = start_pos_ + (displacement_ * frac);
+    target->SetPosition(new_pos);
+
+    prev_pos_ = new_pos;
+}
+
+MoveByAnimation* MoveByAnimation::Clone() const
+{
+    MoveByAnimation* ptr = new MoveByAnimation(GetDuration(), displacement_);
+    DoClone(ptr);
+    return ptr;
+}
+
+MoveByAnimation* MoveByAnimation::Reverse() const
+{
+    MoveByAnimation* ptr = new MoveByAnimation(GetDuration(), -displacement_);
+    DoClone(ptr);
+    return ptr;
+}
+
+MoveToAnimation::MoveToAnimation(Duration duration, const Point& distination)
+    : MoveByAnimation(duration, Vec2())
+    , distination_(distination)
+{
+}
+
+MoveToAnimation* MoveToAnimation::Clone() const
+{
+    MoveToAnimation* ptr = new MoveToAnimation(GetDuration(), distination_);
+    DoClone(ptr);
+    return ptr;
+}
+
+void MoveToAnimation::Init(Actor* target)
+{
+    MoveByAnimation::Init(target);
+    displacement_ = distination_ - start_pos_;
+}
+
+//-------------------------------------------------------
+// Jump Animation
+//-------------------------------------------------------
+
+JumpByAnimation::JumpByAnimation(Duration duration, const Vec2& displacement, float height, int count)
+    : TweenAnimation(duration)
+    , height_(height)
+    , jump_count_(count)
+    , displacement_(displacement)
+{
+}
+
+JumpByAnimation* JumpByAnimation::Clone() const
+{
+    JumpByAnimation* ptr = new JumpByAnimation(GetDuration(), displacement_, height_, jump_count_);
+    DoClone(ptr);
+    return ptr;
+}
+
+JumpByAnimation* JumpByAnimation::Reverse() const
+{
+    JumpByAnimation* ptr = new JumpByAnimation(GetDuration(), -displacement_, height_, jump_count_);
+    DoClone(ptr);
+    return ptr;
+}
+
+void JumpByAnimation::Init(Actor* target)
+{
+    if (target)
+    {
+        prev_pos_ = start_pos_ = target->GetPosition();
+    }
+}
+
+void JumpByAnimation::UpdateTween(Actor* target, float frac)
+{
+    float f = ::fmod(frac * jump_count_, 1.f);
+    float x = displacement_.x * frac;
+    float y = height_ * 4 * f * (1 - f);
+    y += displacement_.y * frac;
+
+    Point diff = target->GetPosition() - prev_pos_;
+    start_pos_ = diff + start_pos_;
+
+    Point new_pos = start_pos_ + Point(x, y);
+    target->SetPosition(new_pos);
+
+    prev_pos_ = new_pos;
+}
+
+JumpToAnimation::JumpToAnimation(Duration duration, const Point& distination, float height, int count)
+    : JumpByAnimation(duration, Vec2(), height, count)
+    , distination_(distination)
+{
+}
+
+JumpToAnimation* JumpToAnimation::Clone() const
+{
+    JumpToAnimation* ptr = new JumpToAnimation(GetDuration(), distination_, height_, jump_count_);
+    DoClone(ptr);
+    return ptr;
+}
+
+void JumpToAnimation::Init(Actor* target)
+{
+    JumpByAnimation::Init(target);
+    displacement_ = distination_ - start_pos_;
+}
+
+//-------------------------------------------------------
+// Scale Animation
+//-------------------------------------------------------
+
+ScaleByAnimation::ScaleByAnimation(Duration duration, const Vec2& scale)
+    : TweenAnimation(duration)
+    , delta_(scale)
+    , start_val_()
+{
+}
+
+void ScaleByAnimation::Init(Actor* target)
+{
+    if (target)
+    {
+        start_val_ = target->GetScale();
+    }
+}
+
+void ScaleByAnimation::UpdateTween(Actor* target, float frac)
+{
+    target->SetScale(Vec2{ start_val_.x + delta_.x * frac, start_val_.y + delta_.y * frac });
+}
+
+ScaleByAnimation* ScaleByAnimation::Clone() const
+{
+    ScaleByAnimation* ptr = new ScaleByAnimation(GetDuration(), delta_);
+    DoClone(ptr);
+    return ptr;
+}
+
+ScaleByAnimation* ScaleByAnimation::Reverse() const
+{
+    ScaleByAnimation* ptr = new ScaleByAnimation(GetDuration(), -delta_);
+    DoClone(ptr);
+    return ptr;
+}
+
+ScaleToAnimation::ScaleToAnimation(Duration duration, const Vec2& scale)
+    : ScaleByAnimation(duration, Vec2())
+    , end_val_(scale)
+{
+}
+
+ScaleToAnimation* ScaleToAnimation::Clone() const
+{
+    ScaleToAnimation* ptr = new ScaleToAnimation(GetDuration(), end_val_);
+    DoClone(ptr);
+    return ptr;
+}
+
+void ScaleToAnimation::Init(Actor* target)
+{
+    ScaleByAnimation::Init(target);
+    delta_ = end_val_ - start_val_;
+}
+
+//-------------------------------------------------------
+// Opacity Animation
+//-------------------------------------------------------
+
+FadeToAnimation::FadeToAnimation(Duration duration, float opacity)
+    : TweenAnimation(duration)
+    , delta_val_(0.0f)
+    , start_val_(0.f)
+    , end_val_(opacity)
+{
+}
+
+void FadeToAnimation::Init(Actor* target)
+{
+    if (target)
+    {
+        start_val_ = target->GetOpacity();
+        delta_val_ = end_val_ - start_val_;
+    }
+}
+
+void FadeToAnimation::UpdateTween(Actor* target, float frac)
+{
+    target->SetOpacity(start_val_ + delta_val_ * frac);
+}
+
+FadeToAnimation* FadeToAnimation::Clone() const
+{
+    FadeToAnimation* ptr = new FadeToAnimation(GetDuration(), end_val_);
+    DoClone(ptr);
+    return ptr;
+}
+
+//-------------------------------------------------------
+// Rotate Animation
+//-------------------------------------------------------
+
+RotateByAnimation::RotateByAnimation(Duration duration, float rotation)
+    : TweenAnimation(duration)
+    , delta_val_(rotation)
+    , start_val_(0.0f)
+{
+}
+
+void RotateByAnimation::Init(Actor* target)
+{
+    if (target)
+    {
+        start_val_ = target->GetRotation();
+    }
+}
+
+void RotateByAnimation::UpdateTween(Actor* target, float frac)
+{
+    float rotation = start_val_ + delta_val_ * frac;
+    if (rotation > 360.f)
+        rotation -= 360.f;
+
+    target->SetRotation(rotation);
+}
+
+RotateByAnimation* RotateByAnimation::Clone() const
+{
+    RotateByAnimation* ptr = new RotateByAnimation(GetDuration(), delta_val_);
+    DoClone(ptr);
+    return ptr;
+}
+
+RotateByAnimation* RotateByAnimation::Reverse() const
+{
+    RotateByAnimation* ptr = new RotateByAnimation(GetDuration(), -delta_val_);
+    DoClone(ptr);
+    return ptr;
+}
+
+RotateToAnimation::RotateToAnimation(Duration duration, float rotation)
+    : RotateByAnimation(duration, 0)
+    , end_val_(rotation)
+{
+}
+
+RotateToAnimation* RotateToAnimation::Clone() const
+{
+    RotateToAnimation* ptr = new RotateToAnimation(GetDuration(), end_val_);
+    DoClone(ptr);
+    return ptr;
+}
+
+void RotateToAnimation::Init(Actor* target)
+{
+    RotateByAnimation::Init(target);
+    delta_val_ = end_val_ - start_val_;
+}
+
+}  // namespace kiwano

src/kiwano/2d/animation/TweenAnimation.h

@@ -0,0 +1,627 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/animation/Animation.h>
+#include <kiwano/2d/animation/EaseFunc.h>
+#include <kiwano/utils/Logger.h>
+
+namespace kiwano
+{
+
+KGE_DECLARE_SMART_PTR(TweenAnimation);
+KGE_DECLARE_SMART_PTR(MoveByAnimation);
+KGE_DECLARE_SMART_PTR(MoveToAnimation);
+KGE_DECLARE_SMART_PTR(JumpByAnimation);
+KGE_DECLARE_SMART_PTR(JumpToAnimation);
+KGE_DECLARE_SMART_PTR(ScaleByAnimation);
+KGE_DECLARE_SMART_PTR(ScaleToAnimation);
+KGE_DECLARE_SMART_PTR(FadeToAnimation);
+KGE_DECLARE_SMART_PTR(RotateByAnimation);
+KGE_DECLARE_SMART_PTR(RotateToAnimation);
+
+/**
+ * \addtogroup Animation
+ * @{
+ */
+
+/// \~chinese
+/// @brief 补间动画
+class KGE_API TweenAnimation : public Animation
+{
+public:
+    /// \~chinese
+    /// @brief 获取动画时长
+    Duration GetDuration() const;
+
+    /// \~chinese
+    /// @brief 设置动画时长
+    void SetDuration(Duration duration);
+
+    /// \~chinese
+    /// @brief 获取动画速度缓动函数
+    const EaseFunc& GetEaseFunc() const;
+
+    /// \~chinese
+    /// @brief 设置动画速度缓动函数
+    void SetEaseFunc(const EaseFunc& func);
+
+protected:
+    TweenAnimation();
+
+    TweenAnimation(Duration duration);
+
+    float Interpolate(float frac);
+
+    void Update(Actor* target, Duration dt) override;
+
+    virtual void UpdateTween(Actor* target, float frac) = 0;
+
+    void DoClone(TweenAnimation* to) const;
+
+private:
+    Duration dur_;
+    EaseFunc ease_func_;
+};
+
+
+/// \~chinese
+/// @brief 相对位移动画
+class KGE_API MoveByAnimation : public TweenAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建相对位移动画
+    /// @param duration 动画时长
+    /// @param displacement 位移向量
+    MoveByAnimation(Duration duration, const Vec2& displacement);
+
+    /// \~chinese
+    /// @brief 获取位移向量
+    Vec2 GetDisplacement() const;
+
+    /// \~chinese
+    /// @brief 设置位移向量
+    void SetDisplacement(const Vec2& displacement);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    MoveByAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    MoveByAnimation* Reverse() const override;
+
+protected:
+    void Init(Actor* target) override;
+
+    void UpdateTween(Actor* target, float frac) override;
+
+protected:
+    Point start_pos_;
+    Point prev_pos_;
+    Vec2  displacement_;
+};
+
+
+/// \~chinese
+/// @brief 位移动画
+class KGE_API MoveToAnimation : public MoveByAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建位移动画
+    /// @param duration 动画时长
+    /// @param distination 目的坐标
+    MoveToAnimation(Duration duration, const Point& distination);
+
+    /// \~chinese
+    /// @brief 获取目的坐标
+    Point GetDistination() const;
+
+    /// \~chinese
+    /// @brief 设置目的坐标
+    void SetDistination(const Point& distination);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    MoveToAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    MoveToAnimation* Reverse() const override
+    {
+        KGE_ERRORF("Reverse() not supported in MoveToAnimation");
+        return nullptr;
+    }
+
+protected:
+    void Init(Actor* target) override;
+
+private:
+    Point distination_;
+};
+
+
+/// \~chinese
+/// @brief 相对跳跃动画
+class KGE_API JumpByAnimation : public TweenAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建相对跳跃动画
+    /// @param duration 动画时长
+    /// @param displacement 跳跃位移向量
+    /// @param height 跳跃高度
+    /// @param count 跳跃次数
+    JumpByAnimation(Duration duration, const Vec2& displacement, float height, int count = 1);
+
+    /// \~chinese
+    /// @brief 获取跳跃位移
+    Vec2 GetDisplacement() const;
+
+    /// \~chinese
+    /// @brief 获取跳跃高度
+    float GetJumpHeight() const;
+
+    /// \~chinese
+    /// @brief 获取跳跃次数
+    int GetJumpCount() const;
+
+    /// \~chinese
+    /// @brief 设置跳跃位移
+    void SetDisplacement(const Vec2& displacement);
+
+    /// \~chinese
+    /// @brief 设置跳跃高度
+    void SetJumpHeight(float height);
+
+    /// \~chinese
+    /// @brief 设置跳跃次数
+    void SetJumpCount(int count);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    JumpByAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    JumpByAnimation* Reverse() const override;
+
+protected:
+    void Init(Actor* target) override;
+
+    void UpdateTween(Actor* target, float frac) override;
+
+protected:
+    float height_;
+    int   jump_count_;
+    Point start_pos_;
+    Point displacement_;
+    Point prev_pos_;
+};
+
+
+/// \~chinese
+/// @brief 跳跃动画
+class KGE_API JumpToAnimation : public JumpByAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建跳跃动画
+    /// @param duration 动画时长
+    /// @param distination 目的坐标
+    /// @param height 跳跃高度
+    /// @param count 跳跃次数
+    JumpToAnimation(Duration duration, const Point& distination, float height, int count = 1);
+
+    /// \~chinese
+    /// @brief 获取目的坐标
+    Point GetDistination() const;
+
+    /// \~chinese
+    /// @brief 设置目的坐标
+    void SetDistination(const Point& distination);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    JumpToAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    JumpToAnimation* Reverse() const override
+    {
+        KGE_ERRORF("Reverse() not supported in JumpToAnimation");
+        return nullptr;
+    }
+
+protected:
+    void Init(Actor* target) override;
+
+private:
+    Point distination_;
+};
+
+
+/// \~chinese
+/// @brief 相对缩放动画
+class KGE_API ScaleByAnimation : public TweenAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建相对缩放动画
+    /// @param duration 动画时长
+    /// @param scale 缩放相对变化值
+    ScaleByAnimation(Duration duration, const Vec2& scale);
+
+    /// \~chinese
+    /// @brief 获取横向缩放相对变化值
+    float GetScaleX() const;
+
+    /// \~chinese
+    /// @brief 获取横向缩放相对变化值
+    float GetScaleY() const;
+
+    /// \~chinese
+    /// @brief 设置纵向缩放相对变化值
+    void SetScaleX(float scale_x);
+
+    /// \~chinese
+    /// @brief 设置纵向缩放相对变化值
+    void SetScaleY(float scale_y);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    ScaleByAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    ScaleByAnimation* Reverse() const override;
+
+protected:
+    void Init(Actor* target) override;
+
+    void UpdateTween(Actor* target, float frac) override;
+
+protected:
+    Vec2 start_val_;
+    Vec2 delta_;
+};
+
+
+/// \~chinese
+/// @brief 缩放动画
+class KGE_API ScaleToAnimation : public ScaleByAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建缩放动画
+    /// @param duration 动画时长
+    /// @param scale 缩放目标值
+    ScaleToAnimation(Duration duration, const Vec2& scale);
+
+    /// \~chinese
+    /// @brief 获取横向缩放目标值
+    float GetTargetScaleX() const;
+
+    /// \~chinese
+    /// @brief 获取横向缩放目标值
+    float GetTargetScaleY() const;
+
+    /// \~chinese
+    /// @brief 设置纵向缩放目标值
+    void SetTargetScaleX(float scale_x);
+
+    /// \~chinese
+    /// @brief 设置纵向缩放目标值
+    void SetTargetScaleY(float scale_y);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    ScaleToAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    ScaleToAnimation* Reverse() const override
+    {
+        KGE_ERRORF("Reverse() not supported in ScaleToAnimation");
+        return nullptr;
+    }
+
+protected:
+    void Init(Actor* target) override;
+
+private:
+    Vec2 end_val_;
+};
+
+
+/// \~chinese
+/// @brief 透明度渐变动画
+class KGE_API FadeToAnimation : public TweenAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建透明度渐变动画
+    /// @param duration 动画时长
+    /// @param opacity 目标透明度
+    FadeToAnimation(Duration duration, float opacity);
+
+    /// \~chinese
+    /// @brief 获取目标透明度
+    float GetTargetOpacity() const;
+
+    /// \~chinese
+    /// @brief 设置目标透明度
+    void SetTargetOpacity(float opacity);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    FadeToAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    FadeToAnimation* Reverse() const override
+    {
+        KGE_ERRORF("Reverse() not supported in FadeToAnimation");
+        return nullptr;
+    }
+
+protected:
+    void Init(Actor* target) override;
+
+    void UpdateTween(Actor* target, float frac) override;
+
+private:
+    float start_val_;
+    float delta_val_;
+    float end_val_;
+};
+
+
+/// \~chinese
+/// @brief 相对旋转动画
+class KGE_API RotateByAnimation : public TweenAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建相对旋转动画
+    /// @param duration 动画时长
+    /// @param rotation 角度相对变化值
+    RotateByAnimation(Duration duration, float rotation);
+
+    /// \~chinese
+    /// @brief 获取角度相对变化值
+    float GetRotation() const;
+
+    /// \~chinese
+    /// @brief 设置角度相对变化值
+    void SetRotation(float rotation);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    RotateByAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    RotateByAnimation* Reverse() const override;
+
+protected:
+    void Init(Actor* target) override;
+
+    void UpdateTween(Actor* target, float frac) override;
+
+protected:
+    float start_val_;
+    float delta_val_;
+};
+
+
+/// \~chinese
+/// @brief 旋转动画
+class KGE_API RotateToAnimation : public RotateByAnimation
+{
+public:
+    /// \~chinese
+    /// @brief 创建旋转动画
+    /// @param duration 动画时长
+    /// @param rotation 目标角度
+    RotateToAnimation(Duration duration, float rotation);
+
+    /// \~chinese
+    /// @brief 获取目标角度
+    float GetTargetRotation() const;
+
+    /// \~chinese
+    /// @brief 设置目标角度
+    void SetTargetRotation(float rotation);
+
+    /// \~chinese
+    /// @brief 获取该动画的拷贝对象
+    RotateToAnimation* Clone() const override;
+
+    /// \~chinese
+    /// @brief 获取该动画的倒转
+    RotateToAnimation* Reverse() const override
+    {
+        KGE_ERRORF("Reverse() not supported in RotateToAnimation");
+        return nullptr;
+    }
+
+protected:
+    void Init(Actor* target) override;
+
+private:
+    float end_val_;
+};
+
+/** @} */
+
+inline const EaseFunc& TweenAnimation::GetEaseFunc() const
+{
+    return ease_func_;
+}
+
+inline Duration TweenAnimation::GetDuration() const
+{
+    return dur_;
+}
+
+inline void TweenAnimation::SetDuration(Duration duration)
+{
+    dur_ = duration;
+}
+
+inline void TweenAnimation::SetEaseFunc(const EaseFunc& func)
+{
+    ease_func_ = func;
+}
+
+inline Vec2 MoveByAnimation::GetDisplacement() const
+{
+    return displacement_;
+}
+
+inline void MoveByAnimation::SetDisplacement(const Vec2& displacement)
+{
+    displacement_ = displacement;
+}
+
+inline Point MoveToAnimation::GetDistination() const
+{
+    return distination_;
+}
+
+inline void MoveToAnimation::SetDistination(const Point& distination)
+{
+    distination_ = distination;
+}
+
+inline Vec2 JumpByAnimation::GetDisplacement() const
+{
+    return displacement_;
+}
+
+inline float JumpByAnimation::GetJumpHeight() const
+{
+    return height_;
+}
+
+inline int JumpByAnimation::GetJumpCount() const
+{
+    return jump_count_;
+}
+
+inline void JumpByAnimation::SetDisplacement(const Vec2& displacement)
+{
+    displacement_ = displacement;
+}
+
+inline void JumpByAnimation::SetJumpHeight(float height)
+{
+    height_ = height;
+}
+
+inline void JumpByAnimation::SetJumpCount(int count)
+{
+    jump_count_ = count;
+}
+
+inline Point JumpToAnimation::GetDistination() const
+{
+    return distination_;
+}
+
+inline void JumpToAnimation::SetDistination(const Point& distination)
+{
+    distination_ = distination;
+}
+
+inline float ScaleByAnimation::GetScaleX() const
+{
+    return delta_.x;
+}
+
+inline float ScaleByAnimation::GetScaleY() const
+{
+    return delta_.y;
+}
+
+inline void ScaleByAnimation::SetScaleX(float scale_x)
+{
+    delta_.x = scale_x;
+}
+
+inline void ScaleByAnimation::SetScaleY(float scale_y)
+{
+    delta_.y = scale_y;
+}
+
+inline float ScaleToAnimation::GetTargetScaleX() const
+{
+    return end_val_.x;
+}
+
+inline float ScaleToAnimation::GetTargetScaleY() const
+{
+    return end_val_.y;
+}
+
+inline void ScaleToAnimation::SetTargetScaleX(float scale_x)
+{
+    end_val_.x = scale_x;
+}
+
+inline void ScaleToAnimation::SetTargetScaleY(float scale_y)
+{
+    end_val_.y = scale_y;
+}
+
+inline float FadeToAnimation::GetTargetOpacity() const
+{
+    return end_val_;
+}
+
+inline void FadeToAnimation::SetTargetOpacity(float opacity)
+{
+    end_val_ = opacity;
+}
+
+inline float RotateByAnimation::GetRotation() const
+{
+    return delta_val_;
+}
+
+inline void RotateByAnimation::SetRotation(float rotation)
+{
+    delta_val_ = rotation;
+}
+
+inline float RotateToAnimation::GetTargetRotation() const
+{
+    return end_val_;
+}
+
+inline void RotateToAnimation::SetTargetRotation(float rotation)
+{
+    end_val_ = rotation;
+}
+
+}  // namespace kiwano

src/kiwano/2d/transition/BoxTransition.cpp

@@ -0,0 +1,58 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/transition/BoxTransition.h>
+
+namespace kiwano
+{
+
+BoxTransition::BoxTransition(Duration duration)
+{
+    SetDuration(duration);
+}
+
+BoxTransition::BoxTransition() {}
+
+void BoxTransition::Init(Stage* prev, Stage* next)
+{
+    Transition::Init(prev, next);
+
+    in_layer_.SetOpacity(0.f);
+}
+
+void BoxTransition::Update(Duration dt)
+{
+    Transition::Update(dt);
+
+    if (process_ < .5f)
+    {
+        out_layer_.SetClipRect(Rect(window_size_.x * process_, window_size_.y * process_,
+                                    window_size_.x * (1 - process_), window_size_.y * (1 - process_)));
+    }
+    else
+    {
+        out_layer_.SetOpacity(0.f);
+        in_layer_.SetOpacity(1.f);
+        in_layer_.SetClipRect(Rect(window_size_.x * (1 - process_), window_size_.y * (1 - process_),
+                                   window_size_.x * process_, window_size_.y * process_));
+    }
+}
+
+}  // namespace kiwano

src/kiwano/2d/transition/BoxTransition.h

@@ -0,0 +1,52 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/transition/Transition.h>
+
+namespace kiwano
+{
+
+KGE_DECLARE_SMART_PTR(BoxTransition);
+
+/**
+ * \~chinese
+ * @brief 盒状过渡动画
+ * @details 前一场景以盒状收缩至消失，后一场景以盒状扩大
+ */
+class BoxTransition : public Transition
+{
+public:
+    /**
+     * \~chinese
+     * @brief 创建盒状过渡动画
+     * @param duration 动画时长
+     */
+    BoxTransition(Duration duration);
+
+    BoxTransition();
+
+protected:
+    void Update(Duration dt) override;
+
+    virtual void Init(Stage* prev, Stage* next) override;
+};
+
+}  // namespace kiwano

src/kiwano/2d/transition/FadeTransition.cpp

@@ -0,0 +1,66 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/transition/FadeTransition.h>
+
+namespace kiwano
+{
+
+FadeTransition::FadeTransition(Duration duration, bool parallel)
+    : parallel_(parallel)
+{
+    SetDuration(duration);
+}
+
+FadeTransition::FadeTransition() {}
+
+void FadeTransition::Init(Stage* prev, Stage* next)
+{
+    Transition::Init(prev, next);
+
+    out_layer_.SetOpacity(1.f);
+    in_layer_.SetOpacity(0.f);
+}
+
+void FadeTransition::Update(Duration dt)
+{
+    Transition::Update(dt);
+
+    if (parallel_)
+    {
+        out_layer_.SetOpacity(1 - process_);
+        in_layer_.SetOpacity(process_);
+    }
+    else
+    {
+        if (process_ < 0.5)
+        {
+            out_layer_.SetOpacity(1 - process_ * 2);
+            in_layer_.SetOpacity(0.f);
+        }
+        else
+        {
+            out_layer_.SetOpacity(0.f);
+            in_layer_.SetOpacity((process_ - 0.5f) * 2);
+        }
+    }
+}
+
+}  // namespace kiwano

src/kiwano/2d/transition/FadeTransition.h

@@ -0,0 +1,56 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/transition/Transition.h>
+
+namespace kiwano
+{
+
+KGE_DECLARE_SMART_PTR(FadeTransition);
+
+/**
+ * \~chinese
+ * @brief 淡入淡出过渡动画
+ * @details 前一场景淡出动画结束后，后一场景淡入
+ */
+class FadeTransition : public Transition
+{
+public:
+    /**
+     * \~chinese
+     * @brief 创建淡入淡出过渡动画
+     * @param duration 动画时长
+     * @param parallel 淡入和淡出同时进行
+     */
+    FadeTransition(Duration duration, bool parallel = false);
+
+    FadeTransition();
+
+protected:
+    void Update(Duration dt) override;
+
+    virtual void Init(Stage* prev, Stage* next) override;
+
+private:
+    bool parallel_;
+};
+
+}  // namespace kiwano

src/kiwano/2d/transition/MoveTransition.cpp

@@ -0,0 +1,106 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/transition/MoveTransition.h>
+
+namespace kiwano
+{
+
+MoveTransition::MoveTransition(Duration duration, Type type)
+    : type_(type)
+{
+    SetDuration(duration);
+}
+
+MoveTransition::MoveTransition()
+    : type_(Type::Left)
+{
+}
+
+void MoveTransition::Init(Stage* prev, Stage* next)
+{
+    Transition::Init(prev, next);
+
+    switch (type_)
+    {
+    case Type::Up:
+        pos_delta_ = Point(0, -window_size_.y);
+        start_pos_ = Point(0, window_size_.y);
+        break;
+    case Type::Down:
+        pos_delta_ = Point(0, window_size_.y);
+        start_pos_ = Point(0, -window_size_.y);
+        break;
+    case Type::Left:
+        pos_delta_ = Point(-window_size_.x, 0);
+        start_pos_ = Point(window_size_.x, 0);
+        break;
+    case Type::Right:
+        pos_delta_ = Point(window_size_.x, 0);
+        start_pos_ = Point(-window_size_.x, 0);
+        break;
+    }
+
+    if (out_stage_)
+    {
+        out_stage_->SetTransform(Transform{});
+    }
+
+    if (in_stage_)
+    {
+        auto transform     = Transform{};
+        transform.position = start_pos_;
+        in_stage_->SetTransform(transform);
+    }
+}
+
+void MoveTransition::Update(Duration dt)
+{
+    Transition::Update(dt);
+
+    if (out_stage_)
+    {
+        auto transform     = Transform{};
+        transform.position = pos_delta_ * process_;
+        out_stage_->SetTransform(transform);
+    }
+
+    if (in_stage_)
+    {
+        auto transform     = Transform{};
+        transform.position = start_pos_ + pos_delta_ * process_;
+        in_stage_->SetTransform(transform);
+    }
+}
+
+void MoveTransition::Reset()
+{
+    if (out_stage_)
+    {
+        out_stage_->SetTransform(Transform{});
+    }
+
+    if (in_stage_)
+    {
+        in_stage_->SetTransform(Transform{});
+    }
+}
+
+}  // namespace kiwano

src/kiwano/2d/transition/MoveTransition.h

@@ -0,0 +1,72 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/transition/Transition.h>
+
+namespace kiwano
+{
+
+KGE_DECLARE_SMART_PTR(MoveTransition);
+
+/**
+ * \~chinese
+ * @brief 位移过渡动画
+ * @details 两场景以位移的方式切换
+ */
+class MoveTransition : public Transition
+{
+public:
+    /**
+     * \~chinese
+     * @brief 位移方式
+     */
+    enum class Type : int
+    {
+        Up,    ///< 上移
+        Down,  ///< 下移
+        Left,  ///< 左移
+        Right  ///< 右移
+    };
+
+    /**
+     * \~chinese
+     * @brief 创建位移过渡动画
+     * @param duration 动画时长
+     * @param type 位移方式
+     */
+    MoveTransition(Duration duration, Type type);
+
+    MoveTransition();
+
+protected:
+    void Update(Duration dt) override;
+
+    virtual void Init(Stage* prev, Stage* next) override;
+
+    void Reset() override;
+
+private:
+    Type  type_;
+    Point pos_delta_;
+    Point start_pos_;
+};
+
+}  // namespace kiwano

src/kiwano/2d/transition/RotationTransition.cpp

@@ -0,0 +1,104 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/transition/RotationTransition.h>
+
+namespace kiwano
+{
+
+RotationTransition::RotationTransition(Duration duration, float rotation)
+    : rotation_(rotation)
+{
+    SetDuration(duration);
+}
+
+RotationTransition::RotationTransition()
+    : rotation_(0.0f)
+{
+}
+
+void RotationTransition::Init(Stage* prev, Stage* next)
+{
+    Transition::Init(prev, next);
+
+    auto transform     = Transform{};
+    transform.position = Point{ window_size_.x / 2, window_size_.y / 2 };
+
+    if (out_stage_)
+    {
+        out_stage_->SetTransform(transform);
+        out_stage_->SetAnchor(Vec2{ 0.5f, 0.5f });
+    }
+
+    if (in_stage_)
+    {
+        in_stage_->SetTransform(transform);
+        in_stage_->SetAnchor(Vec2{ 0.5f, 0.5f });
+    }
+
+    in_layer_.SetOpacity(0.f);
+}
+
+void RotationTransition::Update(Duration dt)
+{
+    Transition::Update(dt);
+
+    if (process_ < .5f)
+    {
+        if (out_stage_)
+        {
+            auto transform     = out_stage_->GetTransform();
+            transform.scale    = Point{ (.5f - process_) * 2, (.5f - process_) * 2 };
+            transform.rotation = rotation_ * (.5f - process_) * 2;
+            out_stage_->SetTransform(transform);
+        }
+    }
+    else
+    {
+        if (in_stage_)
+        {
+            out_layer_.SetOpacity(0.f);
+            in_layer_.SetOpacity(1.f);
+
+            auto transform     = in_stage_->GetTransform();
+            transform.scale    = Point{ (process_ - .5f) * 2, (process_ - .5f) * 2 };
+            transform.rotation = rotation_ * (process_ - .5f) * 2;
+
+            in_stage_->SetTransform(transform);
+        }
+    }
+}
+
+void RotationTransition::Reset()
+{
+    if (out_stage_)
+    {
+        out_stage_->SetTransform(Transform{});
+        out_stage_->SetAnchor(Vec2{ 0.f, 0.f });
+    }
+
+    if (in_stage_)
+    {
+        in_stage_->SetTransform(Transform{});
+        in_stage_->SetAnchor(Vec2{ 0.f, 0.f });
+    }
+}
+
+}  // namespace kiwano

src/kiwano/2d/transition/RotationTransition.h

@@ -0,0 +1,58 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/transition/Transition.h>
+
+namespace kiwano
+{
+
+KGE_DECLARE_SMART_PTR(RotationTransition);
+
+/**
+ * \~chinese
+ * @brief 旋转过渡动画
+ * @details 前一场景以旋转方式收缩至消失，后一场景以旋转方式扩大
+ */
+class RotationTransition : public Transition
+{
+public:
+    /**
+     * \~chinese
+     * @brief 创建旋转过渡动画
+     * @param duration 动画时长
+     * @param rotation 旋转度数
+     */
+    RotationTransition(Duration duration, float rotation = 360.0f);
+
+    RotationTransition();
+
+protected:
+    void Update(Duration dt) override;
+
+    virtual void Init(Stage* prev, Stage* next) override;
+
+    void Reset() override;
+
+private:
+    float rotation_;
+};
+
+}  // namespace kiwano

src/kiwano/2d/transition/Transition.cpp

@@ -0,0 +1,118 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <kiwano/2d/transition/Transition.h>
+#include <kiwano/render/Renderer.h>
+
+namespace kiwano
+{
+
+Transition::Transition()
+    : done_(false)
+    , duration_()
+    , delta_()
+    , process_(0)
+    , window_size_()
+    , out_stage_(nullptr)
+    , in_stage_(nullptr)
+    , out_layer_()
+    , in_layer_()
+{
+}
+
+Transition::~Transition() {}
+
+bool Transition::IsDone()
+{
+    return done_;
+}
+
+void Transition::Init(Stage* prev, Stage* next)
+{
+    process_ = 0;
+    delta_   = Duration{};
+
+    out_stage_   = prev;
+    in_stage_    = next;
+    window_size_ = Renderer::GetInstance().GetOutputSize();
+
+    if (in_stage_)
+    {
+        in_layer_.SetClipRect(Rect{ Point(), window_size_ });
+    }
+
+    if (out_stage_)
+    {
+        out_layer_.SetClipRect(Rect{ Point(), window_size_ });
+    }
+}
+
+void Transition::Update(Duration dt)
+{
+    if (duration_.IsZero())
+    {
+        process_ = 1;
+    }
+    else
+    {
+        delta_ += dt;
+        process_ = std::min(delta_ / duration_, 1.f);
+    }
+
+    if (process_ >= 1)
+    {
+        this->Stop();
+    }
+}
+
+void Transition::Render(RenderContext& ctx)
+{
+    if (out_stage_)
+    {
+        out_stage_->PrepareToRender(ctx);
+        ctx.PushClipRect(Rect{ Point{}, window_size_ });
+        ctx.PushLayer(out_layer_);
+
+        out_stage_->Render(ctx);
+
+        ctx.PopLayer();
+        ctx.PopClipRect();
+    }
+
+    if (in_stage_)
+    {
+        in_stage_->PrepareToRender(ctx);
+        ctx.PushClipRect(Rect{ Point{}, window_size_ });
+        ctx.PushLayer(in_layer_);
+
+        in_stage_->Render(ctx);
+
+        ctx.PopLayer();
+        ctx.PopClipRect();
+    }
+}
+
+void Transition::Stop()
+{
+    done_ = true;
+    Reset();
+}
+
+}  // namespace kiwano

src/kiwano/2d/transition/Transition.h

@@ -0,0 +1,121 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/2d/Stage.h>
+#include <kiwano/render/Layer.h>
+
+namespace kiwano
+{
+class Director;
+class RenderContext;
+
+KGE_DECLARE_SMART_PTR(Transition);
+
+/**
+ * \~chinese
+ * \defgroup Transition 舞台过渡动画
+ */
+
+/**
+ * \addtogroup Transition
+ * @{
+ */
+
+/**
+ * \~chinese
+ * @brief 舞台过渡动画
+ */
+class KGE_API Transition : public ObjectBase
+{
+    friend class Director;
+
+public:
+    Transition();
+
+    virtual ~Transition();
+
+    /**
+     * \~chinese
+     * @brief 设置动画时长
+     */
+    void SetDuration(Duration dt);
+
+    /**
+     * \~chinese
+     * @brief 场景过渡动画是否已结束
+     */
+    bool IsDone();
+
+protected:
+    /**
+     * \~chinese
+     * @brief 初始化场景过渡动画
+     * @param[in] prev 转出场景
+     * @param[in] next 转入场景
+     */
+    virtual void Init(Stage* prev, Stage* next);
+
+    /**
+     * \~chinese
+     * @brief 更新过渡动画
+     * @param dt 距上一次更新的时间间隔
+     */
+    virtual void Update(Duration dt);
+
+    /**
+     * \~chinese
+     * @brief 渲染过度动画
+     * @param[in] ctx 渲染上下文
+     */
+    virtual void Render(RenderContext& ctx);
+
+    /**
+     * \~chinese
+     * @brief 停止动画
+     */
+    virtual void Stop();
+
+    /**
+     * \~chinese
+     * @brief 重置动画
+     */
+    virtual void Reset() {}
+
+protected:
+    bool     done_;
+    float    process_;
+    Duration duration_;
+    Duration delta_;
+    Size     window_size_;
+    StagePtr out_stage_;
+    StagePtr in_stage_;
+    Layer    out_layer_;
+    Layer    in_layer_;
+};
+
+/** @} */
+
+inline void Transition::SetDuration(Duration dt)
+{
+    duration_ = dt;
+}
+
+}  // namespace kiwano

src/kiwano/base/Director.cpp

@@ -21,7 +21,6 @@
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/DebugActor.h>
 #include <kiwano/2d/Stage.h>
-#include <kiwano/2d/Transition.h>
 #include <kiwano/base/Director.h>
 
 namespace kiwano

src/kiwano/base/Director.h

@@ -21,7 +21,7 @@
 #pragma once
 #include <kiwano/2d/Actor.h>
 #include <kiwano/2d/Stage.h>
-#include <kiwano/2d/Transition.h>
+#include <kiwano/2d/transition/Transition.h>
 #include <kiwano/base/Module.h>
 
 namespace kiwano

src/kiwano/core/BinaryData.h

@@ -0,0 +1,50 @@
+// Copyright (c) 2016-2018 Kiwano - Nomango
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
+#include <kiwano/core/Common.h>
+
+namespace kiwano
+{
+
+/// \~chinese
+/// @brief 二进制数据
+struct KGE_API BinaryData
+{
+    void*    buffer;  ///< 数据
+    uint32_t size;    ///< 数据大小
+
+    BinaryData();
+
+    bool IsValid() const;
+};
+
+inline BinaryData::BinaryData()
+    : buffer(nullptr)
+    , size(0)
+{
+}
+
+inline bool BinaryData::IsValid() const
+{
+    return buffer != nullptr && size != 0;
+}
+
+}  // namespace kiwano

src/kiwano/core/Resource.cpp

@@ -36,7 +36,7 @@ Resource::Resource(uint32_t id, const String& type)
 {
 }
 
-Resource::Data Resource::GetData() const
+BinaryData Resource::GetData() const
 {
     do
     {

src/kiwano/core/Resource.h

@@ -19,11 +19,11 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/Common.h>
+#include <kiwano/core/BinaryData.h>
-#include <kiwano/macros.h>
 
 namespace kiwano
 {
+
 /**
  * \~chinese
  * @brief 资源
@@ -40,17 +40,6 @@ namespace kiwano
 class KGE_API Resource
 {
 public:
-    /// \~chinese
-    /// @brief 资源的二进制数据
-    struct Data
-    {
-        void*    buffer;  ///< 资源数据
-        uint32_t size;    ///< 资源数据大小
-
-        Data();
-
-        bool IsValid() const;
-    };
 
     /// \~chinese
     /// @brief 构造资源
@@ -65,7 +54,7 @@ public:
     /// \~chinese
     /// @brief 获取资源的二进制数据
     /// @return 资源数据
-    Resource::Data GetData() const;
+    BinaryData GetData() const;
 
     /// \~chinese
     /// @brief 获取资源 ID
@@ -79,20 +68,9 @@ private:
     uint32_t id_;
     String   type_;
 
-    mutable Resource::Data data_;
+    mutable BinaryData data_;
 };
 
-inline Resource::Data::Data()
-    : buffer(nullptr)
-    , size(0)
-{
-}
-
-inline bool Resource::Data::IsValid() const
-{
-    return buffer != nullptr && size;
-}
-
 inline uint32_t Resource::GetId() const
 {
     return id_;

src/kiwano/event/EventDispatcher.cpp

@@ -34,7 +34,7 @@ bool EventDispatcher::DispatchEvent(Event* evt)
         next = listener->GetNext();
 
         if (listener->IsRunning())
-            listener->Receive(evt);
+            listener->Handle(evt);
 
         if (listener->IsRemoveable())
             listeners_.Remove(listener);
@@ -58,13 +58,13 @@ EventListener* EventDispatcher::AddListener(EventListenerPtr listener)
 
 EventListener* EventDispatcher::AddListener(const String& name, EventType type, EventListener::Callback callback)
 {
-    auto lis = MakePtr<EventListener>(name, type, callback);
+    auto lis = EventListener::Create(name, type, callback);
     return AddListener(lis);
 }
 
 EventListener* EventDispatcher::AddListener(EventType type, EventListener::Callback callback)
 {
-    auto lis = MakePtr<EventListener>(type, callback);
+    auto lis = EventListener::Create(type, callback);
     return AddListener(lis);
 }
 
@@ -101,39 +101,6 @@ void EventDispatcher::RemoveListeners(const String& name)
     }
 }
 
-void EventDispatcher::StartListeners(const EventType& type)
-{
-    for (auto& listener : listeners_)
-    {
-        if (listener->GetEventType() == type)
-        {
-            listener->Start();
-        }
-    }
-}
-
-void EventDispatcher::StopListeners(const EventType& type)
-{
-    for (auto& listener : listeners_)
-    {
-        if (listener->GetEventType() == type)
-        {
-            listener->Stop();
-        }
-    }
-}
-
-void EventDispatcher::RemoveListeners(const EventType& type)
-{
-    for (auto& listener : listeners_)
-    {
-        if (listener->GetEventType() == type)
-        {
-            listener->Remove();
-        }
-    }
-}
-
 void EventDispatcher::StartAllListeners()
 {
     for (auto& listener : listeners_)

src/kiwano/event/EventDispatcher.h

@@ -90,21 +90,6 @@ public:
     /// @param name 监听器名称
     void RemoveListeners(const String& name);
 
-    /// \~chinese
-    /// @brief 启动监听器
-    /// @param type 监听的事件类型
-    void StartListeners(const EventType& type);
-
-    /// \~chinese
-    /// @brief 停止监听器
-    /// @param type 监听的事件类型
-    void StopListeners(const EventType& type);
-
-    /// \~chinese
-    /// @brief 移除监听器
-    /// @param type 监听的事件类型
-    void RemoveListeners(const EventType& type);
-
     /// \~chinese
     /// @brief 启动所有监听器
     void StartAllListeners();

src/kiwano/event/EventListener.cpp

@@ -25,35 +25,63 @@ namespace kiwano
 {
 
 EventListener::EventListener()
-    : type_()
+    : running_(true)
-    , callback_()
-    , running_(true)
     , removeable_(false)
     , swallow_(false)
 {
 }
 
-EventListener::EventListener(EventType type, const Callback& callback)
-    : EventListener()
-{
-    this->SetEventType(type);
-    this->SetCallback(callback);
-}
-
-EventListener::EventListener(const String& name, EventType type, const Callback& callback)
-    : EventListener(type, callback)
-{
-    this->SetName(name);
-}
-
 EventListener::~EventListener() {}
 
-void EventListener::Receive(Event* evt)
+class CallbackEventListener : public EventListener
 {
-    if (ShouldHandle(evt) && callback_)
+public:
+    CallbackEventListener(EventType type, const Callback& cb)
+        : type_(type)
+        , cb_(cb)
     {
-        callback_(evt);
     }
+
+    void Handle(Event* evt) override
+    {
+        if (type_.IsNull() || type_ == evt->GetType())
+        {
+            if (cb_)
+            {
+                cb_(evt);
+            }
+        }
+    }
+
+private:
+    EventType type_;
+    Callback  cb_;
+};
+
+EventListenerPtr EventListener::Create(const Callback& callback)
+{
+    EventListenerPtr ptr = new CallbackEventListener(EventType(), callback);
+    return ptr;
+}
+
+EventListenerPtr EventListener::Create(const String& name, const Callback& callback)
+{
+    EventListenerPtr ptr = new CallbackEventListener(EventType(), callback);
+    ptr->SetName(name);
+    return ptr;
+}
+
+EventListenerPtr EventListener::Create(EventType type, const Callback& callback)
+{
+    EventListenerPtr ptr = new CallbackEventListener(type, callback);
+    return ptr;
+}
+
+EventListenerPtr EventListener::Create(const String& name, EventType type, const Callback& callback)
+{
+    EventListenerPtr ptr = new CallbackEventListener(type, callback);
+    ptr->SetName(name);
+    return ptr;
 }
 
 }  // namespace kiwano

src/kiwano/event/EventListener.h

@@ -48,20 +48,32 @@ public:
 
     EventListener();
 
+    virtual ~EventListener();
+
     /// \~chinese
     /// @brief 创建监听器
-    /// @param type 监听的事件类型
     /// @param callback 回调函数
-    EventListener(EventType type, const Callback& callback);
+    static EventListenerPtr Create(const Callback& callback);
 
     /// \~chinese
     /// @brief 创建监听器
     /// @param name 监听器名称
     /// @param type 监听的事件类型
     /// @param callback 回调函数
-    EventListener(const String& name, EventType type, const Callback& callback);
+    static EventListenerPtr Create(const String& name, const Callback& callback);
 
-    virtual ~EventListener();
+    /// \~chinese
+    /// @brief 创建监听器
+    /// @param type 监听的事件类型
+    /// @param callback 回调函数
+    static EventListenerPtr Create(EventType type, const Callback& callback);
+
+    /// \~chinese
+    /// @brief 创建监听器
+    /// @param name 监听器名称
+    /// @param type 监听的事件类型
+    /// @param callback 回调函数
+    static EventListenerPtr Create(const String& name, EventType type, const Callback& callback);
 
     /// \~chinese
     /// @brief 启动监听器
@@ -93,45 +105,13 @@ public:
     void SetSwallowEnabled(bool enabled);
 
     /// \~chinese
-    /// @brief 获取回调函数
+    /// @brief 处理消息
-    const Callback& GetCallback() const;
+    virtual void Handle(Event* evt) = 0;
-
-    /// \~chinese
-    /// @brief 设置回调函数
-    void SetCallback(const Callback& cb);
-
-    /// \~chinese
-    /// @brief 获取监听的事件类型
-    EventType GetEventType() const;
-
-    /// \~chinese
-    /// @brief 设置监听的事件类型
-    void SetEventType(const EventType& type);
-
-    /// \~chinese
-    /// @brief 判断是否处理事件
-    virtual bool ShouldHandle(Event* evt) const;
-
-    /// \~chinese
-    /// @brief 设置监听的事件类型
-    /// @tparam _EventTy 事件类型
-    template <typename _EventTy>
-    inline void SetEventType()
-    {
-        static_assert(std::is_base_of<Event, _EventTy>::value, "_EventTy is not an event type.");
-        SetEventType(KGE_EVENT(_EventTy));
-    }
-
-    /// \~chinese
-    /// @brief 接收消息
-    void Receive(Event* evt);
 
 private:
     bool      running_;
     bool      removeable_;
     bool      swallow_;
-    EventType type_;
-    Callback  callback_;
 };
 
 inline void EventListener::Start()
@@ -169,33 +149,4 @@ inline void EventListener::SetSwallowEnabled(bool enabled)
     swallow_ = enabled;
 }
 
-inline const EventListener::Callback& EventListener::GetCallback() const
-{
-    return callback_;
-}
-
-inline void EventListener::SetCallback(const Callback& cb)
-{
-    callback_ = cb;
-}
-
-inline EventType EventListener::GetEventType() const
-{
-    return type_;
-}
-
-inline void EventListener::SetEventType(const EventType& type)
-{
-    type_ = type;
-}
-
-inline bool EventListener::ShouldHandle(Event* evt) const
-{
-    if (evt)
-    {
-        return evt->GetType() == type_;
-    }
-    return false;
-}
-
 }  // namespace kiwano

src/kiwano/event/EventType.h

@@ -32,24 +32,28 @@ namespace kiwano
 
 /// \~chinese
 /// @brief 事件类型
-class EventType : public std::type_index
+class EventType
 {
-    class Dummy
-    {
-    };
-
 public:
-    /// \~chinese
-    /// @brief 构建事件类型
     EventType();
 
-    using std::type_index::type_index;
+    EventType(const std::type_index& type);
-    using std::type_index::operator==;
+
-    using std::type_index::operator!=;
+    /// \~chinese
-    using std::type_index::operator<;
+    /// @brief ÊÇ·ñÊÇ¿ÕÀàÐÍ
-    using std::type_index::operator>=;
+    bool IsNull() const;
-    using std::type_index::operator>;
+
-    using std::type_index::operator<=;
+    const std::type_index& GetType() const;
+
+    bool operator==(const EventType& rhs) const;
+    bool operator!=(const EventType& rhs) const;
+    bool operator<(const EventType& rhs) const;
+    bool operator<=(const EventType& rhs) const;
+    bool operator>(const EventType& rhs) const;
+    bool operator>=(const EventType& rhs) const;
+
+private:
+    std::type_index type_;
 };
 
 /** @} */
@@ -57,8 +61,53 @@ public:
 #define KGE_EVENT(EVENT_TYPE) ::kiwano::EventType(typeid(EVENT_TYPE))
 
 inline EventType::EventType()
-    : std::type_index(typeid(EventType::Dummy))
+    : type_(typeid(void))
 {
 }
 
+inline EventType::EventType(const std::type_index& type)
+    : type_(type)
+{
+}
+
+inline bool EventType::IsNull() const
+{
+    return type_ == typeid(void);
+}
+
+inline const std::type_index& EventType::GetType() const
+{
+    return type_;
+}
+
+inline bool EventType::operator==(const EventType& rhs) const
+{
+    return type_ == rhs.type_;
+}
+
+inline bool EventType::operator!=(const EventType& rhs) const
+{
+    return type_ != rhs.type_;
+}
+
+inline bool EventType::operator<(const EventType& rhs) const
+{
+    return type_ < rhs.type_;
+}
+
+inline bool EventType::operator<=(const EventType& rhs) const
+{
+    return type_ <= rhs.type_;
+}
+
+inline bool EventType::operator>(const EventType& rhs) const
+{
+    return type_ > rhs.type_;
+}
+
+inline bool EventType::operator>=(const EventType& rhs) const
+{
+    return type_ >= rhs.type_;
+}
+
 }  // namespace kiwano

src/kiwano/event/KeyEvent.h

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/Keys.h>
+#include <kiwano/platform/Keys.h>
 #include <kiwano/event/Event.h>
 
 namespace kiwano

src/kiwano/event/MouseEvent.h

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/Keys.h>
+#include <kiwano/platform/Keys.h>
 #include <kiwano/event/Event.h>
 #include <kiwano/math/Math.h>
 

src/kiwano/kiwano.h

@@ -82,8 +82,6 @@
 #include <kiwano/render/Shape.h>
 #include <kiwano/render/ShapeMaker.h>
 #include <kiwano/render/Texture.h>
-#include <kiwano/render/Frame.h>
-#include <kiwano/render/FrameSequence.h>
 #include <kiwano/render/GifImage.h>
 #include <kiwano/render/Layer.h>
 #include <kiwano/render/TextLayout.h>
@@ -100,17 +98,34 @@
 #include <kiwano/2d/GifSprite.h>
 #include <kiwano/2d/LayerActor.h>
 #include <kiwano/2d/ShapeActor.h>
+#include <kiwano/2d/SpriteFrame.h>
 #include <kiwano/2d/Sprite.h>
 #include <kiwano/2d/Stage.h>
 #include <kiwano/2d/TextActor.h>
-#include <kiwano/2d/Transition.h>
+
-#include <kiwano/2d/action/Action.h>
+//
-#include <kiwano/2d/action/ActionDelay.h>
+// transition
-#include <kiwano/2d/action/ActionGroup.h>
+//
-#include <kiwano/2d/action/ActionTween.h>
+
-#include <kiwano/2d/action/ActionWalk.h>
+#include <kiwano/2d/transition/Transition.h>
-#include <kiwano/2d/action/Animation.h>
+#include <kiwano/2d/transition/BoxTransition.h>
-#include <kiwano/2d/action/ActionScheduler.h>
+#include <kiwano/2d/transition/FadeTransition.h>
+#include <kiwano/2d/transition/MoveTransition.h>
+#include <kiwano/2d/transition/RotationTransition.h>
+
+//
+// animation
+//
+
+#include <kiwano/2d/animation/Animation.h>
+#include <kiwano/2d/animation/DelayAnimation.h>
+#include <kiwano/2d/animation/AnimationGroup.h>
+#include <kiwano/2d/animation/TweenAnimation.h>
+#include <kiwano/2d/animation/PathAnimation.h>
+#include <kiwano/2d/animation/FrameSequence.h>
+#include <kiwano/2d/animation/FrameAnimation.h>
+#include <kiwano/2d/animation/Animator.h>
+#include <kiwano/2d/animation/AnimationWrapper.h>
 
 //
 // platform

src/kiwano/platform/FileSystem.cpp

@@ -176,7 +176,7 @@ bool FileSystem::ExtractResourceToFile(const Resource& res, const String& dest_f
     if (file_handle == INVALID_HANDLE_VALUE)
         return false;
 
-    Resource::Data data = res.GetData();
+    BinaryData data = res.GetData();
     if (data.IsValid())
     {
         DWORD written_bytes = 0;

src/kiwano/platform/Input.h

@@ -22,7 +22,7 @@
 #include <array>
 #include <kiwano/core/Common.h>
 #include <kiwano/base/Module.h>
-#include <kiwano/core/Keys.h>
+#include <kiwano/platform/Keys.h>
 #include <kiwano/event/Event.h>
 #include <kiwano/macros.h>
 #include <kiwano/math/Math.h>

src/kiwano/platform/win32/WindowImpl.cpp

@@ -24,7 +24,7 @@
 
 #include <memory>
 #include <array>
-#include <kiwano/core/Keys.h>
+#include <kiwano/platform/Keys.h>
 #include <kiwano/utils/Logger.h>
 #include <kiwano/event/Events.h>
 #include <kiwano/platform/Application.h>

src/kiwano/render/DirectX/D2DDeviceResources.cpp

@@ -72,8 +72,8 @@ public:
     HRESULT CreateFontCollectionFromFiles(_Out_ ComPtr<IDWriteFontCollection>& font_collection,
                                           const Vector<String>& file_paths) override;
 
-    HRESULT CreateFontCollectionFromResources(_Out_ ComPtr<IDWriteFontCollection>& font_collection,
+    HRESULT CreateFontCollectionFromBinaryData(_Out_ ComPtr<IDWriteFontCollection>& font_collection,
-                                              const Vector<Resource>& resources) override;
+                                               const Vector<BinaryData>&            data) override;
 
     HRESULT GetFontFamilyNames(_Out_ Vector<String>& family_names,
                                _In_ ComPtr<IDWriteFontCollection> font_collection) override;
@@ -548,8 +548,8 @@ HRESULT D2DDeviceResources::CreateFontCollectionFromFiles(ComPtr<IDWriteFontColl
     return hr;
 }
 
-HRESULT D2DDeviceResources::CreateFontCollectionFromResources(ComPtr<IDWriteFontCollection>& font_collection,
+HRESULT D2DDeviceResources::CreateFontCollectionFromBinaryData(ComPtr<IDWriteFontCollection>& font_collection,
-                                                              const Vector<Resource>&        resources)
+                                                              const Vector<BinaryData>& data)
 {
     if (!dwrite_factory_ || !res_font_collection_loader_)
         return E_UNEXPECTED;
@@ -557,7 +557,7 @@ HRESULT D2DDeviceResources::CreateFontCollectionFromResources(ComPtr<IDWriteFont
     LPVOID   key      = nullptr;
     uint32_t key_size = 0;
 
-    HRESULT hr = res_font_collection_loader_->AddResources(resources, &key, &key_size);
+    HRESULT hr = res_font_collection_loader_->AddResources(data, &key, &key_size);
 
     if (SUCCEEDED(hr))
     {

src/kiwano/render/DirectX/D2DDeviceResources.h

@@ -59,8 +59,8 @@ public:
    virtual HRESULT CreateFontCollectionFromFiles(_Out_ ComPtr<IDWriteFontCollection> & font_collection,
                                                   const Vector<String>& file_paths) = 0;
 
-    virtual HRESULT CreateFontCollectionFromResources(_Out_ ComPtr<IDWriteFontCollection> & font_collection,
+    virtual HRESULT CreateFontCollectionFromBinaryData(_Out_ ComPtr<IDWriteFontCollection> & font_collection,
-                                                      const Vector<Resource>& resources) = 0;
+                                                     const Vector<BinaryData>& data) = 0;
 
     virtual HRESULT GetFontFamilyNames(_Out_ Vector<String> & family_names,
                                        _In_ ComPtr<IDWriteFontCollection> font_collection) = 0;

src/kiwano/render/DirectX/FontCollectionLoader.cpp

@@ -344,7 +344,7 @@ public:
     }
 
     STDMETHOD(AddResources)
-    (const Vector<Resource>& resources, _Out_ LPVOID* pCollectionKey, _Out_ uint32_t* pCollectionKeySize);
+    (const Vector<BinaryData>& data, _Out_ LPVOID* pCollectionKey, _Out_ uint32_t* pCollectionKeySize);
 
     // IDWriteFontCollectionLoader methods
     virtual HRESULT STDMETHODCALLTYPE CreateEnumeratorFromKey(IDWriteFactory* pFactory, void const* collectionKey,
@@ -360,7 +360,7 @@ private:
     ULONG                  refCount_;
     IDWriteFontFileLoader* pFileLoader_;
 
-    typedef Vector<Resource>   ResourceCollection;
+    typedef Vector<BinaryData> ResourceCollection;
     Vector<ResourceCollection> resources_;
     Vector<size_t>             collectionKeys_;
 };
@@ -389,7 +389,8 @@ HRESULT IResourceFontCollectionLoader::Create(_Out_ IResourceFontCollectionLoade
     return hr;
 }
 
-STDMETHODIMP ResourceFontCollectionLoader::AddResources(const Vector<Resource>& resources, _Out_ LPVOID* pCollectionKey,
+STDMETHODIMP ResourceFontCollectionLoader::AddResources(const Vector<BinaryData>& data,
+                                                        _Out_ LPVOID* pCollectionKey,
                                                         _Out_ uint32_t* pCollectionKeySize)
 {
     if (!pCollectionKey || !pCollectionKeySize)
@@ -401,7 +402,7 @@ STDMETHODIMP ResourceFontCollectionLoader::AddResources(const Vector<Resource>&
     {
         size_t collectionKey = resources_.size();
         collectionKeys_.push_back(collectionKey);
-        resources_.push_back(resources);
+        resources_.push_back(data);
 
         *pCollectionKey     = reinterpret_cast<LPVOID>(&collectionKeys_.back());
         *pCollectionKeySize = sizeof(collectionKey);
@@ -423,7 +424,7 @@ HRESULT STDMETHODCALLTYPE ResourceFontCollectionLoader::CreateEnumeratorFromKey(
 {
     HRESULT hr = S_OK;
 
-    if (collectionKey == NULL || collectionKeySize % sizeof(Resource*) != 0)
+    if (collectionKey == NULL || collectionKeySize % sizeof(BinaryData*) != 0)
         hr = E_INVALIDARG;
 
     if (SUCCEEDED(hr))
@@ -533,14 +534,14 @@ HRESULT STDMETHODCALLTYPE ResourceFontFileLoader::CreateStreamFromKey(void const
     HRESULT hr = S_OK;
 
     // Make sure the key is the right size.
-    if (fontFileReferenceKeySize != sizeof(Resource))
+    if (fontFileReferenceKeySize != sizeof(BinaryData))
         hr = E_INVALIDARG;
 
     if (SUCCEEDED(hr))
     {
         // Create the pFileStream object.
         IResourceFontFileStream* pFileStream = NULL;
-        Resource                 resource    = *static_cast<Resource const*>(fontFileReferenceKey);
+        BinaryData               resource    = *static_cast<BinaryData const*>(fontFileReferenceKey);
 
         hr = IResourceFontFileStream::Create(&pFileStream, resource);
 
@@ -601,7 +602,7 @@ public:
 
     STDMETHOD(Initialize)(IDWriteFactory* pFactory, IDWriteFontFileLoader* pLoader);
 
-    STDMETHOD(SetResources)(const Vector<Resource>& resources);
+    STDMETHOD(SetResources)(const Vector<BinaryData>& data);
 
     // IDWriteFontFileEnumerator methods
     virtual HRESULT STDMETHODCALLTYPE MoveNext(_Out_ BOOL* hasCurrentFile);
@@ -618,7 +619,7 @@ private:
     IDWriteFactory*        pFactory_;
     IDWriteFontFile*       currentFile_;
     IDWriteFontFileLoader* pLoader_;
-    Vector<Resource>       resources_;
+    Vector<BinaryData>     resources_;
     uint32_t               nextIndex_;
 };
 
@@ -671,11 +672,11 @@ STDMETHODIMP ResourceFontFileEnumerator::Initialize(IDWriteFactory* pFactory, ID
     return E_INVALIDARG;
 }
 
-STDMETHODIMP ResourceFontFileEnumerator::SetResources(const Vector<Resource>& resources)
+STDMETHODIMP ResourceFontFileEnumerator::SetResources(const Vector<BinaryData>& data)
 {
     try
     {
-        resources_.assign(resources.begin(), resources.end());
+        resources_.assign(data.begin(), data.end());
     }
     catch (std::bad_alloc&)
     {
@@ -697,7 +698,7 @@ HRESULT STDMETHODCALLTYPE ResourceFontFileEnumerator::MoveNext(_Out_ BOOL* hasCu
 
     if (nextIndex_ < resources_.size())
     {
-        hr = pFactory_->CreateCustomFontFileReference(&resources_[nextIndex_], sizeof(Resource), pLoader_,
+        hr = pFactory_->CreateCustomFontFileReference(&resources_[nextIndex_], sizeof(BinaryData), pLoader_,
                                                       &currentFile_);
 
         if (SUCCEEDED(hr))
@@ -758,7 +759,7 @@ class ResourceFontFileStream : public IResourceFontFileStream
 public:
     ResourceFontFileStream();
 
-    STDMETHOD(Initialize)(Resource const resources);
+    STDMETHOD(Initialize)(const BinaryData& data);
 
     // IDWriteFontFileStream methods
     virtual HRESULT STDMETHODCALLTYPE ReadFileFragment(void const** fragmentStart, UINT64 fileOffset,
@@ -781,7 +782,7 @@ private:
     DWORD  resourceSize_;
 };
 
-HRESULT IResourceFontFileStream::Create(_Out_ IResourceFontFileStream** ppStream, const Resource resource)
+HRESULT IResourceFontFileStream::Create(_Out_ IResourceFontFileStream** ppStream, const BinaryData& data)
 {
     HRESULT hr = S_OK;
 
@@ -797,7 +798,7 @@ HRESULT IResourceFontFileStream::Create(_Out_ IResourceFontFileStream** ppStream
 
         if (SUCCEEDED(hr))
         {
-            hr = pFileStream->Initialize(resource);
+            hr = pFileStream->Initialize(data);
         }
 
         if (SUCCEEDED(hr))
@@ -816,10 +817,9 @@ ResourceFontFileStream::ResourceFontFileStream()
 {
 }
 
-STDMETHODIMP ResourceFontFileStream::Initialize(const Resource resource)
+STDMETHODIMP ResourceFontFileStream::Initialize(const BinaryData& data)
 {
-    Resource::Data data = resource.GetData();
+    HRESULT hr = data.IsValid() ? S_OK : E_FAIL;
-    HRESULT        hr   = data.IsValid() ? S_OK : E_FAIL;
 
     if (SUCCEEDED(hr))
     {

src/kiwano/render/DirectX/FontCollectionLoader.h

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 #pragma once
-#include <kiwano/core/Resource.h>
+#include <kiwano/core/BinaryData.h>
 #include <kiwano/render/DirectX/helper.h>
 #include <dwrite.h>
 
@@ -52,7 +52,7 @@ public:
                           IDWriteFontFileLoader * pFileLoader);
 
     STDMETHOD(AddResources)
-    (const Vector<Resource>& resources, _Out_ LPVOID* pCollectionKey, _Out_ uint32_t* pCollectionKeySize) PURE;
+    (const Vector<BinaryData>& data, _Out_ LPVOID* pCollectionKey, _Out_ uint32_t* pCollectionKeySize) PURE;
 };
 
 interface DWRITE_DECLARE_INTERFACE("08D21408-6FC1-4E36-A4EB-4DA16BE3399E") IResourceFontFileLoader
@@ -69,13 +69,14 @@ public:
     static HRESULT Create(_Out_ IResourceFontFileEnumerator * *ppEnumerator, IDWriteFactory * pFactory,
                           IDWriteFontFileLoader * pFileLoader);
 
-    STDMETHOD(SetResources)(const Vector<Resource>& resources) PURE;
+    STDMETHOD(SetResources)(const Vector<BinaryData>& data) PURE;
 };
 
 interface DWRITE_DECLARE_INTERFACE("A6267450-27F3-4948-995F-FF8345A72F88") IResourceFontFileStream
     : public IDWriteFontFileStream
 {
 public:
-    static HRESULT Create(_Out_ IResourceFontFileStream * *ppStream, const Resource resource);
+    static HRESULT Create(_Out_ IResourceFontFileStream * *ppStream, const BinaryData& data);
 };
+
 }  // namespace kiwano

src/kiwano/render/DirectX/RendererImpl.cpp

@@ -250,7 +250,7 @@ void RendererImpl::CreateTexture(Texture& texture, const String& file_path)
     KGE_SET_STATUS_IF_FAILED(hr, texture, "Load texture failed");
 }
 
-void RendererImpl::CreateTexture(Texture& texture, const Resource& resource)
+void RendererImpl::CreateTexture(Texture& texture, const BinaryData& data)
 {
     HRESULT hr = S_OK;
     if (!d2d_res_)
@@ -260,8 +260,6 @@ void RendererImpl::CreateTexture(Texture& texture, const Resource& resource)
 
     if (SUCCEEDED(hr))
     {
-        Resource::Data data = resource.GetData();
-
         hr = data.IsValid() ? S_OK : E_FAIL;
 
         if (SUCCEEDED(hr))
@@ -334,7 +332,7 @@ void RendererImpl::CreateGifImage(GifImage& gif, const String& file_path)
     KGE_SET_STATUS_IF_FAILED(hr, gif, "Load GIF texture failed");
 }
 
-void RendererImpl::CreateGifImage(GifImage& gif, const Resource& resource)
+void RendererImpl::CreateGifImage(GifImage& gif, const BinaryData& data)
 {
     HRESULT hr = S_OK;
     if (!d2d_res_)
@@ -344,8 +342,6 @@ void RendererImpl::CreateGifImage(GifImage& gif, const Resource& resource)
 
     if (SUCCEEDED(hr))
     {
-        Resource::Data data = resource.GetData();
-
         hr = data.IsValid() ? S_OK : E_FAIL;
 
         if (SUCCEEDED(hr))
@@ -559,7 +555,7 @@ void RendererImpl::CreateFontCollection(Font& font, Vector<String>& family_names
     KGE_SET_STATUS_IF_FAILED(hr, font, "Create font collection failed");
 }
 
-void RendererImpl::CreateFontCollection(Font& font, Vector<String>& family_names, const Resource& res)
+void RendererImpl::CreateFontCollection(Font& font, Vector<String>& family_names, const BinaryData& data)
 {
     HRESULT hr = S_OK;
     if (!d2d_res_)
@@ -570,7 +566,7 @@ void RendererImpl::CreateFontCollection(Font& font, Vector<String>& family_names
     if (SUCCEEDED(hr))
     {
         ComPtr<IDWriteFontCollection> font_collection;
-        hr = d2d_res_->CreateFontCollectionFromResources(font_collection, Vector<Resource>{ res });
+        hr = d2d_res_->CreateFontCollectionFromBinaryData(font_collection, Vector<BinaryData>{ data });
 
         if (SUCCEEDED(hr))
         {

src/kiwano/render/DirectX/RendererImpl.h

@@ -34,17 +34,17 @@ public:
 
     void CreateTexture(Texture& texture, const String& file_path) override;
 
-    void CreateTexture(Texture& texture, const Resource& resource) override;
+    void CreateTexture(Texture& texture, const BinaryData& data) override;
 
     void CreateGifImage(GifImage& gif, const String& file_path) override;
 
-    void CreateGifImage(GifImage& gif, const Resource& resource) override;
+    void CreateGifImage(GifImage& gif, const BinaryData& data) override;
 
     void CreateGifImageFrame(GifImage::Frame& frame, const GifImage& gif, size_t frame_index) override;
 
     void CreateFontCollection(Font& font, Vector<String>& family_names, const String& file_path) override;
 
-    void CreateFontCollection(Font& font, Vector<String>& family_names, const Resource& res) override;
+    void CreateFontCollection(Font& font, Vector<String>& family_names, const BinaryData& data) override;
 
     void CreateTextLayout(TextLayout& layout, const String& content, const TextStyle& style) override;
 

src/kiwano/render/Font.cpp

@@ -67,7 +67,7 @@ FontPtr Font::Preload(const Resource& resource)
     if (ptr)
     {
         Vector<String> family_names;
-        Renderer::GetInstance().CreateFontCollection(*ptr, family_names, resource);
+        Renderer::GetInstance().CreateFontCollection(*ptr, family_names, resource.GetData());
         if (ptr->IsValid())
         {
             FontCache::GetInstance().AddFont(hash_code, ptr);

src/kiwano/render/Frame.cpp

@@ -1,87 +0,0 @@
-// Copyright (c) 2016-2018 Kiwano - Nomango
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#include <kiwano/render/Frame.h>
-
-namespace kiwano
-{
-
-Frame::Frame(const String& file_path)
-{
-    Load(file_path);
-}
-
-Frame::Frame(const Resource& res)
-{
-    Load(res);
-}
-
-Frame::Frame(TexturePtr texture)
-{
-    SetTexture(texture);
-}
-
-Frame::Frame() {}
-
-bool Frame::Load(const String& file_path)
-{
-    TexturePtr texture = Texture::Preload(file_path);
-    if (texture->IsValid())
-    {
-        SetTexture(texture);
-        return true;
-    }
-    return false;
-}
-
-bool Frame::Load(const Resource& res)
-{
-    TexturePtr texture = Texture::Preload(res);
-    if (texture->IsValid())
-    {
-        SetTexture(texture);
-        return true;
-    }
-    return false;
-}
-
-void Frame::SetCropRect(const Rect& crop_rect)
-{
-    if (texture_->IsValid())
-    {
-        auto bitmap_size          = texture_->GetSize();
-        crop_rect_.left_top.x     = std::min(std::max(crop_rect.left_top.x, 0.f), bitmap_size.x);
-        crop_rect_.left_top.y     = std::min(std::max(crop_rect.left_top.y, 0.f), bitmap_size.y);
-        crop_rect_.right_bottom.x = std::min(std::max(crop_rect.right_bottom.x, 0.f), bitmap_size.x);
-        crop_rect_.right_bottom.y = std::min(std::max(crop_rect.right_bottom.y, 0.f), bitmap_size.y);
-    }
-}
-
-void Frame::SetTexture(TexturePtr texture)
-{
-    texture_ = texture;
-    if (texture_->IsValid())
-    {
-        crop_rect_.left_top.x = crop_rect_.left_top.y = 0;
-        crop_rect_.right_bottom.x                     = texture_->GetWidth();
-        crop_rect_.right_bottom.y                     = texture_->GetHeight();
-    }
-}
-}  // namespace kiwano

src/kiwano/render/GifImage.cpp

@@ -92,7 +92,7 @@ bool GifImage::Load(const String& file_path)
 
 bool GifImage::Load(const Resource& res)
 {
-    Renderer::GetInstance().CreateGifImage(*this, res);
+    Renderer::GetInstance().CreateGifImage(*this, res.GetData());
 
     if (IsValid())
     {

src/kiwano/render/NativeObject.h

@@ -37,7 +37,7 @@ KGE_DECLARE_SMART_PTR(NativeObject);
 
 /**
  * \~chinese
- * @brief 含有本机指针的对象
+ * @brief 含有本地指针的对象
  */
 class KGE_API NativeObjectBase : public ObjectBase
 {

src/kiwano/render/RenderContext.cpp

@@ -60,22 +60,6 @@ void RenderContext::EndDraw()
     }
 }
 
-void RenderContext::DrawFrame(FramePtr frame, const Point& dest_pos)
-{
-    if (frame)
-    {
-        this->DrawTexture(*frame->GetTexture(), &frame->GetCropRect(), &Rect(dest_pos, frame->GetSize()));
-    }
-}
-
-void RenderContext::DrawFrame(FramePtr frame, const Rect& dest_rect)
-{
-    if (frame)
-    {
-        this->DrawTexture(*frame->GetTexture(), &frame->GetCropRect(), &dest_rect);
-    }
-}
-
 void RenderContext::SetGlobalTransform(const Matrix3x2* matrix)
 {
     if (matrix)

src/kiwano/render/RenderContext.h

@@ -25,7 +25,6 @@
 #include <kiwano/render/Layer.h>
 #include <kiwano/render/TextLayout.h>
 #include <kiwano/render/Texture.h>
-#include <kiwano/render/Frame.h>
 
 namespace kiwano
 {
@@ -80,18 +79,6 @@ public:
     virtual void DrawTexture(const Texture& texture, const Rect* src_rect = nullptr,
                              const Rect* dest_rect = nullptr) = 0;
 
-    /// \~chinese
-    /// @brief 绘制图像帧
-    /// @param frame 图像帧
-    /// @param dest_pos 绘制图像的位置
-    virtual void DrawFrame(FramePtr frame, const Point& dest_pos);
-
-    /// \~chinese
-    /// @brief 绘制图像帧
-    /// @param frame 图像帧
-    /// @param dest_rect 绘制的目标区域
-    virtual void DrawFrame(FramePtr frame, const Rect& dest_rect);
-
     /// \~chinese
     /// @brief 绘制文本布局
     /// @param layout 文本布局

src/kiwano/render/Renderer.h

@@ -88,8 +88,8 @@ public:
     /// \~chinese
     /// @brief 创建纹理内部资源
     /// @param[out] texture 纹理
-    /// @param[in] resource ͼƬ×ÊÔ´
+    /// @param[in] data 图片二进制数据
-    virtual void CreateTexture(Texture& texture, const Resource& resource) = 0;
+    virtual void CreateTexture(Texture& texture, const BinaryData& data) = 0;
 
     /// \~chinese
     /// @brief 创建GIF图像内部资源
@@ -100,12 +100,12 @@ public:
     /// \~chinese
     /// @brief 创建GIF图像内部资源
     /// @param[out] gif GIF图像
-    /// @param[in] resource ͼƬ×ÊÔ´
+    /// @param[in] data 图片二进制数据
-    virtual void CreateGifImage(GifImage& gif, const Resource& resource) = 0;
+    virtual void CreateGifImage(GifImage& gif, const BinaryData& data) = 0;
 
     /// \~chinese
-    /// @brief ´´½¨GIFͼÏñÖ¡ÄÚ²¿×ÊÔ´
+    /// @brief 创建GIF关键帧内部资源
-    /// @param[out] frame GIFͼÏñÖ¡
+    /// @param[out] frame GIF关键帧
     /// @param[in] gif GIF图像
     /// @param[in] frame_index 帧下标
     virtual void CreateGifImageFrame(GifImage::Frame& frame, const GifImage& gif, size_t frame_index) = 0;
@@ -121,8 +121,8 @@ public:
     /// @brief 创建字体集内部资源
     /// @param[out] font 字体
     /// @param[out] family_names 字体包含的字体族
-    /// @param[in] res_arr ×ÖÌå×ÊÔ´
+    /// @param[in] data 字体二进制资源
-    virtual void CreateFontCollection(Font& font, Vector<String>& family_names, const Resource& res) = 0;
+    virtual void CreateFontCollection(Font& font, Vector<String>& family_names, const BinaryData& data) = 0;
 
     /// \~chinese
     /// @brief 创建文字布局内部资源

src/kiwano/render/Texture.cpp

@@ -89,7 +89,7 @@ bool Texture::Load(const String& file_path)
 
 bool Texture::Load(const Resource& res)
 {
-    Renderer::GetInstance().CreateTexture(*this, res);
+    Renderer::GetInstance().CreateTexture(*this, res.GetData());
     return IsValid();
 }
 

src/kiwano/utils/ResourceCache.h

@@ -20,10 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Resource.h>
-#include <kiwano/render/Frame.h>
+#include <kiwano/base/ObjectBase.h>
-#include <kiwano/render/FrameSequence.h>
-#include <kiwano/render/Font.h>
-#include <kiwano/render/GifImage.h>
 
 namespace kiwano
 {

src/kiwano/utils/ResourceLoader.cpp

@@ -23,6 +23,10 @@
 #include <kiwano/utils/Logger.h>
 #include <kiwano/utils/ResourceLoader.h>
 #include <kiwano/utils/ResourceCache.h>
+#include <kiwano/render/Font.h>
+#include <kiwano/render/GifImage.h>
+#include <kiwano/2d/SpriteFrame.h>
+#include <kiwano/2d/animation/FrameSequence.h>
 
 namespace kiwano
 {
@@ -195,10 +199,10 @@ void LoadTexturesFromData(ResourceCache* cache, GlobalData* gdata, const String&
     else if (!file.empty())
     {
         // Simple image
-        FramePtr frame = MakePtr<Frame>();
+        TexturePtr texture = MakePtr<Texture>();
-        if (frame && frame->Load(gdata->path + file))
+        if (texture && texture->Load(gdata->path + file))
         {
-            cache->AddObject(id, frame);
+            cache->AddObject(id, texture);
             return;
         }
     }
@@ -212,12 +216,12 @@ void LoadTexturesFromData(ResourceCache* cache, GlobalData* gdata, const String&
         return;
 
     // Frames
-    Vector<FramePtr> frames;
+    Vector<SpriteFrame> frames;
     frames.reserve(files.size());
     for (const auto& file : files)
     {
-        FramePtr frame = MakePtr<Frame>();
+        SpriteFrame frame;
-        if (frame->Load(gdata->path + file))
+        if (frame.Load(gdata->path + file))
         {
             frames.push_back(frame);
         }
@@ -243,14 +247,14 @@ void LoadTexturesFromData(ResourceCache* cache, GlobalData* gdata, const String&
     {
         if (rows || cols)
         {
-            // Frame slices
+            // KeyFrame slices
-            FramePtr frame = MakePtr<Frame>();
+            SpriteFrame frame;
-            if (frame && frame->Load(gdata->path + file))
+            if (frame.Load(gdata->path + file))
             {
                 FrameSequencePtr frame_seq = MakePtr<FrameSequence>();
                 if (frame_seq)
                 {
-                    frame_seq->AddFrames(frame, cols, rows, max_num, padding_x, padding_y);
+                    frame_seq->AddFrames(frame.Split(cols, rows, max_num, padding_x, padding_y));
                     cache->AddObject(id, frame_seq);
                     return;
                 }
@@ -259,10 +263,10 @@ void LoadTexturesFromData(ResourceCache* cache, GlobalData* gdata, const String&
         else
         {
             // Simple image
-            FramePtr frame = MakePtr<Frame>();
+            TexturePtr texture = MakePtr<Texture>();
-            if (frame && frame->Load(gdata->path + file))
+            if (texture && texture->Load(gdata->path + file))
             {
-                cache->AddObject(id, frame);
+                cache->AddObject(id, texture);
                 return;
             }
         }