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.

Sign up for GitHub

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

Jump to bottom

Fix ShaderLab umd package compilation and circle reference #1856

Merged
merged 13 commits into from
Nov 1, 2023
Merged

Fix ShaderLab umd package compilation and circle reference #1856

merged 13 commits into from
Nov 1, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Nov 1, 2023

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)

@Sway007
fix(shader-lab): compatible with empty macro
5a26f3d
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
5ecc318
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
cafc24f
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
dc69489
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
221b7b6
@Sway007
fix(shader-lab): add break and continue syntax
0d45d9c
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
0f14c3f
@Sway007
fix: typo
8871d9b
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
3b4ffd7
@Sway007
fix(shader-lab): Make usepass compatible with buitin shader
f649a58
@Sway007
refactor(shader-lab): circle reference
f40a465
@Sway007
fix(shader-lab): umd package
2c587b1
@Sway007
Merge branch 'main' of https://github.com/galacean/engine into pr/sha…
305290a 
…derLab
@Sway007 Sway007 added shader Shader related functions engineering Engineering problems labels Nov 1, 2023
@Sway007 Sway007 requested a review from GuoLei1990 November 1, 2023 09:42
@Sway007 Sway007 self-assigned this Nov 1, 2023
@codecov Codecov
Copy link

codecov bot commented Nov 1, 2023

Codecov Report

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

Comparison is base (de39a5a) 67.00% compared to head (413285f) 67.02%.

❗ Current head 413285f differs from pull request most recent head 305290a. Consider uploading reports for the commit 305290a to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1856      +/-   ##
==========================================
+ Coverage   67.00%   67.02%   +0.01%     
==========================================
  Files         472      471       -1     
  Lines       23742    23741       -1     
  Branches     3379     3379              
==========================================
+ Hits        15909    15913       +4     
+ Misses       6631     6627       -4     
+ Partials     1202     1201       -1
Files Coverage Δ
packages/shader-lab/src/AstNodeUtils.ts 81.08% <ø> (+2.82%) ⬆️
packages/shader-lab/src/ShaderLab.ts 80.00% <70.00%> (-20.00%) ⬇️

... and 2 files with indirect coverage changes

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

@Sway007
Copy link
Member Author

Sway007 commented Nov 1, 2023

galacean/editor#1952

@GuoLei1990 GuoLei1990 merged commit 948aaa1 into galacean:main Nov 1, 2023
GuoLei1990 added a commit that referenced this pull request Nov 13, 2023
@GuoLei1990
Merge branch 'main' into dev/1.2
d233eef 
* main:
  fix: material destroy bug (#1864)
  Fix asset promise (#1867)
  Set `SpriteMask.sprite` to null after destroying the sprite.  (#1866)
  "v1.1.0-beta.19"
  Add recursive class and methods (#1865)
  Fix url clamp bug (#1860)
  feat: add recursive object parse (#1863)
  Fix ShaderLab compatible with no varying variable (#1859)
  Fix ShaderLab umd package compilation and circle reference (#1856)
  Add unit test case of `ColliderShape` (#1740)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuoLei1990 GuoLei1990 GuoLei1990 approved these changes

Assignees

@Sway007 Sway007

Labels
engineering Engineering problems shader Shader related functions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Sway007 @GuoLei1990