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

MaterialLoader support Boolean and Integer uniform data setting #1875

Merged
merged 19 commits into from
Nov 15, 2023
Merged

MaterialLoader support Boolean and Integer uniform data setting #1875

merged 19 commits into from
Nov 15, 2023

Conversation

Sway007
Copy link
Member

@Sway007 Sway007 commented Nov 13, 2023 •
edited

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, ...)

  1. MaterialLoader support Boolean and Integer uniform data setting
  2. fix shaderlab glsl variable type pattern

@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
Merge branch 'main' of https://github.com/galacean/engine
598fc56
@Sway007
fix(shader-lab): compatible with no varying variable
e33a66f
@Sway007
feat(shader-lab): detect mismatch return type
41ef06f
@Sway007
fix(shader-lab): renderState assignment
b5214fc
@Sway007
feat: extend material loader data type
f36ce02
@Sway007
Merge branch 'main' of https://github.com/galacean/engine
ff8b7c2
@Sway007 Sway007 added enhancement New feature or request material labels Nov 13, 2023
@Sway007 Sway007 self-assigned this Nov 13, 2023
@codecov Codecov
Copy link

codecov bot commented Nov 13, 2023 •
edited

Codecov Report

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

Comparison is base (c8cad90) 67.00% compared to head (c82a2c0) 67.38%.
Report is 4 commits behind head on main.

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

Files Patch % Lines
packages/core/src/particle/ParticleGenerator.ts 9.85% 64 Missing ⚠️
...oader/src/ktx2/transcoder/BinomialLLCWorkerCode.ts 0.00% 10 Missing ⚠️
packages/core/src/animation/AnimationClip.ts 0.00% 7 Missing ⚠️
packages/core/src/particle/modules/MainModule.ts 0.00% 4 Missing ⚠️
packages/loader/src/MaterialLoader.ts 0.00% 4 Missing ⚠️
packages/core/src/animation/Animator.ts 50.00% 1 Missing and 1 partial ⚠️
...es/core/src/animation/AnimationClipCurveBinding.ts 75.00% 1 Missing ⚠️
packages/core/src/particle/ParticleRenderer.ts 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1875      +/-   ##
==========================================
+ Coverage   67.00%   67.38%   +0.37%     
==========================================
  Files         471      471              
  Lines       23769    23809      +40     
  Branches     3387     3402      +15     
==========================================
+ Hits        15927    16043     +116     
+ Misses       6646     6570      -76     
  Partials     1196     1196

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

@GuoLei1990 GuoLei1990 merged commit 025033e into galacean:main Nov 15, 2023
5 checks passed
GuoLei1990 added a commit that referenced this pull request Nov 16, 2023
@GuoLei1990
Merge branch 'main' into dev/1.2
02a6caf 
* main:
  MaterialLoader support `Boolean` and `Integer` uniform data setting (#1875)
  Fix particle `maxParticles` relate bug (#1876)
  Animation compatible when component cannot be found (#1878)
  Fix ktx2 transcode to bc size need multiple of 4 (#1877)
  test(Shader): update unit test case of (#1870)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuoLei1990 GuoLei1990 Awaiting requested review from GuoLei1990

@zhuxudong zhuxudong Awaiting requested review from zhuxudong

Assignees

@Sway007 Sway007

Labels
enhancement New feature or request material
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Sway007 @GuoLei1990 @zhuxudong