Address comments

flutter · Jan 2, 2023 · 60d5719 · 60d5719
1 parent fe64e42
commit 60d5719
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 34 deletions.
diff --git a/impeller/scene/animation/animation_clip.cc b/impeller/scene/animation/animation_clip.cc
@@ -54,12 +54,12 @@ void AnimationClip::SetLoop(bool looping) {
   loop_ = looping;
 }
 
-Scalar AnimationClip::GetPlaybackSpeed() const {
-  return playback_speed_;
+Scalar AnimationClip::GetPlaybackTimeScale() const {
+  return playback_time_scale_;
 }
 
-void AnimationClip::SetPlaybackSpeed(Scalar playback_speed) {
-  playback_speed_ = playback_speed;
+void AnimationClip::SetPlaybackTimeScale(Scalar playback_speed) {
+  playback_time_scale_ = playback_speed;
 }
 
 Scalar AnimationClip::GetWeight() const {
@@ -82,7 +82,7 @@ void AnimationClip::Advance(Scalar delta_time) {
   if (!playing_ || delta_time <= 0) {
     return;
   }
-  delta_time *= playback_speed_;
+  delta_time *= playback_time_scale_;
   playback_time_ += delta_time;
 
   /// Handle looping behavior.

diff --git a/impeller/scene/animation/animation_clip.h b/impeller/scene/animation/animation_clip.h
@@ -38,11 +38,11 @@ class AnimationClip final {
 
   void SetLoop(bool looping);
 
-  Scalar GetPlaybackSpeed() const;
+  Scalar GetPlaybackTimeScale() const;
 
   /// @brief  Sets the animation playback speed. Negative values make the clip
   ///         play in reverse.
-  void SetPlaybackSpeed(Scalar playback_speed);
+  void SetPlaybackTimeScale(Scalar playback_speed);
 
   Scalar GetWeight() const;
 
@@ -74,7 +74,7 @@ class AnimationClip final {
   std::vector<ChannelBinding> bindings_;
 
   Scalar playback_time_ = 0;
-  Scalar playback_speed_ = 1;  // Seconds multiplier, can be negative.
+  Scalar playback_time_scale_ = 1;  // Seconds multiplier, can be negative.
   Scalar weight_ = 1;
   bool playing_ = false;
   bool loop_ = false;

diff --git a/impeller/scene/animation/animation_player.cc b/impeller/scene/animation/animation_player.cc
@@ -26,8 +26,8 @@ AnimationClip& AnimationPlayer::AddAnimation(
   // Record all of the unique default transforms that this AnimationClip
   // will mutate.
   for (const auto& binding : clip.bindings_) {
-    default_target_transforms_.insert(DefaultTransform{
-        .node = binding.node, .transform = binding.node->GetLocalTransform()});
+    default_target_transforms_.insert(
+        {binding.node, binding.node->GetLocalTransform()});
   }
 
   clips_.push_back(std::move(clip));
@@ -52,8 +52,8 @@ void AnimationPlayer::Update() {
 }
 
 void AnimationPlayer::Reset() {
-  for (auto& default_transform : default_target_transforms_) {
-    default_transform.node->SetLocalTransform(default_transform.transform);
+  for (auto& [node, transform] : default_target_transforms_) {
+    node->SetLocalTransform(transform);
   }
 }
 

diff --git a/impeller/scene/animation/animation_player.h b/impeller/scene/animation/animation_player.h
@@ -38,28 +38,7 @@ class AnimationPlayer final {
   void Reset();
 
  private:
-  struct DefaultTransform {
-    Node* node;
-    Matrix transform;
-
-    struct Hash {
-      std::size_t operator()(const DefaultTransform& o) const {
-        return fml::HashCombine(o.node);
-      }
-    };
-
-    struct Equal {
-      bool operator()(const DefaultTransform& lhs,
-                      const DefaultTransform& rhs) const {
-        return lhs.node == rhs.node;
-      }
-    };
-  };
-
-  std::unordered_set<DefaultTransform,
-                     DefaultTransform::Hash,
-                     DefaultTransform::Equal>
-      default_target_transforms_;
+  std::unordered_map<Node*, Matrix> default_target_transforms_;
 
   std::vector<AnimationClip> clips_;