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

Bump Three.js to r168 #1465

Merged
merged 8 commits into from
Sep 5, 2024
Merged

Bump Three.js to r168 #1465

merged 8 commits into from
Sep 5, 2024

Conversation

0b5vr
Copy link
Contributor

@0b5vr 0b5vr commented Aug 19, 2024

Description

  • Bump Three.js to r168
  • Add a compat to MToonNodeMaterial setupNormal
  • Add a compat to tslFn calling
  • normalMap is no longer a node element, we use this as an individual node instead

See each commits for details.

Points need review

  • Does it work on r167?
  • Does it work on r168?

Starting from r168, `setupNormal` returns the normal node instead of assigning inside the `NodeMaterial.setupNormal`

See: mrdoob/three.js#29137
In r168, `tslFn` has been renamed to `Fn`

See: mrdoob/three.js#29064
@0b5vr 0b5vr added this to the next milestone Aug 19, 2024
@0b5vr 0b5vr self-assigned this Aug 19, 2024
@types/three is not released yet
`normalMap` is no longer a node element, we use this as an individual node instead
This should work also in r167
See: mrdoob/three.js#29187
@0b5vr 0b5vr marked this pull request as ready for review August 30, 2024 09:19
@0b5vr 0b5vr changed the title r168 compat Bump Three.js to r168 Aug 30, 2024
@0b5vr 0b5vr marked this pull request as draft August 30, 2024 09:28
@0b5vr
Copy link
Contributor Author

0b5vr commented Aug 30, 2024

We are going to wait @types/three

Update type definition of `FnCompat` according the latest `@types/three`
@0b5vr 0b5vr marked this pull request as ready for review September 5, 2024 06:45
`XRWebGLDepthInformation` doesn't exist in the existing v0.5.16
and that had been causing build errors
The return type should be matched to the super class (NodeMaterial)
@0b5vr
Copy link
Contributor Author

0b5vr commented Sep 5, 2024

Ready to merge, Working fine in (r167, r168) x (WebGL, WebGPU) matrix

@0b5vr 0b5vr merged commit 34def0a into dev Sep 5, 2024
5 checks passed
@0b5vr 0b5vr deleted the r168-compat branch September 5, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant