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

deps: Bump Three.js to r151 #1218

Merged
merged 4 commits into from
May 31, 2023
Merged

deps: Bump Three.js to r151 #1218

merged 4 commits into from
May 31, 2023

Conversation

0b5vr
Copy link
Contributor

@0b5vr 0b5vr commented May 9, 2023

will resolve #1198

Description

This PR bumps Three.js to r151.

This PR also fixes shader errors in r151 while maintaining compatibility before r151.

Also added a feature test scene for MToon.

See: https://github.com/mrdoob/three.js/releases/tag/r151

TODO

  • Make sure the shader is working on r151 and r150

@0b5vr 0b5vr added bug Something isn't working dependencies Pull requests that update a dependency file labels May 9, 2023
@0b5vr 0b5vr added this to the next(v1.0.10) milestone May 9, 2023
@0b5vr 0b5vr self-assigned this May 9, 2023
@@ -161,7 +171,7 @@ vec3 getDiffuse(
}

void RE_Direct_MToon( const in IncidentLight directLight, const in GeometricContext geometry, const in MToonMaterial material, const in float shadow, inout ReflectedLight reflectedLight ) {
float dotNL = saturate( dot( geometry.normal, directLight.direction ) );
float dotNL = clamp( dot( geometry.normal, directLight.direction ), -1.0, 1.0 );
Copy link
Contributor Author

Choose a reason for hiding this comment

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

光の当たっていない側にトゥーンのfeatherを動かせられなかったのを修正しました。

@0b5vr 0b5vr requested a review from ke456-png May 30, 2023 07:55
@0b5vr 0b5vr marked this pull request as ready for review May 30, 2023 07:55
@ke456-png
Copy link
Contributor

👍
image
examples/feature-test.html

Copy link
Contributor

@ke456-png ke456-png left a comment

Choose a reason for hiding this comment

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

NICE 👍

Comment on lines +53 to +56
#if THREE_VRM_THREE_REVISION >= 151
vUv = uv;
#else
vUv = ( uvTransform * vec3( uv, 1 ) ).xy;
Copy link
Contributor

Choose a reason for hiding this comment

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

[memo]

Copy link
Contributor

@ke456-png ke456-png left a comment

Choose a reason for hiding this comment

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

NICE 👍

@0b5vr 0b5vr merged commit 2fd2736 into dev May 31, 2023
@0b5vr 0b5vr deleted the bump-three-r151 branch May 31, 2023 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

uv2_vertex and uv2_pars_vertex failing mtoon VRM rendering in Three v151
2 participants