matcapTexture should be 0.0 when it doesn't exist.
#2540
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
Santarh
commented
Dec 23, 2024
| @@ -118,7 +118,7 @@ inline half3 GetMToonLighting_Rim_Matcap(const MToonInput input) | |||
|
|
|||
| return _MatcapColor.rgb * MTOON_SAMPLE_TEXTURE2D(_MatcapTex, matcapUv).rgb; | |||
| } | |||
| return _MatcapColor.rgb; | |||
| return 0; | |||
There was a problem hiding this comment.
When the texture is not defined, it must be sampled as having 0.0 in RGB components.
| @@ -29,7 +29,7 @@ Shader "VRM10/MToon10" | |||
| _EmissionMap ("emissiveTexture", 2D) = "white" {} // Unity specified name | |||
|
|
|||
| // Rim Lighting | |||
| _MatcapColor ("mtoon.matcapFactor", Color) = (0, 0, 0, 1) | |||
| _MatcapColor ("mtoon.matcapFactor", Color) = (1, 1, 1, 1) | |||
There was a problem hiding this comment.
ousttrue
approved these changes
Dec 23, 2024
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.
Fixed #2505
仕様によれば、
matcapTextureが指定されていないとき0.0として評価されるべきです。つまり
matcapFactorの値がなんであれ、matcapTextureが指定されていないときは MatCap 項自体が0.0となるべきだということです。しかし現状は
matcapFactorの値が評価されていました。これを修正します。
またあわせて
matcapFactorのデフォルト値も仕様に合わせて変更します。Material 新規作成時のデフォルト値が変わりますが、新規モデル制作時の話であり、その場合も見た目の挙動は変わりません。