Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-14 06:19:47 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1926 from Santarh/migrationFlagAdd

Browse Source 
Migrate baseColorFactor of older VRM files
This commit is contained in:
ousttrue 2022-11-16 19:07:36 +09:00 committed by GitHub
commit 3fc8d074ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs
View File

@ -82,12 +82,10 @@ namespace UniGLTF
}
}
if (src.pbrMetallicRoughness.baseColorFactor != null &&
src.pbrMetallicRoughness.baseColorFactor.Length == 4)
var baseColorFactor = GltfMaterialImportUtils.ImportLinearBaseColorFactor(data, src);
if (baseColorFactor.HasValue)
{
colors.Add("_Color",
src.pbrMetallicRoughness.baseColorFactor.ToColor4(ColorSpace.Linear, ColorSpace.sRGB)
);
colors.Add("_Color", baseColorFactor.Value.gamma);
}
if (src.pbrMetallicRoughness.baseColorTexture != null &&
@ -141,7 +139,7 @@ namespace UniGLTF
material.globalIlluminationFlags &= ~MaterialGlobalIlluminationFlags.EmissiveIsBlack;
});
var emissiveFactor = GltfMaterialImportUtils.ImportLinearEmissiveFactorFromMaterial(data, src);
var emissiveFactor = GltfMaterialImportUtils.ImportLinearEmissiveFactor(data, src);
if (emissiveFactor.HasValue)
{
// NOTE: Built-in RP Standard shader's emission color is in gamma color space.

19
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs
View File

@ -26,18 +26,15 @@ namespace UniGLTF
return false;
}
var colors = new Dictionary<string, Color>();
var textureSlots = new Dictionary<string, TextureDescriptor>();
var colors =
src.pbrMetallicRoughness.baseColorFactor != null &&
src.pbrMetallicRoughness.baseColorFactor.Length == 4
? new Dictionary<string, Color>
{
{
"_Color",
src.pbrMetallicRoughness.baseColorFactor.ToColor4(ColorSpace.Linear, ColorSpace.sRGB)
}
}
: new Dictionary<string, Color>();
// color
var baseColorFactor = GltfMaterialImportUtils.ImportLinearBaseColorFactor(data, src);
if (baseColorFactor.HasValue)
{
colors.Add("_Color", baseColorFactor.Value.gamma);
}
// texture
if (src.pbrMetallicRoughness.baseColorTexture != null)

18
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs
View File

@ -14,7 +14,23 @@ namespace UniGLTF
return $"material_{index:00}";
}
public static Color? ImportLinearEmissiveFactorFromMaterial(GltfData data, glTFMaterial src)
public static Color? ImportLinearBaseColorFactor(GltfData data, glTFMaterial src)
{
if (src.pbrMetallicRoughness == null) return null;
var baseColorFactor = src.pbrMetallicRoughness.baseColorFactor;
if (baseColorFactor == null || baseColorFactor.Length != 4) return null;
if (data.MigrationFlags.IsBaseColorFactorGamma)
{
return baseColorFactor.ToColor4(ColorSpace.sRGB, ColorSpace.Linear);
}
else
{
return baseColorFactor.ToColor4(ColorSpace.Linear, ColorSpace.Linear);
}
}
public static Color? ImportLinearEmissiveFactor(GltfData data, glTFMaterial src)
{
if (src.emissiveFactor == null || src.emissiveFactor.Length != 3) return null;

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs
View File

@ -117,7 +117,7 @@ namespace UniGLTF
material.globalIlluminationFlags &= ~MaterialGlobalIlluminationFlags.EmissiveIsBlack;
});
var emissiveFactor = GltfMaterialImportUtils.ImportLinearEmissiveFactorFromMaterial(data, src);
var emissiveFactor = GltfMaterialImportUtils.ImportLinearEmissiveFactor(data, src);
if (emissiveFactor.HasValue)
{
colors.Add("_EmissionColor", emissiveFactor.Value);

8
Assets/UniGLTF/Runtime/UniGLTF/IO/MigrationFlags.cs
View File

@ -2,13 +2,21 @@
{
public sealed class MigrationFlags
{
/// <summary>
/// Before UniGLTF v0.54.0, Built-in RP Standard shader and Unlit shaders' albedo color is exported in gamma color space.
/// https://github.com/vrm-c/UniVRM/pull/339
/// </summary>
public bool IsBaseColorFactorGamma { get; set; }
/// <summary>
/// Before UniGLTF v0.69, roughness value in the texture was invalid squared value.
/// https://github.com/vrm-c/UniVRM/pull/780
/// </summary>
public bool IsRoughnessTextureValueSquared { get; set; } = false;
/// <summary>
/// Before UniGLTF v0.107.0, Built-in RP Standard shader's emission color is exported in gamma color space.
/// https://github.com/vrm-c/UniVRM/pull/1909
/// </summary>
public bool IsEmissiveFactorGamma { get; set; } = false;
}

11
Assets/VRM/Runtime/IO/VRMData.cs
View File

@ -24,6 +24,17 @@ namespace VRM
{
if (!VRMVersion.ParseVersion(exportedVrmVersionString, out var exportedVrmVersion)) return;
migrationFlags.IsBaseColorFactorGamma = VRMVersion.IsNewer(
new VRMVersion.Version
{
Major = 0,
Minor = 54,
Patch = 0,
Pre = "",
},
exportedVrmVersion
);
migrationFlags.IsRoughnessTextureValueSquared = VRMVersion.IsNewer(
new VRMVersion.Version
{