Skip to content

Commit

Permalink
Fix/hero avatar to costume (#12)
Browse files Browse the repository at this point in the history
* fix: according to the new agreement we changed naming from HeroAvatar to costume

* fix: typo

* fix : removed duplicates
  • Loading branch information
TechyDaniel authored Sep 29, 2023
1 parent 39f45a9 commit 5137b36
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$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 Asset",
"description": "A Ready Player Me glTF binary validation schema for a costume.",
"type": "object",
"properties": {
"scenes": { "$ref": "scene.schema.json#/$defs/fullbodyOutfitScene" },
Expand All @@ -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! 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."
}
},
"properties": {
Expand All @@ -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"
Expand Down Expand Up @@ -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! This asset must have at least 1 mesh.",
"maxItems": "Too many meshes! This asset must have no more than 13 meshes."
}
}
}
Expand All @@ -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"
Expand Down Expand Up @@ -317,8 +317,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}."
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions schemas/gltf-asset.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"hair",
"headwear",
"lipshape",
"heroAvatar",
"costume",
"noseshape",
"outfit",
"shirt",
"top"
],
"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": {
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion schemas/materialNames.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion schemas/meshNames.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 5137b36

Please sign in to comment.