Merge pull request #339 from hiroj/fix_export_colorSpace

fix baseColorFactor color space.
vrm-c · Dec 12, 2019 · 9de04a3 · 9de04a3
2 parents 3697dd5 + 04c69a1
commit 9de04a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Assets/VRM/UniGLTF/Scripts/IO/MaterialExporter.cs b/Assets/VRM/UniGLTF/Scripts/IO/MaterialExporter.cs
@@ -40,7 +40,7 @@ static void Export_Color(Material m, TextureExportManager textureManager, glTFMa
         {
             if (m.HasProperty("_Color"))
             {
-                material.pbrMetallicRoughness.baseColorFactor = m.color.ToArray();
+                material.pbrMetallicRoughness.baseColorFactor = m.color.linear.ToArray();
             }
 
             if (m.HasProperty("_MainTex"))

diff --git a/Assets/VRM/UniGLTF/Scripts/IO/MaterialImporter.cs b/Assets/VRM/UniGLTF/Scripts/IO/MaterialImporter.cs
@@ -102,7 +102,7 @@ public virtual Material CreateMaterial(int i, glTFMaterial x)
                 if (x.pbrMetallicRoughness.baseColorFactor != null && x.pbrMetallicRoughness.baseColorFactor.Length == 4)
                 {
                     var color = x.pbrMetallicRoughness.baseColorFactor;
-                    material.color = new Color(color[0], color[1], color[2], color[3]);
+                    material.color = (new Color(color[0], color[1], color[2], color[3])).gamma;
                 }
 
                 //renderMode
@@ -145,7 +145,7 @@ public virtual Material CreateMaterial(int i, glTFMaterial x)
                 if (x.pbrMetallicRoughness.baseColorFactor != null && x.pbrMetallicRoughness.baseColorFactor.Length == 4)
                 {
                     var color = x.pbrMetallicRoughness.baseColorFactor;
-                    material.color = new Color(color[0], color[1], color[2], color[3]);
+                    material.color = (new Color(color[0], color[1], color[2], color[3])).gamma;
                 }
 
                 if (x.pbrMetallicRoughness.baseColorTexture != null && x.pbrMetallicRoughness.baseColorTexture.index != -1)