diff --git a/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs b/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs index 83442be36..122860d74 100644 --- a/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs +++ b/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs @@ -30,10 +30,10 @@ namespace UniGLTF.Extensions.VRMC_springBone public class ColliderShape { // Dictionary object with extension-specific objects. - public glTFExtension Extensions; + public object Extensions; // Application-specific data. - public glTFExtension Extras; + public object Extras; public ColliderShapeSphere Sphere; @@ -43,10 +43,10 @@ namespace UniGLTF.Extensions.VRMC_springBone public class Collider { // Dictionary object with extension-specific objects. - public glTFExtension Extensions; + public object Extensions; // Application-specific data. - public glTFExtension Extras; + public object Extras; // The node index. public int? Node; @@ -57,10 +57,10 @@ namespace UniGLTF.Extensions.VRMC_springBone public class ColliderGroup { // Dictionary object with extension-specific objects. - public glTFExtension Extensions; + public object Extensions; // Application-specific data. - public glTFExtension Extras; + public object Extras; public List Colliders; } diff --git a/Assets/VRM10/Runtime/Format/SpringBone/Serializer.g.cs b/Assets/VRM10/Runtime/Format/SpringBone/Serializer.g.cs index 9f03bc2c3..ef63c1cd2 100644 --- a/Assets/VRM10/Runtime/Format/SpringBone/Serializer.g.cs +++ b/Assets/VRM10/Runtime/Format/SpringBone/Serializer.g.cs @@ -75,12 +75,12 @@ public static void Serialize_ColliderGroups_ITEM(JsonFormatter f, ColliderGroup if(value.Extensions!=null){ f.Key("extensions"); - value.Extensions.Serialize(f); + (value.Extensions as glTFExtension).Serialize(f); } if(value.Extras!=null){ f.Key("extras"); - value.Extras.Serialize(f); + (value.Extras as glTFExtension).Serialize(f); } if(value.Colliders!=null&&value.Colliders.Count()>=0){ @@ -110,12 +110,12 @@ public static void __colliderGroups_ITEM_Serialize_Colliders_ITEM(JsonFormatter if(value.Extensions!=null){ f.Key("extensions"); - value.Extensions.Serialize(f); + (value.Extensions as glTFExtension).Serialize(f); } if(value.Extras!=null){ f.Key("extras"); - value.Extras.Serialize(f); + (value.Extras as glTFExtension).Serialize(f); } if(value.Node.HasValue){ @@ -138,12 +138,12 @@ public static void __colliderGroups_ITEM__colliders_ITEM_Serialize_Shape(JsonFor if(value.Extensions!=null){ f.Key("extensions"); - value.Extensions.Serialize(f); + (value.Extensions as glTFExtension).Serialize(f); } if(value.Extras!=null){ f.Key("extras"); - value.Extras.Serialize(f); + (value.Extras as glTFExtension).Serialize(f); } if(value.Sphere!=null){ diff --git a/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs b/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs index f4f3f5437..22167bc20 100644 --- a/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs +++ b/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs @@ -65,7 +65,6 @@ namespace UniGLTF.Extensions.VRMC_vrm public int? ThumbnailImage; // A person who can perform with this avatars - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public AvatarPermissionType AvatarPermission; // A flag that permits to use this avatar in excessively violent contents @@ -75,21 +74,18 @@ namespace UniGLTF.Extensions.VRMC_vrm public bool? AllowExcessivelySexualUsage; // An option that permits to use this avatar in commercial products - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public CommercialUsageType CommercialUsage; // A flag that permits to use this avatar in political or religious contents public bool? AllowPoliticalOrReligiousUsage; // An option that forces or abandons to display the credit of this avatar - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public CreditNotationType CreditNotation; // A flag that permits to redistribute this avatar public bool? AllowRedistribution; // An option that controls the condition to modify this avatar - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public ModificationType Modification; // Describe the URL links of other license @@ -291,7 +287,6 @@ namespace UniGLTF.Extensions.VRMC_vrm public int? Node; // How the camera interprets the mesh. - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public FirstPersonType Type; } @@ -322,7 +317,6 @@ namespace UniGLTF.Extensions.VRMC_vrm // The origin of LookAt. Position offset from the head bone public float[] OffsetFromHeadBone; - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public LookAtType Type; // Horizontal inward movement. The left eye moves right. The right eye moves left. @@ -401,7 +395,6 @@ namespace UniGLTF.Extensions.VRMC_vrm // target material public int? Material; - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public MaterialColorType Type; // target color @@ -446,7 +439,6 @@ namespace UniGLTF.Extensions.VRMC_vrm public string Name; // Functions of Expression - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public ExpressionPreset Preset; // Specify a morph target @@ -462,15 +454,12 @@ namespace UniGLTF.Extensions.VRMC_vrm public bool? IsBinary; // Override values of Blink expressions when this Expression is enabled - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public ExpressionOverrideType OverrideBlink; // Override values of LookAt expressions when this Expression is enabled - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public ExpressionOverrideType OverrideLookAt; // Override values of Mouth expressions when this Expression is enabled - [JsonSchema(EnumSerializationType = EnumSerializationType.AsString)] public ExpressionOverrideType OverrideMouth; }