Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-22 02:24:57 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1824 from Santarh/migrationMatcap

Browse Source 
Fix migration behaviour of matcap.
This commit is contained in:
ousttrue
2022-09-26 18:06:02 +09:00
committed by GitHub
parent 93671a6898 7c9919ef47
commit ef7c819d36
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/VRM10/Runtime/Migration/Materials/MigrationMToonMaterial.cs
View File

@@ -254,12 +254,17 @@ namespace UniVRM10
// Rim Lighting
if (mtoon.TextureIndexMap.SphereAdd.HasValue)
{
// Matcap behaviour will change in VRM 1.0.
// NOTE: MatCap behaviour will change in VRM 1.0.
// Texture transform is not required.
dst.MatcapTexture = new TextureInfo
{
Index = mtoon.TextureIndexMap.SphereAdd.Value
};
// Texture transform is not required.
dst.MatcapFactor = new [] { 1f, 1f, 1f };
}
else
{
dst.MatcapFactor = new[] { 0f, 0f, 0f };
}
dst.ParametricRimColorFactor = mtoon.Definition.Rim.RimColor.ToFloat3(ColorSpace.sRGB, ColorSpace.Linear);
dst.ParametricRimFresnelPowerFactor = mtoon.Definition.Rim.RimFresnelPowerValue;
@@ -279,7 +284,10 @@ namespace UniVRM10
);
}
}
dst.RimLightingMixFactor = mtoon.Definition.Rim.RimLightingMixValue;
// NOTE: DESTRUCTIVE MIGRATION
// Rim Lighting behaviour will be merged with MatCap in VRM 1.0.
// So, RimLightingMixFactor set to 1.0, because it is safe appearance.
dst.RimLightingMixFactor = 1.0f;
// Outline
const float centimeterToMeter = 0.01f;