From 67a6f19ccbb72a1859266ed2e37152a2f109452e Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 11 Oct 2018 10:04:55 +0900 Subject: [PATCH] Fixed JsonSchema #44 --- Scripts/Format/glTF_VRM_BlendShape.cs | 35 ++++++++++--------- .../schema/vrm.blendshape.group.schema.json | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Scripts/Format/glTF_VRM_BlendShape.cs b/Scripts/Format/glTF_VRM_BlendShape.cs index f6d3331a3..522051d6a 100644 --- a/Scripts/Format/glTF_VRM_BlendShape.cs +++ b/Scripts/Format/glTF_VRM_BlendShape.cs @@ -92,23 +92,24 @@ namespace VRM public string name; [JsonSchema(Description = "Predefined Expression name", EnumValues =new object[] { - "Neutral", - "A", - "I", - "U", - "E", - "O", - "Blink", - "Joy", - "Angry", - "Sorrow", - "Fun", - "LookUp", - "LookDown", - "LookLeft", - "LookRight", - "Blink_L", - "Blink_R", + "unknown", + "neutral", + "a", + "i", + "u", + "e", + "o", + "blink", + "joy", + "angry", + "sorrow", + "fun", + "lookup", + "lookdown", + "lookleft", + "lookright", + "blink_l", + "blink_r", })] public string presetName; diff --git a/specification/0.0/schema/vrm.blendshape.group.schema.json b/specification/0.0/schema/vrm.blendshape.group.schema.json index d4856ca62..d90f6a252 100644 --- a/specification/0.0/schema/vrm.blendshape.group.schema.json +++ b/specification/0.0/schema/vrm.blendshape.group.schema.json @@ -9,7 +9,7 @@ "presetName": { "description": "Predefined Expression name", "type": "string", - "enum": ["Neutral","A","I","U","E","O","Blink","Joy","Angry","Sorrow","Fun","LookUp","LookDown","LookLeft","LookRight","Blink_L","Blink_R"] + "enum": ["unknown","neutral","a","i","u","e","o","blink","joy","angry","sorrow","fun","lookup","lookdown","lookleft","lookright","blink_l","blink_r"] }, "binds": { "description": "Low level blendshape references.",