Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix animator play backwards error and onStateExit not triggered when crossFade finished and actualDeltaTime error #2325

Merged
merged 6 commits into from
Aug 13, 2024

Conversation

luzhuang
Copy link
Contributor

@luzhuang luzhuang commented Aug 9, 2024

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

Summary by CodeRabbit

  • New Features

    • Introduced a new animator functionality for 3D scene playback in reverse, enhancing user interaction with the animation.
    • Added a configuration option for specifying playback scenarios, allowing for more flexible animation settings.
  • Bug Fixes

    • Improved transition logic in the animation framework for better performance and clarity.
  • Tests

    • Extended the test suite to validate animator state transitions and script interactions, ensuring robustness in functionality.

@luzhuang luzhuang added bug Something isn't working animation Built-in animation system related functions labels Aug 9, 2024
@luzhuang luzhuang requested a review from GuoLei1990 August 9, 2024 03:43
Copy link

coderabbitai bot commented Aug 9, 2024

Walkthrough

The recent changes enhance animation capabilities with the Galacean engine, introducing a new script for 3D scene animation that allows for reverse playback. A configuration option has been added to accommodate this feature. Additionally, improvements to the Animator class streamline transition logic, boosting code readability and maintainability while retaining existing functionality.

Changes

Files Change Summary
e2e/case/animator-play-backwards.ts New file for animating a 3D scene with backward playback using the Galacean engine, including scene setup.
e2e/config.ts Added playBackWards property to E2E_CONFIG, supporting a new animation playback scenario.
packages/core/src/animation/Animator.ts Enhanced transition logic for animations, improving readability while preserving original functionality.
tests/src/core/Animator.test.ts New test case added to validate state machine scripts and transitions within the Animator class.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Scene
    participant Animator

    User->>Scene: Initialize scene with camera and lighting
    Scene->>Animator: Load GLTF model and configure animator
    Animator->>Animator: Play "walk" animation in reverse
    User->>Scene: Interact with orbit controls
    Scene->>User: Render updated scene
Loading

Poem

🐇 In a world of light and play,
Where animations dance and sway,
Backwards hops, a joyful cheer,
Code now flows, so bright and clear!
With a flick and a twist, we animate,
A rabbit's dream, oh, what a fate! 🥕


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 9f47834 and 6d000c3.

Files ignored due to path filters (1)
  • e2e/fixtures/originImage/Animator_animator-play-backwards.jpg is excluded by !**/*.jpg
Files selected for processing (3)
  • e2e/case/animator-play-backwards.ts (1 hunks)
  • e2e/config.ts (1 hunks)
  • packages/core/src/animation/Animator.ts (2 hunks)
Additional comments not posted (4)
e2e/case/animator-play-backwards.ts (1)

1-37: LGTM! Ensure test coverage.

The code for the new test case is well-structured and follows good practices for setting up a scene and testing animation playback. Ensure that this test case is included in the automated test suite to verify backward animation functionality.

e2e/config.ts (1)

48-52: Configuration addition looks good.

The new playBackWards configuration option is consistent with the existing structure and enhances the functionality by supporting the new playback scenario.

packages/core/src/animation/Animator.ts (2)

551-569: Refactoring improves readability.

The use of destructuring and streamlined conditional logic in the transition application process enhances code readability and maintainability while preserving functionality.


900-918: Refactoring improves readability.

The refactoring of transition logic in the _updateFinishedState method improves clarity without altering the existing behavior.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 6d000c3 and 9beb2b5.

Files selected for processing (1)
  • e2e/case/animator-play-backwards.ts (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • e2e/case/animator-play-backwards.ts

@luzhuang luzhuang changed the title Fix animator play backwards error Fix animator play backwards error and onStateExit not triggered and actualDeltaTime error Aug 9, 2024
@luzhuang luzhuang changed the title Fix animator play backwards error and onStateExit not triggered and actualDeltaTime error Fix animator play backwards error and onStateExit not triggered when crossFade finished and actualDeltaTime error Aug 9, 2024
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Outside diff range, codebase verification and nitpick comments (1)
tests/src/core/Animator.test.ts (1)

646-711: Well-structured test case for state machine scripts.

The new test case effectively verifies the interaction between animator states and scripts using spies. Consider adding comments or documentation to describe the purpose and expected behavior of the test for future reference.

+  // Test case for validating state machine script interactions with animator states.
Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 9beb2b5 and 9c6b849.

Files selected for processing (2)
  • packages/core/src/animation/Animator.ts (5 hunks)
  • tests/src/core/Animator.test.ts (1 hunks)
Additional comments not posted (3)
packages/core/src/animation/Animator.ts (3)

551-569: Improved transition logic with destructuring and conditional checks.

The use of destructuring and concise conditional checks enhances the readability and maintainability of the code. Ensure that the logic for applying transitions is thoroughly tested to avoid regressions.


812-812: Ensure consistent handling of actualCostTime.

The handling of actualCostTime when playSpeed is zero should be consistent across different methods to avoid discrepancies in playback behavior.

Verification successful

Consistent handling of actualCostTime confirmed.

The handling of actualCostTime when playSpeed is zero is consistent across the relevant methods in Animator.ts. The logic is applied uniformly, ensuring no discrepancies in playback behavior.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Ensure consistent handling of `actualCostTime` across methods.

# Test: Search for all occurrences of `actualCostTime`. Expect: Consistent handling in relevant methods.
rg --type ts 'actualCostTime'

Length of output: 582


Line range hint 687-699:
Verify impact of actualCostTime changes on playback timing.

The modification to use deltaTime when dstPlaySpeed is zero may affect the timing calculations during playback. Verify that this change does not introduce any unintended side effects.

@GuoLei1990 GuoLei1990 merged commit 588dc53 into galacean:main Aug 13, 2024
7 checks passed
singlecoder pushed a commit to singlecoder/engine that referenced this pull request Aug 29, 2024
…crossFade finished and actualDeltaTime error (galacean#2325)

* fix: animator play backwards error

* fix: onStateExit not called when crossFade finished but state not finished

* fix: actualDelta time calculate error when speed is 0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
animation Built-in animation system related functions bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants