From ca7d879117efcca8db392de16d17a1e725a91c52 Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:49:23 +0200 Subject: [PATCH 1/3] fix{validation): allow outfit asset skeletons to have eye-joints SRV-640 : https://ready-player-me.atlassian.net/browse/SRV-640 --- schemas/assetOutfit.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/assetOutfit.schema.json b/schemas/assetOutfit.schema.json index a17aca6..fab6125 100644 --- a/schemas/assetOutfit.schema.json +++ b/schemas/assetOutfit.schema.json @@ -185,8 +185,8 @@ }, "textures": { "$ref": "commonTexture.schema.json#/$defs/fullPBR" }, "animations": { "$ref": "animation.schema.json#/properties/noAnimation" }, - "joints" : {"allOf": [{ "$ref": "joints.schema.json#/$defs/skeletonV2" }, { "$ref": "joints.schema.json#/$defs/skeletonV2/$defs/maxJoints" }]} - }, + "joints" : {"anyOf" : [{"allOf": [{ "$ref": "joints.schema.json#/$defs/skeletonV2" }, { "$ref": "joints.schema.json#/$defs/skeletonV2/$defs/maxJoints" }]} + , {"$ref": "joints.schema.json#/$defs/skeletonV2WithEyes"}]}, "required": ["scenes", "meshes", "materials", "joints"], "$defs": { "outfitTextureCount": { From 42782ef3d4f3d6aee8463269b05420555fb52f9d Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:53:02 +0200 Subject: [PATCH 2/3] fix{validation): formatting --- schemas/assetOutfit.schema.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/schemas/assetOutfit.schema.json b/schemas/assetOutfit.schema.json index fab6125..4eeaec3 100644 --- a/schemas/assetOutfit.schema.json +++ b/schemas/assetOutfit.schema.json @@ -185,8 +185,23 @@ }, "textures": { "$ref": "commonTexture.schema.json#/$defs/fullPBR" }, "animations": { "$ref": "animation.schema.json#/properties/noAnimation" }, - "joints" : {"anyOf" : [{"allOf": [{ "$ref": "joints.schema.json#/$defs/skeletonV2" }, { "$ref": "joints.schema.json#/$defs/skeletonV2/$defs/maxJoints" }]} - , {"$ref": "joints.schema.json#/$defs/skeletonV2WithEyes"}]}, + "joints": { + "anyOf": [ + { + "allOf": [ + { + "$ref": "joints.schema.json#/$defs/skeletonV2" + }, + { + "$ref": "joints.schema.json#/$defs/skeletonV2/$defs/maxJoints" + } + ] + }, + { + "$ref": "joints.schema.json#/$defs/skeletonV2WithEyes" + } + ] + }, "required": ["scenes", "meshes", "materials", "joints"], "$defs": { "outfitTextureCount": { From 9a902a1698ee96a5da0771d3f56542c78bcfd293 Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:34:07 +0200 Subject: [PATCH 3/3] fix{validation): syntax error fix --- schemas/assetOutfit.schema.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/schemas/assetOutfit.schema.json b/schemas/assetOutfit.schema.json index 4eeaec3..5c722fd 100644 --- a/schemas/assetOutfit.schema.json +++ b/schemas/assetOutfit.schema.json @@ -201,7 +201,8 @@ "$ref": "joints.schema.json#/$defs/skeletonV2WithEyes" } ] - }, + } + }, "required": ["scenes", "meshes", "materials", "joints"], "$defs": { "outfitTextureCount": {