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

otherPermissionUrl と otherLiceneseUrl の両方が有効で内容が異なる場合はマイグレーションできない

Browse Source
This commit is contained in:
ousttrue
2021-04-27 14:39:15 +09:00
parent 06559cf188
commit 8457f06ebb
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Assets/VRM10/Runtime/Migration/MigrationVrmMeta.cs
View File

@@ -41,6 +41,9 @@ namespace UniVRM10
Modification = UniGLTF.Extensions.VRMC_vrm.ModificationType.prohibited,
};
string otherLicenseUrl = default;
string otherPermissionUrl = default;
foreach (var kv in vrm0.ObjectItems())
{
var key = kv.Key.GetString();
@@ -124,18 +127,8 @@ namespace UniVRM10
}
break;
case "otherPermissionUrl":
{
// TODO
// var url = kv.Value.GetString();
// if (!String.IsNullOrWhiteSpace(url))
// {
// throw new NotImplementedException("otherPermissionUrl not allowd");
// }
}
break;
case "otherLicenseUrl": meta.OtherLicenseUrl = kv.Value.GetString(); break;
case "otherPermissionUrl": otherPermissionUrl = kv.Value.GetString(); break;
case "otherLicenseUrl": otherLicenseUrl = kv.Value.GetString(); break;
case "licenseName":
{
@@ -146,7 +139,38 @@ namespace UniVRM10
default:
throw new NotImplementedException(key);
} // switch
} // foreach
//
// OtherLicenseUrl migrate
// OtherPermissionURL removed
//
if (!string.IsNullOrEmpty(otherLicenseUrl) && !string.IsNullOrEmpty(otherPermissionUrl))
{
if (otherLicenseUrl == otherPermissionUrl)
{
// OK
meta.OtherLicenseUrl = otherLicenseUrl;
}
else
{
// different otherLicenseUrl & otherPermissionUrl
throw new MigrationException("otherPermissionUrl", "can not migrate");
}
}
else if (!string.IsNullOrEmpty(otherLicenseUrl))
{
meta.OtherLicenseUrl = otherLicenseUrl;
}
else if (!string.IsNullOrEmpty(otherPermissionUrl))
{
// otherPermissionUrl => otherLicenseUrl
meta.OtherLicenseUrl = otherPermissionUrl;
}
else
{
// null
}
return meta;