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

Now commercialUssageName field in meta is required

Browse Source
This commit is contained in:
yutopp
2019-02-01 19:09:07 +09:00
parent 0eb67ada22
commit 321dd7ffb2
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,11 +242,12 @@ namespace VRM
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
var json = model.ToJson();
Assert.AreEqual(@"{""texture"":-1,""allowedUserName"":""OnlyAuthor"",""violentUssageName"":""Disallow"",""sexualUssageName"":""Disallow"",""licenseName"":""CC0""}", json);
Assert.AreEqual(@"{""texture"":-1,""allowedUserName"":""OnlyAuthor"",""violentUssageName"":""Disallow"",""sexualUssageName"":""Disallow"",""commercialUssageName"":""Disallow"",""licenseName"":""CC0""}", json);
Debug.Log(json);
var c = new JsonSchemaValidationContext("")
@@ -255,7 +256,7 @@ namespace VRM
};
var json2 = JsonSchema.FromType<glTF_VRM_Meta>().Serialize(model, c);
// NOTE: New serializer outputs values which will not be used...
Assert.AreEqual(@"{""allowedUserName"":""OnlyAuthor"",""violentUssageName"":""Disallow"",""sexualUssageName"":""Disallow"",""licenseName"":""CC0""}",json2);
Assert.AreEqual(@"{""allowedUserName"":""OnlyAuthor"",""violentUssageName"":""Disallow"",""sexualUssageName"":""Disallow"",""commercialUssageName"":""Disallow"",""licenseName"":""CC0""}",json2);
}
[Test]
@@ -280,6 +281,7 @@ namespace VRM
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
//licenseName = "CC0",
};
@@ -299,6 +301,7 @@ namespace VRM
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "_INVALID_SOME_THING_",
};
@@ -318,6 +321,7 @@ namespace VRM
// allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
@@ -337,6 +341,7 @@ namespace VRM
allowedUserName = "_INVALID_SOME_THING_",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
@@ -356,6 +361,7 @@ namespace VRM
allowedUserName = "OnlyAuthor",
//violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
@@ -375,6 +381,7 @@ namespace VRM
allowedUserName = "OnlyAuthor",
violentUssageName = "_INVALID_SOME_THING_",
sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
@@ -394,6 +401,7 @@ namespace VRM
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
//sexualUssageName = "Disallow",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
@@ -413,6 +421,7 @@ namespace VRM
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "_INVALID_SOME_THING_",
commercialUssageName = "Disallow",
licenseName = "CC0",
};
@@ -425,6 +434,46 @@ namespace VRM
);
Assert.AreEqual("[sexualUssageName.String] _INVALID_SOME_THING_ is not valid enum", ex.Message);
}
{
var model = new glTF_VRM_Meta()
{
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
//commercialUssageName = "Disallow",
licenseName = "CC0",
};
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_Meta>().Serialize(model, c)
);
Assert.AreEqual("[commercialUssageName.String] null", ex.Message);
}
{
var model = new glTF_VRM_Meta()
{
allowedUserName = "OnlyAuthor",
violentUssageName = "Disallow",
sexualUssageName = "Disallow",
commercialUssageName = "_INVALID_SOME_THING_",
licenseName = "CC0",
};
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_Meta>().Serialize(model, c)
);
Assert.AreEqual("[commercialUssageName.String] _INVALID_SOME_THING_ is not valid enum", ex.Message);
}
}
// TODO: Move to another suitable location

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

@@ -101,7 +101,7 @@ namespace VRM
set { sexualUssageName = value.ToString(); }
}
[JsonSchema(Description = "For commercial use", EnumValues = new object[]
[JsonSchema(Required = true, Description = "For commercial use", EnumValues = new object[]
{
"Disallow",
"Allow",