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 material destoroy bug #1847

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Conversation

GuoLei1990
Copy link
Member

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)

@GuoLei1990 GuoLei1990 added bug Something isn't working particle labels Oct 30, 2023
@codecov
Copy link

codecov bot commented Oct 30, 2023

Codecov Report

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

Comparison is base (46397db) 66.81% compared to head (181ae7b) 66.76%.

❗ Current head 181ae7b differs from pull request most recent head 057de40. Consider uploading reports for the commit 057de40 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1847      +/-   ##
==========================================
- Coverage   66.81%   66.76%   -0.06%     
==========================================
  Files         472      472              
  Lines       23716    23725       +9     
  Branches     3376     3378       +2     
==========================================
- Hits        15846    15839       -7     
- Misses       6678     6692      +14     
- Partials     1192     1194       +2     
Files Coverage Δ
packages/core/src/Engine.ts 87.69% <100.00%> (+0.15%) ⬆️
packages/core/src/RenderPipeline/RenderQueue.ts 47.27% <100.00%> (+0.60%) ⬆️
packages/core/src/particle/ParticleMaterial.ts 11.11% <ø> (+0.58%) ⬆️
packages/core/src/mesh/MeshRenderer.ts 87.05% <33.33%> (-2.10%) ⬇️
packages/core/src/particle/ParticleRenderer.ts 10.00% <0.00%> (-0.53%) ⬇️

... 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 particle material bug Fix material destoroy bug Oct 30, 2023
@GuoLei1990 GuoLei1990 merged commit 50eb31b into galacean:main Oct 30, 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
@GuoLei1990 GuoLei1990 deleted the pr/fix-particle branch November 8, 2023 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working particle
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Material missing should have an fallback effect
3 participants