色プロパティのシリアライズ・デシリアライズ時に色空間をコードで明示 #933
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
May 7, 2021
| var color = src.pbrMetallicRoughness.baseColorFactor; | ||
| param.Colors.Add("_Color", (new Color(color[0], color[1], color[2], color[3])).gamma); | ||
| param.Colors.Add("_Color", | ||
| src.pbrMetallicRoughness.baseColorFactor.ToColor4(ColorSpace.Linear, ColorSpace.sRGB) |
There was a problem hiding this comment.
glTF の定義として baseColorFactor は Linear 空間の色である。
また、Unity の Standard Shader の _Color プロパティは sRGB 空間の色である。
その変換を明示。
There was a problem hiding this comment.
Santarh
commented
May 7, 2021
| @@ -38,7 +38,7 @@ static void Export_Color(Material m, TextureExporter textureManager, glTFMateria | |||
| { | |||
| if (m.HasProperty("_Color")) | |||
| { | |||
| material.pbrMetallicRoughness.baseColorFactor = m.color.linear.ToArray(); | |||
| material.pbrMetallicRoughness.baseColorFactor = m.GetColor("_Color").ToFloat4(ColorSpace.sRGB, ColorSpace.Linear); | |||
Santarh
commented
May 7, 2021
| @@ -160,7 +161,8 @@ public static glTF_VRM_Material CreateFromMaterial(Material m, TextureExporter t | |||
| { | |||
| case ShaderPropertyType.Color: | |||
| { | |||
| var value = m.GetColor(kv.Key).ToArray(); | |||
| // No color conversion. Because color property is serialized to raw float array. | |||
| var value = m.GetColor(kv.Key).ToFloat4(ColorSpace.Linear, ColorSpace.Linear); | |||
Santarh
commented
May 7, 2021
| @@ -23,14 +24,14 @@ public override glTFMaterial ExportMaterial(Material m, TextureExporter textureE | |||
|
|
|||
| pbrMetallicRoughness = new glTFPbrMetallicRoughness | |||
| { | |||
| baseColorFactor = def.Color.LitColor.ToArray(), | |||
| baseColorFactor = def.Color.LitColor.ToFloat4(ColorSpace.sRGB, ColorSpace.Linear), | |||
Santarh
commented
May 7, 2021
| material.SetColor(MToon.Utils.PropColor, m.pbrMetallicRoughness.baseColorFactor.ToColor4()); | ||
| if (mtoon.ShadeColorFactor != null) material.SetColor(MToon.Utils.PropShadeColor, mtoon.ShadeColorFactor.ToColor3()); | ||
| material.SetColor(MToon.Utils.PropColor, m.pbrMetallicRoughness.baseColorFactor | ||
| .ToColor4(UniGLTF.ColorSpace.Linear, UniGLTF.ColorSpace.sRGB) |
Santarh
commented
May 7, 2021
| @@ -315,7 +305,7 @@ public static void Migrate(glTF gltf, JsonNode json) | |||
| var dst = new VRMC_materials_mtoon(); | |||
|
|
|||
| // Color | |||
| gltfMaterial.pbrMetallicRoughness.baseColorFactor = mtoon.Definition.Color.LitColor.ToFloat4(); | |||
| gltfMaterial.pbrMetallicRoughness.baseColorFactor = mtoon.Definition.Color.LitColor.ToFloat4(ColorSpace.sRGB, ColorSpace.Linear); | |||
There was a problem hiding this comment.
Migrate VRM0.x to VRM10
ousttrue
reviewed
May 7, 2021
| } | ||
|
|
||
| private static Color ConvertColorSpace(this Color srcColor, ColorSpace srcColorSpace, ColorSpace dstColorSpace) | ||
| { |
ousttrue
approved these changes
May 7, 2021
| var color = src.pbrMetallicRoughness.baseColorFactor; | ||
| param.Colors.Add("_Color", (new Color(color[0], color[1], color[2], color[3])).gamma); | ||
| param.Colors.Add("_Color", | ||
| src.pbrMetallicRoughness.baseColorFactor.ToColor4(ColorSpace.Linear, ColorSpace.sRGB) |
There was a problem hiding this comment.
| @@ -153,7 +152,9 @@ public static bool TryCreateParam(GltfParser parser, int i, out MaterialImportPa | |||
|
|
|||
| if (src.emissiveFactor != null && src.emissiveFactor.Length == 3) | |||
| { | |||
There was a problem hiding this comment.
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.
float[]とUnityEngine.Color間の変換において色空間を明示しないと変換できないようにした。