shadertools: PBR module using UBO #2173
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
20 tasks
ibgreen
reviewed
Aug 19, 2024
| @@ -111,6 +111,7 @@ const lightSources: LightingProps = { | |||
| type: 'ambient' | |||
| }, | |||
| directionalLights: [ | |||
| // @ts-expect-error Remove once npm package updated with new types | |||
There was a problem hiding this comment.
Having to do this is really annoying. Not quite sure when / why it started to happen. We should restore @donmccurdy 's workspaces setup on master or find another way to fix this.
ibgreen
approved these changes
Aug 19, 2024
modules/shadertools/src/modules/lighting/pbr-material/pbr-material.ts
Outdated
Show resolved
Hide resolved
| USE_IBL: 0, | ||
| PBR_DEBUG: 0 | ||
| LIGHTING_FRAGMENT: 1 | ||
| // TODO defining these as 0 breaks shader |
There was a problem hiding this comment.
Interesting. Some thoughts:
-We may want to separate in the API between flags (for code enablement, which are either defined or not) and constants (which would inject actual values).
- WGSL has built-in support for constants (that does not require recompiling the shader!), but not defines. However shadertools has added a simple #ifdef preprocessor system.
So, props.defines could just be an array or a Set, or a Record<string, boolean>. and props.constants a map of numeric values
There was a problem hiding this comment.
Interesting idea. #ifdef NAME is generally a bit frustrating as setting it to 0 evaluates to true in the preprocessor. Some thoughts:
- Restricting them to boolean values makes the name
props.definessound weird, perhapsprops.flags? - Could our preprocessor instead use a custom syntax? E.g.
// if FLAG(FLAG_NAME) ... // else ... // endif - We do things like
#define SHADER_NAME simple-mesh-layer-vs, it is weird to restrict defines from the outside to be boolean, and then sometimes use strings
This was referenced Aug 20, 2024
felixpalmer
added a commit
that referenced
this pull request
Aug 22, 2024
felixpalmer
added a commit
that referenced
this pull request
Sep 2, 2024
This reverts commit 0cfb490.
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.
For visgl/deck.gl#8997
Tested using
hello-gltfapp - all examples working. Not tried in deck.gl yetBackground
Change List
lightingmodule