diff --git a/Scripts/Format/glTF_VRM_BlendShape.cs b/Scripts/Format/glTF_VRM_BlendShape.cs index f906ed5d4..f6d3331a3 100644 --- a/Scripts/Format/glTF_VRM_BlendShape.cs +++ b/Scripts/Format/glTF_VRM_BlendShape.cs @@ -8,7 +8,7 @@ using UniJSON; namespace VRM { [Serializable] - [JsonSchema(Title = "vrm.materialbind")] + [JsonSchema(Title = "vrm.blendshape.materialbind")] public class glTF_VRM_MaterialValueBind : UniGLTF.JsonSerializableBase { public string materialName; @@ -24,7 +24,7 @@ namespace VRM } [Serializable] - [JsonSchema(Title = "vrm.blendshapebind")] + [JsonSchema(Title = "vrm.blendshape.bind")] public class glTF_VRM_BlendShapeBind : UniGLTF.JsonSerializableBase { public int mesh = -1; @@ -85,7 +85,7 @@ namespace VRM } [Serializable] - [JsonSchema(Title = "vrm.blendshapegroup", Description = "BlendShapeClip of UniVRM")] + [JsonSchema(Title = "vrm.blendshape.group", Description = "BlendShapeClip of UniVRM")] public class glTF_VRM_BlendShapeGroup : UniGLTF.JsonSerializableBase { [JsonSchema(Description = "Expression name")] @@ -128,7 +128,7 @@ namespace VRM } [Serializable] - [JsonSchema(Title = "vrm.blendshapemaster", Description = "BlendShapeAvatar of UniVRM")] + [JsonSchema(Title = "vrm.blendshape", Description = "BlendShapeAvatar of UniVRM")] public class glTF_VRM_BlendShapeMaster : UniGLTF.JsonSerializableBase { public List blendShapeGroups = new List(); diff --git a/Scripts/Format/glTF_VRM_FirstPerson.cs b/Scripts/Format/glTF_VRM_FirstPerson.cs index 0b6218366..620ccdcce 100644 --- a/Scripts/Format/glTF_VRM_FirstPerson.cs +++ b/Scripts/Format/glTF_VRM_FirstPerson.cs @@ -8,7 +8,7 @@ using UniJSON; namespace VRM { [Serializable] - [JsonSchema(Title = "vrm.degreemap")] + [JsonSchema(Title = "vrm.firstperson.degreemap")] public class glTF_VRM_DegreeMap : UniGLTF.JsonSerializableBase { [JsonSchema(Description = "None linear mapping params. time, value, inTangent, outTangent")] @@ -47,6 +47,7 @@ namespace VRM } [Serializable] + [JsonSchema(Title = "vrm.firstperson.meshannotation")] public class glTF_VRM_MeshAnnotation : JsonSerializableBase { public int mesh; diff --git a/Scripts/Format/glTF_VRM_Humanoid.cs b/Scripts/Format/glTF_VRM_Humanoid.cs index 2032ad336..78a545873 100644 --- a/Scripts/Format/glTF_VRM_Humanoid.cs +++ b/Scripts/Format/glTF_VRM_Humanoid.cs @@ -89,7 +89,7 @@ namespace VRM } [Serializable] - [JsonSchema(Title = "vrm.humanoidbone")] + [JsonSchema(Title = "vrm.humanoid.bone")] public class glTF_VRM_HumanoidBone : JsonSerializableBase { [JsonSchema(Description = "Human bone name.", EnumValues = new object[] { diff --git a/specification/0.0/schema/vrm.blendshapebind.schema.json b/specification/0.0/schema/vrm.blendshape.bind.schema.json similarity index 86% rename from specification/0.0/schema/vrm.blendshapebind.schema.json rename to specification/0.0/schema/vrm.blendshape.bind.schema.json index cd20f9cf4..639e46bac 100644 --- a/specification/0.0/schema/vrm.blendshapebind.schema.json +++ b/specification/0.0/schema/vrm.blendshape.bind.schema.json @@ -1,5 +1,5 @@ { - "title": "vrm.blendshapebind", + "title": "vrm.blendshape.bind", "type": "object", "properties": { "mesh": { diff --git a/specification/0.0/schema/vrm.blendshapemaster.schema.json.meta b/specification/0.0/schema/vrm.blendshape.bind.schema.json.meta similarity index 64% rename from specification/0.0/schema/vrm.blendshapemaster.schema.json.meta rename to specification/0.0/schema/vrm.blendshape.bind.schema.json.meta index f42c56bac..0d0389352 100644 --- a/specification/0.0/schema/vrm.blendshapemaster.schema.json.meta +++ b/specification/0.0/schema/vrm.blendshape.bind.schema.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7d7e602351f4ab24eaad71cc5d8f6945 -timeCreated: 1534850992 +guid: b2da3d63aa3b59c408d10d28110b14bc +timeCreated: 1534915424 licenseType: Free TextScriptImporter: userData: diff --git a/specification/0.0/schema/vrm.blendshapegroup.schema.json b/specification/0.0/schema/vrm.blendshape.group.schema.json similarity index 82% rename from specification/0.0/schema/vrm.blendshapegroup.schema.json rename to specification/0.0/schema/vrm.blendshape.group.schema.json index 40a41b060..729cb8ee5 100644 --- a/specification/0.0/schema/vrm.blendshapegroup.schema.json +++ b/specification/0.0/schema/vrm.blendshape.group.schema.json @@ -1,5 +1,5 @@ { - "title": "vrm.blendshapegroup", + "title": "vrm.blendshape.group", "type": "object", "properties": { "name": { @@ -15,14 +15,14 @@ "description": "Low level blendshape references.", "type": "array", "items": { - "$ref": "vrm.blendshapebind.schema.json" + "$ref": "vrm.blendshape.bind.schema.json" } }, "materialValues": { "description": "Material animation references.", "type": "array", "items": { - "$ref": "vrm.materialbind.schema.json" + "$ref": "vrm.blendshape.materialbind.schema.json" } } } diff --git a/specification/0.0/schema/vrm.degreemap.schema.json.meta b/specification/0.0/schema/vrm.blendshape.group.schema.json.meta similarity index 64% rename from specification/0.0/schema/vrm.degreemap.schema.json.meta rename to specification/0.0/schema/vrm.blendshape.group.schema.json.meta index 53e0ec983..d3f587930 100644 --- a/specification/0.0/schema/vrm.degreemap.schema.json.meta +++ b/specification/0.0/schema/vrm.blendshape.group.schema.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7539ff50c232c5d469ec72bb3e0b05e6 -timeCreated: 1534859666 +guid: 5aed45e7198eecd48b57665cff2b2215 +timeCreated: 1534915424 licenseType: Free TextScriptImporter: userData: diff --git a/specification/0.0/schema/vrm.materialbind.schema.json b/specification/0.0/schema/vrm.blendshape.materialbind.schema.json similarity index 87% rename from specification/0.0/schema/vrm.materialbind.schema.json rename to specification/0.0/schema/vrm.blendshape.materialbind.schema.json index 89df7257d..2b72d6d88 100644 --- a/specification/0.0/schema/vrm.materialbind.schema.json +++ b/specification/0.0/schema/vrm.blendshape.materialbind.schema.json @@ -1,5 +1,5 @@ { - "title": "vrm.materialbind", + "title": "vrm.blendshape.materialbind", "type": "object", "properties": { "materialName": { diff --git a/specification/0.0/schema/vrm.blendshapegroup.schema.json.meta b/specification/0.0/schema/vrm.blendshape.materialbind.schema.json.meta similarity index 64% rename from specification/0.0/schema/vrm.blendshapegroup.schema.json.meta rename to specification/0.0/schema/vrm.blendshape.materialbind.schema.json.meta index 8d1aa98f3..35bc2a27b 100644 --- a/specification/0.0/schema/vrm.blendshapegroup.schema.json.meta +++ b/specification/0.0/schema/vrm.blendshape.materialbind.schema.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: da54af2780f620241a8cb8dac933fa15 -timeCreated: 1534861231 +guid: b4be71a369e363e40ade2080e715d935 +timeCreated: 1534915424 licenseType: Free TextScriptImporter: userData: diff --git a/specification/0.0/schema/vrm.blendshapemaster.schema.json b/specification/0.0/schema/vrm.blendshape.schema.json similarity index 62% rename from specification/0.0/schema/vrm.blendshapemaster.schema.json rename to specification/0.0/schema/vrm.blendshape.schema.json index 95c08cf62..123a53d68 100644 --- a/specification/0.0/schema/vrm.blendshapemaster.schema.json +++ b/specification/0.0/schema/vrm.blendshape.schema.json @@ -1,11 +1,11 @@ { - "title": "vrm.blendshapemaster", + "title": "vrm.blendshape", "type": "object", "properties": { "blendShapeGroups": { "type": "array", "items": { - "$ref": "vrm.blendshapegroup.schema.json" + "$ref": "vrm.blendshape.group.schema.json" } } } diff --git a/specification/0.0/schema/vrm.humanoidbone.schema.json.meta b/specification/0.0/schema/vrm.blendshape.schema.json.meta similarity index 64% rename from specification/0.0/schema/vrm.humanoidbone.schema.json.meta rename to specification/0.0/schema/vrm.blendshape.schema.json.meta index 707fb5d39..1141ffcbe 100644 --- a/specification/0.0/schema/vrm.humanoidbone.schema.json.meta +++ b/specification/0.0/schema/vrm.blendshape.schema.json.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 00a1e5901b4fb3a468ea24d05ff77855 -timeCreated: 1534861231 +guid: f11c63275ed687e4dbe1585a5d9e8dbf +timeCreated: 1534915424 licenseType: Free TextScriptImporter: userData: diff --git a/specification/0.0/schema/vrm.degreemap.schema.json b/specification/0.0/schema/vrm.firstperson.degreemap.schema.json similarity index 93% rename from specification/0.0/schema/vrm.degreemap.schema.json rename to specification/0.0/schema/vrm.firstperson.degreemap.schema.json index 2ea0f7167..63b90998e 100644 --- a/specification/0.0/schema/vrm.degreemap.schema.json +++ b/specification/0.0/schema/vrm.firstperson.degreemap.schema.json @@ -1,5 +1,5 @@ { - "title": "vrm.degreemap", + "title": "vrm.firstperson.degreemap", "description": "Eye controller setting.", "type": "object", "properties": { diff --git a/specification/0.0/schema/vrm.firstperson.degreemap.schema.json.meta b/specification/0.0/schema/vrm.firstperson.degreemap.schema.json.meta new file mode 100644 index 000000000..a957f9d63 --- /dev/null +++ b/specification/0.0/schema/vrm.firstperson.degreemap.schema.json.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b29f5977b30e7cc438ee1cfea74edd6c +timeCreated: 1534915424 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/specification/0.0/schema/vrm.firstperson.meshannotation.schema.json b/specification/0.0/schema/vrm.firstperson.meshannotation.schema.json new file mode 100644 index 000000000..2e31d70a9 --- /dev/null +++ b/specification/0.0/schema/vrm.firstperson.meshannotation.schema.json @@ -0,0 +1,12 @@ +{ + "title": "vrm.firstperson.meshannotation", + "type": "object", + "properties": { + "mesh": { + "type": "integer" + }, + "firstPersonFlag": { + "type": "string" + } + } +} \ No newline at end of file diff --git a/specification/0.0/schema/vrm.firstperson.meshannotation.schema.json.meta b/specification/0.0/schema/vrm.firstperson.meshannotation.schema.json.meta new file mode 100644 index 000000000..860b06e9b --- /dev/null +++ b/specification/0.0/schema/vrm.firstperson.meshannotation.schema.json.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f99b8fd1e3320e4fac4f67ab093452c +timeCreated: 1534915424 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/specification/0.0/schema/vrm.firstperson.schema.json b/specification/0.0/schema/vrm.firstperson.schema.json index cb0658055..0a324fe43 100644 --- a/specification/0.0/schema/vrm.firstperson.schema.json +++ b/specification/0.0/schema/vrm.firstperson.schema.json @@ -14,15 +14,7 @@ "description": "Switch on \/ off mesh for display in first-person view, third-person view, or the others.", "type": "array", "items": { - "type": "object", - "properties": { - "mesh": { - "type": "integer" - }, - "firstPersonFlag": { - "type": "string" - } - } + "$ref": "vrm.firstperson.meshannotation.schema.json" } }, "lookAtTypeName": { @@ -31,16 +23,16 @@ "enum": ["Bone","BlendShape"] }, "lookAtHorizontalInner": { - "$ref": "vrm.degreemap.schema.json" + "$ref": "vrm.firstperson.degreemap.schema.json" }, "lookAtHorizontalOuter": { - "$ref": "vrm.degreemap.schema.json" + "$ref": "vrm.firstperson.degreemap.schema.json" }, "lookAtVerticalDown": { - "$ref": "vrm.degreemap.schema.json" + "$ref": "vrm.firstperson.degreemap.schema.json" }, "lookAtVerticalUp": { - "$ref": "vrm.degreemap.schema.json" + "$ref": "vrm.firstperson.degreemap.schema.json" } } } \ No newline at end of file diff --git a/specification/0.0/schema/vrm.humanoidbone.schema.json b/specification/0.0/schema/vrm.humanoid.bone.schema.json similarity index 98% rename from specification/0.0/schema/vrm.humanoidbone.schema.json rename to specification/0.0/schema/vrm.humanoid.bone.schema.json index abcdf212c..3e4853de8 100644 --- a/specification/0.0/schema/vrm.humanoidbone.schema.json +++ b/specification/0.0/schema/vrm.humanoid.bone.schema.json @@ -1,5 +1,5 @@ { - "title": "vrm.humanoidbone", + "title": "vrm.humanoid.bone", "type": "object", "properties": { "bone": { diff --git a/specification/0.0/schema/vrm.humanoid.bone.schema.json.meta b/specification/0.0/schema/vrm.humanoid.bone.schema.json.meta new file mode 100644 index 000000000..20bfa80c2 --- /dev/null +++ b/specification/0.0/schema/vrm.humanoid.bone.schema.json.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0058c092f212dd4ca7b9fc313beff40 +timeCreated: 1534915424 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/specification/0.0/schema/vrm.humanoid.schema.json b/specification/0.0/schema/vrm.humanoid.schema.json index d9dbc8055..ed7a8ecfd 100644 --- a/specification/0.0/schema/vrm.humanoid.schema.json +++ b/specification/0.0/schema/vrm.humanoid.schema.json @@ -5,7 +5,7 @@ "humanBones": { "type": "array", "items": { - "$ref": "vrm.humanoidbone.schema.json" + "$ref": "vrm.humanoid.bone.schema.json" } }, "armStretch": { diff --git a/specification/0.0/schema/vrm.schema.json b/specification/0.0/schema/vrm.schema.json index 595bf50e6..c203c516f 100644 --- a/specification/0.0/schema/vrm.schema.json +++ b/specification/0.0/schema/vrm.schema.json @@ -17,7 +17,7 @@ "$ref": "vrm.firstperson.schema.json" }, "blendShapeMaster": { - "$ref": "vrm.blendshapemaster.schema.json" + "$ref": "vrm.blendshape.schema.json" }, "secondaryAnimation": { "$ref": "vrm.secondaryanimation.schema.json"