From 3b0aad90d3fac36e224b0b4e4d0fa752d8c4bb24 Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:24:25 +0200 Subject: [PATCH 1/4] fix: according to the new agreement we changed naming from HeroAvatar to costume --- ...r.schema.json => assetCostume.schema.json} | 20 +++++++++---------- schemas/gltf-asset.schema.json | 8 ++++---- schemas/materialNames.schema.json | 2 +- schemas/meshNames.schema.json | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) rename schemas/{assetHeroAvatar.schema.json => assetCostume.schema.json} (93%) diff --git a/schemas/assetHeroAvatar.schema.json b/schemas/assetCostume.schema.json similarity index 93% rename from schemas/assetHeroAvatar.schema.json rename to schemas/assetCostume.schema.json index 24daf36..6f9e6be 100644 --- a/schemas/assetHeroAvatar.schema.json +++ b/schemas/assetCostume.schema.json @@ -1,11 +1,11 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "assetHeroAvatar.schema.json", - "title": "Hero Avatar Asset", - "description": "A Ready Player Me glTF binary validation schema for a hero avatar.", + "$id": "assetCostume.schema.json", + "title": "Costume Avatar Asset", + "description": "A Ready Player Me glTF binary validation schema for a costume avatar.", "type": "object", "properties": { - "scenes": { "$ref": "scene.schema.json#/$defs/fullbodyOutfitScene" }, + "scenes": { "$ref": "scene.schemsa.json#/$defs/fullbodyOutfitScene" }, "meshes": { "type": "object", "properties": { @@ -14,8 +14,8 @@ "minimum": 1, "maximum": 30000, "errorMessage": { - "minimum": "Too few triangles! Hero avatars must have at least 1 triangle.", - "maximum": "Too many triangles (${0})! Hero avatars must have no more than a total of 30,000 triangles." + "minimum": "Too few triangles! Costume avatars must have at least 1 triangle.", + "maximum": "Too many triangles (${0})! Costume avatars must have no more than a total of 30,000 triangles." } }, "properties": { @@ -26,7 +26,7 @@ "properties": { "name": { "description": "Name of the mesh.", - "$ref": "meshNames.schema.json#/properties/heroAvatar" + "$ref": "meshNames.schema.json#/properties/costume" }, "attributes": { "$ref": "meshAttributes.schema.json#/properties/skinned" @@ -222,8 +222,8 @@ "minItems": 1, "maxItems": 13, "errorMessage": { - "minItems": "Missing mesh! Hero avatars must have at least 1 mesh.", - "maxItems": "Too many meshes! Hero avatars must have no more than 13 meshes." + "minItems": "Missing mesh! Costume avatars must have at least 1 mesh.", + "maxItems": "Too many meshes! Costume avatars must have no more than 13 meshes." } } } @@ -239,7 +239,7 @@ "properties": { "name": { "description": "Name of the material.", - "$ref": "materialNames.schema.json#/properties/heroAvatar" + "$ref": "materialNames.schema.json#/properties/costume" }, "textures": { "$ref": "commonMaterial.schema.json#/$defs/allTextureChannels" diff --git a/schemas/gltf-asset.schema.json b/schemas/gltf-asset.schema.json index 7b871d5..04c7ed2 100644 --- a/schemas/gltf-asset.schema.json +++ b/schemas/gltf-asset.schema.json @@ -23,7 +23,7 @@ "hair", "headwear", "lipshape", - "heroAvatar", + "costume", "noseshape", "outfit", "shirt", @@ -31,7 +31,7 @@ ], "errorMessage": { "type": "Asset type should be a string.", - "enum": "Asset type should be one of the following: beard, bottom, eye, eyebrows, eyeshape, facemask, faceshape, facewear, footwear, glasses, hair, headwear, lipshape, heroAvatar, noseshape, outfit, shirt, top. Found ${0}." + "enum": "Asset type should be one of the following: beard, bottom, eye, eyebrows, eyeshape, facemask, faceshape, facewear, footwear, glasses, hair, headwear, lipshape, costume, noseshape, outfit, shirt, top. Found ${0}." } }, "transforms": { @@ -162,10 +162,10 @@ }, { "if": { - "properties": { "assetType": { "const": "heroAvatar" } }, + "properties": { "assetType": { "const": "costume" } }, "required": ["assetType"] }, - "then": { "$ref": "assetHeroAvatar.schema.json" } + "then": { "$ref": "assetCostume.schema.json" } }, { "if": { diff --git a/schemas/materialNames.schema.json b/schemas/materialNames.schema.json index 21d104c..0ebca91 100644 --- a/schemas/materialNames.schema.json +++ b/schemas/materialNames.schema.json @@ -15,7 +15,7 @@ "modularBottom": { "type": "string", "const": "Wolf3D_Outfit_Bottom", "errorMessage": "Material name should be 'Wolf3D_Outfit_Bottom'. Found ${0} instead." }, "modularFootwear": { "type": "string", "const": "Wolf3D_Outfit_Footwear", "errorMessage": "Material name should be 'Wolf3D_Outfit_Footwear'. Found ${0} instead." }, "modularTop": { "type": "string", "const": "Wolf3D_Outfit_Top", "errorMessage": "Material name should be 'Wolf3D_Outfit_Top'. Found ${0} instead." }, - "heroAvatar": { + "costume": { "enum": [ "Wolf3D_Body", "Wolf3D_Eye", diff --git a/schemas/meshNames.schema.json b/schemas/meshNames.schema.json index 1a707bd..b14ba57 100644 --- a/schemas/meshNames.schema.json +++ b/schemas/meshNames.schema.json @@ -55,7 +55,7 @@ "const": "Wolf3D_Outfit_Top", "errorMessage": "Mesh name should be 'Wolf3D_Outfit_Top'. Found ${0} instead." }, - "heroAvatar": { + "costume": { "type": "string", "enum": [ "EyeLeft", From b07f906b480d702571baa85d02d059808b0fae95 Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Mon, 25 Sep 2023 13:46:45 +0200 Subject: [PATCH 2/4] fix: typo --- schemas/assetCostume.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/assetCostume.schema.json b/schemas/assetCostume.schema.json index 6f9e6be..b32bc19 100644 --- a/schemas/assetCostume.schema.json +++ b/schemas/assetCostume.schema.json @@ -5,7 +5,7 @@ "description": "A Ready Player Me glTF binary validation schema for a costume avatar.", "type": "object", "properties": { - "scenes": { "$ref": "scene.schemsa.json#/$defs/fullbodyOutfitScene" }, + "scenes": { "$ref": "scene.schema.json#/$defs/fullbodyOutfitScene" }, "meshes": { "type": "object", "properties": { From c0b1039a18736e120d91af5280ce3f3b6f5f41c5 Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:22:53 +0200 Subject: [PATCH 3/4] --- schemas/assetCostume.schema.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/schemas/assetCostume.schema.json b/schemas/assetCostume.schema.json index b32bc19..844481b 100644 --- a/schemas/assetCostume.schema.json +++ b/schemas/assetCostume.schema.json @@ -1,8 +1,8 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", "$id": "assetCostume.schema.json", - "title": "Costume Avatar Asset", - "description": "A Ready Player Me glTF binary validation schema for a costume avatar.", + "title": "Costume Asset", + "description": "A Ready Player Me glTF binary validation schema for a costume.", "type": "object", "properties": { "scenes": { "$ref": "scene.schema.json#/$defs/fullbodyOutfitScene" }, @@ -14,8 +14,9 @@ "minimum": 1, "maximum": 30000, "errorMessage": { - "minimum": "Too few triangles! Costume avatars must have at least 1 triangle.", - "maximum": "Too many triangles (${0})! Costume avatars must have no more than a total of 30,000 triangles." + "minimum": "Too few triangles! This asset must have at least 1 triangle.", + "maximum": "Too many triangles (${0})! This asset must have no more than a total of 30,000 triangles." + "maximum": "Too many triangles (${0})! This asset must have no more than a total of 30,000 triangles." } }, "properties": { @@ -222,8 +223,8 @@ "minItems": 1, "maxItems": 13, "errorMessage": { - "minItems": "Missing mesh! Costume avatars must have at least 1 mesh.", - "maxItems": "Too many meshes! Costume avatars must have no more than 13 meshes." + "minItems": "Missing mesh! This asset must have at least 1 mesh.", + "maxItems": "Too many meshes! This asset must have no more than 13 meshes." } } } @@ -317,8 +318,8 @@ "minItems": 1, "maxItems": 12, "errorMessage": { - "minItems": "Missing material! This avatar must have at least 1 material. Found ${/materials/properties/length}.", - "maxItems": "Too many materials! This avatar only supports up to 12 materials (eyes share a material). Found ${/materials/properties/length}." + "minItems": "Missing material! This asset must have at least 1 material. Found ${/materials/properties/length}.", + "maxItems": "Too many materials! This asset only supports up to 12 materials (eyes share a material). Found ${/materials/properties/length}." } } } From 419c279bcca28239652903b576df3796b1e914ef Mon Sep 17 00:00:00 2001 From: TechyDaniel <117300186+TechyDaniel@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:45:32 +0200 Subject: [PATCH 4/4] fix : removed duplicates --- schemas/assetCostume.schema.json | 1 - 1 file changed, 1 deletion(-) diff --git a/schemas/assetCostume.schema.json b/schemas/assetCostume.schema.json index 844481b..d7cce63 100644 --- a/schemas/assetCostume.schema.json +++ b/schemas/assetCostume.schema.json @@ -16,7 +16,6 @@ "errorMessage": { "minimum": "Too few triangles! This asset must have at least 1 triangle.", "maximum": "Too many triangles (${0})! This asset must have no more than a total of 30,000 triangles." - "maximum": "Too many triangles (${0})! This asset must have no more than a total of 30,000 triangles." } }, "properties": {