+ Fix sprite missing in some case.

LancerComet · Jun 18, 2019 · 1adb941 · 1adb941
1 parent 383dc6b
commit 1adb941
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 63 deletions.
diff --git a/Svga/MainPage.xaml.cs b/Svga/MainPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -40,7 +41,9 @@ private async void SelectFileAndInitPlayer () {
           player.LoadSvgaFileData(stream.AsStream());
           player.InitStage();
           player.Play();
-          player.OnLoopFinish += () => { this.IsShowDoneText = true; };
+          player.OnLoopFinish += () => {
+            this.IsShowDoneText = true;
+          };
         }
       }
     }

diff --git a/Svga/SvgaPlayer/Controls/SvgaPlayer.Draw.cs b/Svga/SvgaPlayer/Controls/SvgaPlayer.Draw.cs
@@ -1,4 +1,5 @@
-using System.Numerics;
+using System;
+using System.Numerics;
 using Windows.Foundation;
 using Microsoft.Graphics.Canvas;
 using Svga.SvgaPlayer.Models;
@@ -12,30 +13,35 @@ public partial class SvgaPlayer {
     /// <param name="sprite"></param>
     private void DrawSingleSprite (CanvasDrawingSession session, SvgaSprite sprite) {
       var currentFrame = sprite.Frames[this.CurrentFrame];
-      if (currentFrame != null) {
-        var perspective = new Matrix4x4();  // Sprite 透视参数.
-        var transform = currentFrame.Transform;
-        if (transform != null) {
-          perspective = new Matrix4x4(new Matrix3x2(
-            transform.A, transform.B, transform.C, transform.D, transform.Tx, transform.Ty
-          ));
-        }
+      if (currentFrame == null) {
+        return;
+      }
+
+      var width = 0f;
+      var height = 0f;
+      var alpha = currentFrame.Alpha;
+      var layout = currentFrame.Layout;
+      if (layout != null) {
+        width = layout.Width;
+        height = layout.Height;
+      }
 
-        var width = 0f;
-        var height = 0f;
-        var layout = currentFrame.Layout;
-        if (layout != null) {
-          width = layout.Width;
-          height = layout.Height;
-        }
+      var transform = currentFrame.Transform;
+      if (transform != null) {
+        // Sprite 透视参数.
+        var perspective = new Matrix4x4(new Matrix3x2(
+          transform.A, transform.B, transform.C, transform.D, transform.Tx, transform.Ty
+        ));
 
-        var alpha = currentFrame.Alpha;
-
         session.DrawImage(
           sprite.CanvasBitmap, 0, 0, new Rect(0, 0, width, height), alpha,
           CanvasImageInterpolation.Linear, perspective
         );
-        sprite.CurrentFrame++;
+      } else {
+        session.DrawImage(
+          sprite.CanvasBitmap, 0, 0, new Rect(0, 0, width, height), alpha,
+          CanvasImageInterpolation.Linear
+        );
       }
     }
   }

diff --git a/Svga/SvgaPlayer/Controls/SvgaPlayer.Stage.cs b/Svga/SvgaPlayer/Controls/SvgaPlayer.Stage.cs
@@ -46,12 +46,12 @@ public int Fps {
     /// <summary>
     /// 动画总帧数.
     /// </summary>
-    private int TotalFrame => this.MovieParams.Frames;
+    private int TotalFrame => this.MovieParams?.Frames ?? 0;
 
     /// <summary>
     /// 当前播放帧.
     /// </summary>
-    private int CurrentFrame { get; set; }
+    public int CurrentFrame { get; set; }
 
     /// <summary>
     /// CanvasControl 对象.
@@ -63,12 +63,7 @@ public int Fps {
     /// </summary>
     private StageResource StageResource { get; set; }
 
-    /// <summary>
-    /// Stage OnCreateResource 事件.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="args"></param>
-    private async void StageOnCreateResources (CanvasAnimatedControl sender, CanvasCreateResourcesEventArgs args) {
+    private async void InitStageResource () {
       if (this.IsResourceReady) {
         return;
       }
@@ -91,6 +86,14 @@ private async void StageOnCreateResources (CanvasAnimatedControl sender, CanvasC
       this.IsResourceReady = true;
     }
 
+    /// <summary>
+    /// Stage OnCreateResource 事件.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
+    private void StageOnCreateResources (CanvasAnimatedControl sender, CanvasCreateResourcesEventArgs args) {
+    }
+
     /// <summary>
     /// Stage OnUpdate 事件.
     /// 用于更新舞台数据, 一般在运行一次 Update 后运行一次 Draw 事件.
@@ -107,7 +110,7 @@ private void StageOnUpdate (ICanvasAnimatedControl sender, CanvasAnimatedUpdateE
     /// <param name="sender"></param>
     /// <param name="args"></param>
     private void StageOnDraw (ICanvasAnimatedControl sender, CanvasAnimatedDrawEventArgs args) {
-      if (!this.IsInPlay || !this.IsResourceReady) {
+      if (!this.IsInPlay || !this.IsResourceReady || !this.IsStageInited) {
         return;
       }
 
@@ -166,10 +169,7 @@ public void InitStage () {
       }
       stage.TargetElapsedTime = TimeSpan.FromMilliseconds(1000d / fps);
 
-      stage.CreateResources += this.StageOnCreateResources;
-      stage.Update += this.StageOnUpdate;
-      stage.Draw += this.StageOnDraw;
-
+      this.InitStageResource();
       this.IsStageInited = true;
     }
 
@@ -199,16 +199,6 @@ public void UnloadStage () {
       this.StageResource = null;
       this.InflatedBytes = null;
       this.MovieEntity = null;
-      this.UnloadStageEvents();
-    }
-
-    /// <summary>
-    /// 卸载舞台事件.
-    /// </summary>
-    private void UnloadStageEvents () {
-      this.Stage.CreateResources -= this.StageOnCreateResources;
-      this.Stage.Update -= this.StageOnUpdate;
-      this.Stage.Draw -= this.StageOnDraw;
     }
   }
 }
diff --git a/Svga/SvgaPlayer/Controls/SvgaPlayer.xaml b/Svga/SvgaPlayer/Controls/SvgaPlayer.xaml
@@ -8,6 +8,14 @@
   d:DesignHeight="300"
   d:DesignWidth="400"
   xmlns:win2d="using:Microsoft.Graphics.Canvas.UI.Xaml"
+  Loaded="OnLoaded"
+  Unloaded="OnUnloaded"
 >
-  <win2d:CanvasAnimatedControl x:Name="Canvas" Paused="True"></win2d:CanvasAnimatedControl>
+  <win2d:CanvasAnimatedControl
+    x:Name="Canvas"
+    Paused="True"
+    Update="StageOnUpdate"
+    Draw="StageOnDraw"
+    CreateResources="StageOnCreateResources"
+  ></win2d:CanvasAnimatedControl>
 </UserControl>
diff --git a/Svga/SvgaPlayer/Controls/SvgaPlayer.xaml.cs b/Svga/SvgaPlayer/Controls/SvgaPlayer.xaml.cs
@@ -16,6 +16,7 @@ public partial class SvgaPlayer : UserControl {
     /// <param name="sender"></param>
     /// <param name="e"></param>
     private void OnLoaded (object sender, RoutedEventArgs e) {
+      // ...
     }
 
     /// <summary>
@@ -24,15 +25,11 @@ private void OnLoaded (object sender, RoutedEventArgs e) {
     /// <param name="sender"></param>
     /// <param name="e"></param>
     private void OnUnloaded (object sender, RoutedEventArgs e) {
-      this.UnloadStageEvents();
-      this.Loaded -= this.OnLoaded;
-      this.Unloaded -= this.OnUnloaded;
+      // ...
     }
 
     public SvgaPlayer () {
       this.InitializeComponent();
-      this.Loaded += this.OnLoaded;
-      this.Unloaded += this.OnUnloaded;
     }
   }
 }
diff --git a/Svga/SvgaPlayer/Models/SvgaPlayer.Sprite.cs b/Svga/SvgaPlayer/Models/SvgaPlayer.Sprite.cs
@@ -44,20 +44,6 @@ public class SvgaSprite {
     /// </summary>
     public int TotalFrames => this.Frames.Count;
 
-    /// <summary>
-    /// 当前绘制帧下标.
-    /// </summary>
-    private int _currentFrame;
-    public int CurrentFrame {
-      get => this._currentFrame;
-      set {
-        if (value > this.TotalFrames - 1) {
-          value = 0;
-        }
-        this._currentFrame = value;
-      }
-    }
-
     /// <summary>
     /// 初始化 CanvasBitmap.
     /// </summary>