Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-15 15:11:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix spec for fields which have indices, add minimum=0 for them

Browse Source
This commit is contained in:
yutopp 2019-01-18 21:49:54 +09:00
parent 521d3bfcfa
commit d2eff422b9
5 changed files with 91 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Assets/VRM/UniVRM/Editor/Tests/UniVRMSerializeTests.cs
View File

@ -152,7 +152,7 @@ namespace VRM
};
var json2 = JsonSchema.FromType<glTF_VRM_Firstperson>().Serialize(model, c);
Assert.AreEqual(
@"{""firstPersonBone"":-1,""firstPersonBoneOffset"":{""x"":0,""y"":0,""z"":0},""meshAnnotations"":[],""lookAtTypeName"":""Bone"",""lookAtHorizontalInner"":{""xRange"":90,""yRange"":10},""lookAtHorizontalOuter"":{""xRange"":90,""yRange"":10},""lookAtVerticalDown"":{""xRange"":90,""yRange"":10},""lookAtVerticalUp"":{""xRange"":90,""yRange"":10}}",
@"{""firstPersonBoneOffset"":{""x"":0,""y"":0,""z"":0},""meshAnnotations"":[],""lookAtTypeName"":""Bone"",""lookAtHorizontalInner"":{""xRange"":90,""yRange"":10},""lookAtHorizontalOuter"":{""xRange"":90,""yRange"":10},""lookAtVerticalDown"":{""xRange"":90,""yRange"":10},""lookAtVerticalUp"":{""xRange"":90,""yRange"":10}}",
json2);
}
@ -162,10 +162,11 @@ namespace VRM
var model = new glTF_VRM_HumanoidBone()
{
bone = "hips", // NOTE: This field must not be null?
node = 0,
};
var json = model.ToJson();
Assert.AreEqual(@"{""bone"":""hips"",""node"":-1,""useDefaultValues"":true}", json);
Assert.AreEqual(@"{""bone"":""hips"",""node"":0,""useDefaultValues"":true}", json);
Debug.Log(json);
var c = new JsonSchemaValidationContext("")
@ -175,10 +176,28 @@ namespace VRM
var json2 = JsonSchema.FromType<glTF_VRM_HumanoidBone>().Serialize(model, c);
// NOTE: New serializer outputs values which will not be used...
Assert.AreEqual(
@"{""bone"":""hips"",""node"":-1,""useDefaultValues"":true,""min"":{""x"":0,""y"":0,""z"":0},""max"":{""x"":0,""y"":0,""z"":0},""center"":{""x"":0,""y"":0,""z"":0},""axisLength"":0}",
@"{""bone"":""hips"",""node"":0,""useDefaultValues"":true,""min"":{""x"":0,""y"":0,""z"":0},""max"":{""x"":0,""y"":0,""z"":0},""center"":{""x"":0,""y"":0,""z"":0},""axisLength"":0}",
json2);
}
[Test]
public void HumanoidBoneTestError()
{
var model = new glTF_VRM_HumanoidBone()
{
bone = "hips", // NOTE: This field must not be null?
};
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_HumanoidBone>().Serialize(model, c)
);
Assert.AreEqual("[node.String] minimum: ! -1>=0", ex.Message);
}
[Test]
public void HumanoidTest()
{
@ -230,7 +249,7 @@ namespace VRM
};
var json2 = JsonSchema.FromType<glTF_VRM_Meta>().Serialize(model, c);
// NOTE: New serializer outputs values which will not be used...
Assert.AreEqual(json,json2);
Assert.AreEqual(@"{}",json2);
}
[Test]
@ -273,6 +292,24 @@ namespace VRM
Assert.AreEqual(json,json2);
}
[Test]
public void SecondaryAnimationColliderGroupTestError()
{
var model = new glTF_VRM_SecondaryAnimationColliderGroup()
{
node = -1,
};
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_SecondaryAnimationColliderGroup>().Serialize(model, c)
);
Assert.AreEqual("[node.String] minimum: ! -1>=0", ex.Message);
}
[Test]
public void SecondaryAnimationGroupTest()
{
@ -291,6 +328,42 @@ namespace VRM
Assert.AreEqual(json,json2);
}
[Test]
public void SecondaryAnimationGroupTestErrorBones()
{
var model = new glTF_VRM_SecondaryAnimationGroup()
{
bones = new int[] { -1 }
};
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_SecondaryAnimationGroup>().Serialize(model, c)
);
Assert.AreEqual("[bones.String] minimum: ! -1>=0", ex.Message);
}
[Test]
public void SecondaryAnimationGroupTestErrorColliderGroups()
{
var model = new glTF_VRM_SecondaryAnimationGroup()
{
colliderGroups = new int[] { -1 }
};
var c = new JsonSchemaValidationContext("")
{
EnableDiagnosisForNotRequiredFields = true,
};
var ex = Assert.Throws<JsonSchemaValidationException>(
() => JsonSchema.FromType<glTF_VRM_SecondaryAnimationGroup>().Serialize(model, c)
);
Assert.AreEqual("[colliderGroups.String] minimum: ! -1>=0", ex.Message);
}
[Test]
public void SecondaryAnimationTest()
{

5
Assets/VRM/UniVRM/Scripts/Format/glTF_VRM_FirstPerson.cs
View File

@ -50,6 +50,8 @@ namespace VRM
[JsonSchema(Title = "vrm.firstperson.meshannotation")]
public class glTF_VRM_MeshAnnotation : JsonSerializableBase
{
// When the value is -1, it means that no target mesh is found.
[JsonSchema(Minimum = 0)]
public int mesh;
public string firstPersonFlag;
@ -72,7 +74,8 @@ namespace VRM
[JsonSchema(Title = "vrm.firstperson")]
public class glTF_VRM_Firstperson : UniGLTF.JsonSerializableBase
{
[JsonSchema(Description = "The bone whose rendering should be turned off in first-person view. Usually Head is specified.")]
// When the value is -1, it means that no bone for first person is found.
[JsonSchema(Description = "The bone whose rendering should be turned off in first-person view. Usually Head is specified.", Minimum = 0, ExplicitIgnorableValue = -1)]
public int firstPersonBone = -1;
[JsonSchema(Description = @"The target position of the VR headset in first-person view. It is assumed that an offset from the head bone to the VR headset is added.")]

3
Assets/VRM/UniVRM/Scripts/Format/glTF_VRM_Humanoid.cs
View File

@ -162,7 +162,8 @@ namespace VRM
}
}
[JsonSchema(Description = "Reference node index")]
// When the value is -1, it means that no node is found.
[JsonSchema(Description = "Reference node index", Minimum = 0)]
public int node = -1;
[JsonSchema(Description = "Unity's HumanLimit.useDefaultValues")]

3
Assets/VRM/UniVRM/Scripts/Format/glTF_VRM_Meta.cs
View File

@ -54,7 +54,8 @@ namespace VRM
[JsonSchema(Description = "Reference of VRM model")]
public string reference;
[JsonSchema(Description = "Thumbnail of VRM model")]
// When the value is -1, it means that texture is not specified.
[JsonSchema(Description = "Thumbnail of VRM model", Minimum = 0, ExplicitIgnorableValue = -1)]
public int texture = -1;
#region Ussage Permission

7
Assets/VRM/UniVRM/Scripts/Format/glTF_VRM_SecondaryAnimation.cs
View File

@ -28,7 +28,7 @@ namespace VRM
[JsonSchema(Title = "vrm.secondaryanimation.collidergroup", Description = @"Set sphere balls for colliders used for collision detections with swaying objects.")]
public class glTF_VRM_SecondaryAnimationColliderGroup : JsonSerializableBase
{
[JsonSchema(Description = "The node of the collider group for setting up collision detections.")]
[JsonSchema(Description = "The node of the collider group for setting up collision detections.", Minimum = 0)]
public int node;
public List<glTF_VRM_SecondaryAnimationCollider> colliders = new List<glTF_VRM_SecondaryAnimationCollider>();
@ -60,6 +60,9 @@ namespace VRM
[JsonSchema(Description = "The resistance (deceleration) of automatic animation.")]
public float dragForce;
// NOTE: This value denotes index but may contain -1 as a value.
// When the value is -1, it means that center node is not specified.
// This is a historical issue and a compromise for forward compatibility.
[JsonSchema(Description = @"The reference point of a swaying object can be set at any location except the origin. When implementing UI moving with warp, the parent node to move with warp can be specified if you don't want to make the object swaying with warp movement.")]
public int center;
@ -67,9 +70,11 @@ namespace VRM
public float hitRadius;
[JsonSchema(Description = "Specify the node index of the root bone of the swaying object.")]
[ItemJsonSchema(Minimum = 0)]
public int[] bones = new int[] { };
[JsonSchema(Description = "Specify the index of the collider group for collisions with swaying objects.")]
[ItemJsonSchema(Minimum = 0)]
public int[] colliderGroups = new int[] { };
protected override void SerializeMembers(GLTFJsonFormatter f)