Simplify normal map sample, fix toy box normals. #320
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mirror the toy-box texture to fix the normals. Simplify the `box.ts` code. This was more complicated than it needed to be, and borrowed code from another project. This code also used vec3 methods with two-element vectors, which might cause issues with future versions of 'wgpu-matrix' Simplfiy `normalMap.wgsl` * Use `const` declarations to name the various modes instead of magic literals. * Calculate the `worldViewProj` and `worldView` matrices on the CPU and pass them in as part of the uniform buffer. Reduces duplicated work in the vertex shader, and reduces the amount of data needed to be passed in. * Use `vec3f` for the light position instead of scalar. Pass in the position in view-space. * Reduce the amount of data passed from vertex to fragment. * Rename `tbn` to `tangent`, `bitangent` and `normal`. * Remove unused function `when_greater` * Split `parallax_uv` into two functions. * Simplify steep-parallax loop. Pre-calculate the UV derivatives so we can break early from the loop. Rename 'diffuse' textures to 'albedo'. Technically a diffuse texture already has diffuse lighting applied. Fixed: webgpu#317
ben-clayton
force-pushed
the
fix-normal-map
branch
from
ca8dde6 to
73b0e58
Compare
|
FYI: @cmhhelgeson |
Kangz
approved these changes
Nov 7, 2023
|
Hi Ben, I took a look at the code and everything looks good in terms of clarity and simplicity. Sorry I couldn't be of more help, I've been sick for longer than expected. |
No need to apologise! Thank you for being open to the changes. |
|
Also: Get well soon! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mirror the toy-box texture to fix the normals.
Simplify the
box.tscode.This was more complicated than it needed to be, and borrowed code from another project.
This code also used
vec3methods with two-element vectors, which might cause issues with future versions ofwgpu-matrixSimplfiy
normalMap.wgslconstdeclarations to name the various modes instead of magic literals.worldViewProjandworldViewmatrices on the CPU and pass them in as part of the uniform buffer. Reduces duplicated work in the vertex shader, and reduces the amount of data needed to be passed in.vec3ffor the light position instead of scalar. Pass in the position in view-space.tbntotangent,bitangentandnormal.when_greaterparallax_uvinto two functions.Rename
diffusetextures toalbedo. Technically a diffuse texture already has diffuse lighting applied.Fixed: #317