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 parallax mapping #9003

Merged
merged 1 commit into from
Jul 1, 2023
Merged

Fix parallax mapping #9003

merged 1 commit into from
Jul 1, 2023

Conversation

nicopap
Copy link
Contributor

@nicopap nicopap commented Jun 30, 2023

Objective

Since 10f5c92, parallax mapping was broken.

When #5703 was merged, the change from in.uv to uv in the pbr shader was reverted. So the shader would use the wrong coordinate to sample the various textures.

Solution

We revert to using the correct uv.

@nicopap
Fix parallax mapping
de2b14c 
Since 10f5c92, parallax mapping was broken.

When bevyengine#5703 was merged, the change from `in.uv` to `uv` in the pbr shader
was reverted. So the shader would use the wrong coordinate to sample the
various textures.

We revert to using the correct uv.
@nicopap nicopap added C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen C-Regression Functionality that used to work but no longer does. Add a test for this! labels Jun 30, 2023
@nicopap nicopap added this to the 0.11 milestone Jun 30, 2023
@danchia danchia self-requested a review July 1, 2023 06:46
danchia
danchia approved these changes Jul 1, 2023
View reviewed changes
Copy link
Contributor

@danchia danchia left a comment

Choose a reason for hiding this comment

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

this looks to be a re-application of changes from #5928 that were accidentally dropped in the shader import PR.

@nicopap nicopap added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Jul 1, 2023
@superdump superdump added this pull request to the merge queue Jul 1, 2023
Merged via the queue into bevyengine:main with commit 982e337 Jul 1, 2023
25 checks passed
@nicopap nicopap deleted the fix-parallax-mapping branch August 30, 2023 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@superdump superdump superdump approved these changes

@danchia danchia danchia approved these changes

@robtfm robtfm robtfm approved these changes

Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior C-Regression Functionality that used to work but no longer does. Add a test for this! S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Milestone
0.11
Development

Successfully merging this pull request may close these issues.
4 participants
@nicopap @superdump @danchia @robtfm