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 blendShapeAnimation crossFade bug #1840

Merged
merged 8 commits into from
Oct 27, 2023

Conversation

luzhuang
Copy link
Contributor

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:

@luzhuang luzhuang added the bug Something isn't working label Oct 26, 2023
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (ffb4397) 66.84% compared to head (a17cd25) 66.82%.
Report is 1 commits behind head on main.

❗ Current head a17cd25 differs from pull request most recent head 0bf5087. Consider uploading reports for the commit 0bf5087 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1840      +/-   ##
==========================================
- Coverage   66.84%   66.82%   -0.03%     
==========================================
  Files         472      472              
  Lines       23700    23700              
  Branches     3368     3368              
==========================================
- Hits        15842    15837       -5     
- Misses       6660     6667       +7     
+ Partials     1198     1196       -2     
Files Coverage Δ
...nternal/animationCurveOwner/AnimationCurveOwner.ts 45.12% <0.00%> (ø)

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@GuoLei1990 GuoLei1990 changed the title fix: blendShapeAnimation crossFade bug Fix blendShapeAnimation crossFade bug Oct 27, 2023
@GuoLei1990 GuoLei1990 merged commit 895c802 into galacean:main Oct 27, 2023
5 checks passed
GuoLei1990 added a commit that referenced this pull request Nov 1, 2023
* main: (29 commits)
  Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (#1855)
  feat: ParticleGenerator support simulationSpeed (#1854)
  fix: sprite destroy (#1852)
  "v1.1.0-beta.18"
  Fix quaternion to euler bug (#1851)
  Fix ColorOverLifetimeModule mode invalid bug (#1850)
  fix: no autoplay when set animatorController after enable (#1843)
  Fix material destoroy bug (#1847)
  Fix Sprite can't batch bug caused by material instance (#1830)
  "v1.1.0-beta.17"
  fix: glTF animation parse bug (#1845)
  fix: mesh decoder (#1844)
  "v1.1.0-beta.16"
  Fix blendShape crossFade bug (#1841)
  fix: ignore ambient in 2d template (#1836)
  "v1.1.0-beta.15"
  Fix blendShapeAnimation crossFade bug (#1840)
  fix: ignore case of asset url (#1809)
  `Shaderlab` remove editor properties (#1825)
  fix: ktx2 texture support (#1829)
  ...

# Conflicts:
#	packages/core/src/particle/ParticleRenderer.ts
zhuxudong added a commit to zhuxudong/engine that referenced this pull request Nov 7, 2023
* dev/1.2: (31 commits)
  Add sunSource (galacean#1823)
  Fix(ShaderLab): make `UsePass` directive compatible with all builtin shader names (galacean#1855)
  feat: ParticleGenerator support simulationSpeed (galacean#1854)
  fix: sprite destroy (galacean#1852)
  "v1.1.0-beta.18"
  Fix quaternion to euler bug (galacean#1851)
  Fix ColorOverLifetimeModule mode invalid bug (galacean#1850)
  fix: no autoplay when set animatorController after enable (galacean#1843)
  Refactor `glTFResource` (galacean#1831)
  Fix material destoroy bug (galacean#1847)
  Fix Sprite can't batch bug caused by material instance (galacean#1830)
  "v1.1.0-beta.17"
  fix: glTF animation parse bug (galacean#1845)
  fix: mesh decoder (galacean#1844)
  "v1.1.0-beta.16"
  Fix blendShape crossFade bug (galacean#1841)
  fix: ignore ambient in 2d template (galacean#1836)
  "v1.1.0-beta.15"
  Fix blendShapeAnimation crossFade bug (galacean#1840)
  fix: ignore case of asset url (galacean#1809)
  ...

# Conflicts:
#	packages/loader/src/gltf/parser/GLTFParserContext.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants