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

Feat: support parallax mapping and parallax occlusion mapping in pbr #725

Open
wants to merge 26 commits into
base: main
Choose a base branch
from

Conversation

zhuxudong
Copy link
Member

@zhuxudong zhuxudong commented Apr 2, 2022

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

Feature.

What is the current behavior? (You can also link to an open issue here)

support normal texture only.

What is the new behavior (if this is a feature change)?

Support:

  • normal
  • normal + parallax
  • normal + parallax occlusion

image

@zhuxudong zhuxudong added enhancement New feature or request Rendering Rendering related functions labels Apr 2, 2022
@zhuxudong zhuxudong added this to the 0.7 milestone Apr 2, 2022
@zhuxudong zhuxudong self-assigned this Apr 2, 2022
shensi.zxd added 3 commits April 11, 2022 17:38
# Conflicts:
#	packages/core/src/shaderlib/pbr/pbr_frag.glsl
# Conflicts:
#	packages/core/src/shaderlib/blendShape_vert.glsl
#	packages/core/src/shaderlib/mobile_blinnphong_frag.glsl
#	packages/core/src/shaderlib/normal_get.glsl
#	packages/core/src/shaderlib/normal_share.glsl
#	packages/core/src/shaderlib/normal_vert.glsl
#	packages/core/src/shaderlib/pbr/pbr_helper.glsl
#	packages/core/src/shaderlib/skinning_vert.glsl
@GuoLei1990 GuoLei1990 changed the base branch from dev/0.7 to dev/0.8 May 6, 2022 02:50
@GuoLei1990 GuoLei1990 deleted the branch galacean:main August 4, 2022 06:48
@GuoLei1990 GuoLei1990 closed this Aug 4, 2022
@GuoLei1990 GuoLei1990 reopened this Aug 4, 2022
@GuoLei1990 GuoLei1990 changed the base branch from dev/0.8 to main August 4, 2022 08:40
@GuoLei1990 GuoLei1990 modified the milestones: 0.7, 1.0 Nov 14, 2022
@GuoLei1990 GuoLei1990 added the medium priority Medium priority issue label Nov 14, 2022
@GuoLei1990 GuoLei1990 mentioned this pull request Nov 15, 2022
37 tasks
@GuoLei1990 GuoLei1990 modified the milestones: 1.0, Backlog Nov 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request medium priority Medium priority issue Rendering Rendering related functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants