推

source/EngineFrame/Component/Animation.cpp

@@ -27,8 +27,6 @@ Animation::~Animation()
 
 void Animation::Init(std::string AniPath)
 {
-    Actor::Init();
-
     AniScriptParser::AniInfo Info = AssetManager::GetInstance().StructAniInfo(AniPath);
     this->AniPath = AniPath;
     this->AnimationFlag = Info.Flag;
@@ -45,17 +43,19 @@ void Animation::Init(std::string AniPath)
                 FrameObj.Img_Path = AdditionalOptions(FrameObj.Img_Path, this->AdditionalOptionsData);
             }
             SpriteObj = new Sprite(FrameObj.Img_Path, FrameObj.Img_Index);
-            SpriteObj->SetAnchor(Vec2(0.5f, 0.5f));
-            SpriteObj->SetPos(Vec2(FrameObj.Img_Pos.x, FrameObj.Img_Pos.y));
+            SpriteObj->SetPosition(FrameObj.Img_Pos.x, FrameObj.Img_Pos.y);
             SpriteObj->SetVisible(false);
         }
         else
         {
             SpriteObj = new Sprite();
             SpriteObj->SetVisible(false);
-            SDL_Log("Animation::Init() SpriteObj is nullptr");
         }
         SpriteArr.push_back(SpriteObj);
+        //记录最大帧宽高
+        auto SpriteSize = SpriteObj->GetSize();
+        if(this->MaxSize.width < SpriteSize.width)this->MaxSize.width = SpriteSize.width;
+        if(this->MaxSize.height < SpriteSize.height)this->MaxSize.height = SpriteSize.height;
         AddChild(SpriteObj);
     }
 
@@ -76,7 +76,7 @@ void Animation::Init(std::string AniPath)
             for (auto &Ani : Info.AniList)
             {
                 RefPtr<Animation> AlsAniObj = new Animation(Dir + Ani.second.path);
-                AlsAniObj->SetRenderZOrder(Ani.second.layer[1]);
+                AlsAniObj->SetZOrder(Ani.second.layer[1]);
                 AddChild(AlsAniObj);
             }
         }
@@ -84,20 +84,16 @@ void Animation::Init(std::string AniPath)
     FlushFrame(0);
 }
 
-void Animation::HandleEvents(SDL_Event *e)
-{
-}
-
-void Animation::Update(float deltaTime)
+void Animation::OnUpdate(float deltaTime)
 {
     // 可用性检查
-    if (IsUsability && Visible)
+    if (IsUsability && IsVisible())
     {
         float dt_ms = deltaTime * 1000.0f;
         // 累加当前帧时间
         CurrentIndexT += dt_ms;
         // 插值模式判断
-        InterpolationLogic();
+        // InterpolationLogic();
 
         // 循环处理：只要当前时间超过帧延迟，就切换帧（支持一次跳过多帧）
         while (CurrentIndexT >= NextFrameDelay)
@@ -127,32 +123,26 @@ void Animation::Update(float deltaTime)
                 }
             }
         }
-        Actor::Update(deltaTime);
+    }
+    else
+    {
+        for (auto &Sp : SpriteArr)
+        {
+            Sp->SetVisible(false);
+        }
     }
 }
 
-void Animation::Render()
+void Animation::OnAdded(Actor *node)
 {
-    Actor::Render();
-}
-
-void Animation::OnAdded(BaseNode *node)
-{
-    Actor::OnAdded(node);
     FlushFrame(0);
 }
 
-void Animation::Clear()
-{
-}
-
 void Animation::SetVisible(bool visible)
 {
-    // 设置启用的时候要更新一下当前帧的渲染信息 避免因为延迟造成的坐标闪烁
     if (visible)
     {
-        CurrentFrame->CalcRenderInfoLogic();
-        CurrentFrame->CalcRenderInfo();
+        CurrentFrame->SetVisible(true);
     }
     Actor::SetVisible(visible);
 }
@@ -192,7 +182,8 @@ void Animation::FlushFrame(int Index)
     if (FlagBuf.count("IMAGE_RATE"))
     {
         Vec2 Rate = std::get<Vec2>(FlagBuf["IMAGE_RATE"]);
-        CurrentFrame->SetScale(Vec2{Rate.x, Rate.y});
+        CurrentFrame->SetScale(Rate.x, Rate.y);
+        CurrentFrame->SetPosition(FrameInfo.Img_Pos.x * Rate.x, FrameInfo.Img_Pos.y * Rate.y);
     }
     // 线性减淡
     if (FlagBuf.count("GRAPHIC_EFFECT_LINEARDODGE"))
@@ -202,7 +193,7 @@ void Animation::FlushFrame(int Index)
     // 旋转
     if (FlagBuf.count("IMAGE_ROTATE"))
     {
-        CurrentFrame->SetAnchor(Vec2{0.5f, 0.5f});
+        // CurrentFrame->SetAnchor(0.5f, 0.5f);
         CurrentFrame->SetRotation(std::get<float>(FlagBuf["IMAGE_ROTATE"]));
     }
     // 染色
@@ -277,10 +268,10 @@ void Animation::InterpolationLogic()
     }
     // 坐标
     {
-        Vec2 PosData = {
+        glm::vec2 PosData = {
             (OldData.Img_Pos.x + (NewData.Img_Pos.x - OldData.Img_Pos.x) * InterRate),
             (OldData.Img_Pos.y + (NewData.Img_Pos.y - OldData.Img_Pos.y) * InterRate)};
-        CurrentFrame->SetPos(PosData);
+        CurrentFrame->SetPosition(PosData);
     }
     // 缩放
     {
@@ -294,10 +285,9 @@ void Animation::InterpolationLogic()
         {
             NewRateData = std::get<Vec2>(NewData.Flag["IMAGE_RATE"]);
         }
-        Vec2 RateData = {
+        glm::vec2 RateData = {
             OldRateData.x + (NewRateData.x - OldRateData.x) * InterRate,
             OldRateData.y + (NewRateData.y - OldRateData.y) * InterRate};
-        CurrentFrame->SetAnchor(Vec2{0.5f, 0.5f});
         CurrentFrame->SetScale(RateData);
     }
     // 旋转
@@ -315,3 +305,8 @@ void Animation::InterpolationLogic()
         CurrentFrame->SetRotation(OldAngleData + (NewAngleData - OldAngleData) * InterRate);
     }
 }
+
+VecSize Animation::GetMaxSize()
+{
+    return MaxSize;
+}