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

Now licenseName field in meta is required

Browse Source
This commit is contained in:
yutopp 2019-02-01 18:36:01 +09:00
parent 4d94ca9751
commit 82c6dcf119
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/VRM/UniVRM/Editor/Tests/UniVRMSerializeTests.cs
View File

@ -237,10 +237,13 @@ namespace VRM
[Test]
public void MetaTest()
{
var model = new glTF_VRM_Meta();
var model = new glTF_VRM_Meta()
{
licenseName = "CC0",
};
var json = model.ToJson();
Assert.AreEqual(@"{""texture"":-1}", json);
var json = model.ToJson();
Assert.AreEqual(@"{""texture"":-1,""licenseName"":""CC0""}", json);
Debug.Log(json);
var c = new JsonSchemaValidationContext("")
@ -249,7 +252,22 @@ namespace VRM
};
var json2 = JsonSchema.FromType<glTF_VRM_Meta>().Serialize(model, c);
// NOTE: New serializer outputs values which will not be used...
Assert.AreEqual(@"{}",json2);
Assert.AreEqual(@"{""licenseName"":""CC0""}",json2);
}
[Test]
public void MetaTestError()
{
var model = new glTF_VRM_Meta();
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_Meta>().Serialize(model, c)
);
Assert.AreEqual("[licenseName.String] null", ex.Message);
}
// TODO: Move to another suitable location

2
Assets/VRM/UniVRM/Scripts/Format/glTF_VRM_Meta.cs
View File

@ -118,7 +118,7 @@ namespace VRM
#endregion
#region Distribution License
[JsonSchema(Description = "License type", EnumValues = new object[]
[JsonSchema(Required = true, Description = "License type", EnumValues = new object[]
{
"Redistribution_Prohibited",
"CC0",