Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/hero avatar to costume #12

Merged
merged 5 commits into from
Sep 29, 2023
Merged

Fix/hero avatar to costume #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b0aad9
fix: according to the new agreement we changed naming from HeroAvatar…
TechyDaniel Sep 7, 2023
d22c5cc
Merge branch 'main' into fix/HeroAvatar-to-costume
TechyDaniel Sep 7, 2023
b07f906
fix: typo
TechyDaniel Sep 25, 2023
c0b1039
TechyDaniel Sep 27, 2023
419c279
fix : removed duplicates
TechyDaniel Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions schemas/assetHeroAvatar.schema.json → schemas/assetCostume.schema.json
View file
Open in desktop
TechyDaniel marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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