diff --git a/Assets/VRM/UniVRM/Editor/Tests/UniVRMSerializeTests.cs b/Assets/VRM/UniVRM/Editor/Tests/UniVRMSerializeTests.cs index e74cc5846..8fba75208 100644 --- a/Assets/VRM/UniVRM/Editor/Tests/UniVRMSerializeTests.cs +++ b/Assets/VRM/UniVRM/Editor/Tests/UniVRMSerializeTests.cs @@ -635,7 +635,7 @@ namespace VRM EnableDiagnosisForNotRequiredFields = true, }; var json2 = JsonSchema.FromType().Serialize(model, c); - Assert.AreEqual(@"{""exporterVersion"":""UniVRM-0.50"",""schemaVersion"":""0.0""}",json2); + Assert.AreEqual(@"{""exporterVersion"":""UniVRM-0.50"",""specVersion"":""0.0""}",json2); } // TODO: Move to another suitable location diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMFormat.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMFormat.cs index 741be3cca..501328e15 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMFormat.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMFormat.cs @@ -37,8 +37,8 @@ VRM extension is for 3d humanoid avatars (and models) in VR applications. [JsonSchema(Description = @"Version of exporter that vrm created. " + VRMVersion.VRM_VERSION)] public string exporterVersion = "UniVRM-" + VRMVersion.VERSION; - [JsonSchema(Description = @"Version of JSON Schema for VRM")] - public string schemaVersion = VRMSchemaVersion.Version; + [JsonSchema(Description = @"The VRM specification version that this extension uses")] + public string specVersion = VRMSpecVersion.Version; public glTF_VRM_Meta meta = new glTF_VRM_Meta(); public glTF_VRM_Humanoid humanoid = new glTF_VRM_Humanoid(); @@ -50,7 +50,7 @@ VRM extension is for 3d humanoid avatars (and models) in VR applications. protected override void SerializeMembers(GLTFJsonFormatter f) { f.KeyValue(() => exporterVersion); - f.KeyValue(() => schemaVersion); + f.KeyValue(() => specVersion); f.Key("meta"); f.GLTFValue(meta); f.Key("humanoid"); f.GLTFValue(humanoid); f.Key("firstPerson"); f.GLTFValue(firstPerson); diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMSchemaVersion.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMSpecVersion.cs similarity index 89% rename from Assets/VRM/UniVRM/Scripts/Format/VRMSchemaVersion.cs rename to Assets/VRM/UniVRM/Scripts/Format/VRMSpecVersion.cs index fab0d2e22..98ece65e7 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMSchemaVersion.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMSpecVersion.cs @@ -2,7 +2,7 @@ using System; namespace VRM { - public class VRMSchemaVersion + public class VRMSpecVersion { public const int Major = 0; public const int Minor = 0; diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMSchemaVersion.cs.meta b/Assets/VRM/UniVRM/Scripts/Format/VRMSpecVersion.cs.meta similarity index 100% rename from Assets/VRM/UniVRM/Scripts/Format/VRMSchemaVersion.cs.meta rename to Assets/VRM/UniVRM/Scripts/Format/VRMSpecVersion.cs.meta