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

Support anisotropy in pbr #1811

Merged
merged 12 commits into from
Dec 26, 2023
Merged

Conversation

zhuxudong
Copy link
Member

@zhuxudong zhuxudong commented Oct 10, 2023

Please check if the PR fulfills these requirements

support #934 , merge conflict from #1345 , playground: #854

  • 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:

@zhuxudong zhuxudong added the enhancement New feature or request label Oct 10, 2023
@zhuxudong zhuxudong added this to the 1.2 milestone Oct 10, 2023
@zhuxudong zhuxudong self-assigned this Oct 10, 2023
@zhuxudong zhuxudong mentioned this pull request Oct 10, 2023
3 tasks
@codecov
Copy link

codecov bot commented Oct 10, 2023

Codecov Report

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

Comparison is base (e659ea6) 65.00% compared to head (21ae296) 65.05%.

❗ Current head 21ae296 differs from pull request most recent head 6eee233. Consider uploading reports for the commit 6eee233 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1811      +/-   ##
==========================================
+ Coverage   65.00%   65.05%   +0.05%     
==========================================
  Files         473      473              
  Lines       23770    23782      +12     
  Branches     3370     3373       +3     
==========================================
+ Hits        15452    15472      +20     
+ Misses       7114     7112       -2     
+ Partials     1204     1198       -6     
Files Coverage Δ
packages/core/src/material/PBRBaseMaterial.ts 71.59% <16.66%> (-8.68%) ⬇️

... and 5 files with indirect coverage changes

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

@zhuxudong zhuxudong changed the base branch from main to dev/1.2 October 11, 2023 07:51
@zhuxudong zhuxudong added the high priority High priority issue label Oct 11, 2023
@GuoLei1990 GuoLei1990 added math Math library material and removed math Math library labels Oct 12, 2023

#ifdef MATERIAL_ENABLE_ANISOTROPY
uniform vec3 material_AnisotropyInfo;
#endif
Copy link
Member

Choose a reason for hiding this comment

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

#ifdef MATERIAL_ENABLE_ANISOTROPY
    uniform vec3 material_AnisotropyInfo;
    #ifdef MATERIAL_HAS_ANISOTROPY_TEXTURE
        uniform sampler2D material_AnisotropyTexture;
    #endif
#endif

@GuoLei1990 GuoLei1990 merged commit 73162e8 into galacean:dev/1.2 Dec 26, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request high priority High priority issue material
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants