diff --git a/Scripts/Format/glTF_VRM_BlendShape.cs b/Scripts/Format/glTF_VRM_BlendShape.cs index 7338872c2..3dff1e1d2 100644 --- a/Scripts/Format/glTF_VRM_BlendShape.cs +++ b/Scripts/Format/glTF_VRM_BlendShape.cs @@ -27,8 +27,13 @@ namespace VRM [JsonSchema(Title = "vrm.blendshape.bind")] public class glTF_VRM_BlendShapeBind : UniGLTF.JsonSerializableBase { + [JsonSchema(Required = true, Minimum = 0)] public int mesh = -1; + + [JsonSchema(Required = true, Minimum = 0)] public int index = -1; + + [JsonSchema(Required =true, Minimum = 0, Maximum = 100, Description = @"SkinnedMeshRenderer.SetBlendShapeWeight")] public float weight = 0; protected override void SerializeMembers(GLTFJsonFormatter f) diff --git a/UniGLTF b/UniGLTF index 71188cbb8..94a186fd6 160000 --- a/UniGLTF +++ b/UniGLTF @@ -1 +1 @@ -Subproject commit 71188cbb88eced710c7c1c550bbde09d756ecc3a +Subproject commit 94a186fd656ddac63363751cb3e7e9f6fe8d647b diff --git a/specification/0.0/schema/vrm.blendshape.bind.schema.json b/specification/0.0/schema/vrm.blendshape.bind.schema.json index 2a3032957..d5a8525a8 100644 --- a/specification/0.0/schema/vrm.blendshape.bind.schema.json +++ b/specification/0.0/schema/vrm.blendshape.bind.schema.json @@ -3,13 +3,18 @@ "type": "object", "properties": { "mesh": { - "type": "integer" + "type": "integer", + "minimum": 0 }, "index": { - "type": "integer" + "type": "integer", + "minimum": 0 }, "weight": { - "type": "number" + "description": "SkinnedMeshRenderer.SetBlendShapeWeight", + "type": "number", + "minimum": 0, + "maximum": 100 } } } \ No newline at end of file diff --git a/specification/0.0/schema/vrm.blendshape.group.schema.json b/specification/0.0/schema/vrm.blendshape.group.schema.json index d90f6a252..c864cc61d 100644 --- a/specification/0.0/schema/vrm.blendshape.group.schema.json +++ b/specification/0.0/schema/vrm.blendshape.group.schema.json @@ -24,6 +24,10 @@ "items": { "$ref": "vrm.blendshape.materialbind.schema.json" } + }, + "isBinary": { + "description": "0 or 1. Do not allow an intermediate value. Value should rounded", + "type": "boolean" } } } \ No newline at end of file diff --git a/specification/0.0/schema/vrm.firstperson.schema.json b/specification/0.0/schema/vrm.firstperson.schema.json index 97823801f..ec8a488b4 100644 --- a/specification/0.0/schema/vrm.firstperson.schema.json +++ b/specification/0.0/schema/vrm.firstperson.schema.json @@ -3,7 +3,7 @@ "type": "object", "properties": { "firstPersonBone": { - "description": "Specify a bone whose rendering mode should be switched in first-person view. Usually Head is specified.", + "description": "The bone whose rendering should be turned off in first-person view. Usually Head is specified.", "type": "integer" }, "firstPersonBoneOffset": { diff --git a/specification/0.0/schema/vrm.schema.json b/specification/0.0/schema/vrm.schema.json index 04c130288..b53185634 100644 --- a/specification/0.0/schema/vrm.schema.json +++ b/specification/0.0/schema/vrm.schema.json @@ -4,7 +4,7 @@ "type": "object", "properties": { "exporterVersion": { - "description": "Version of exporter that vrm created. UniVRM-0.44", + "description": "Version of exporter that vrm created. UniVRM-0.46", "type": "string" }, "meta": {