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.

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

Removed attributes that are already available through composition #2460

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions specification/2.0/schema/accessor.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@
"sparse": {
"allOf": [ { "$ref": "accessor.sparse.schema.json" } ],
"description": "Sparse storage of elements that deviate from their initialization value."
},
"name": { },
"extensions": { },
"extras": { }
}
},
"dependencies": {
"byteOffset": [ "bufferView" ]
Expand Down
4 changes: 1 addition & 3 deletions specification/2.0/schema/accessor.sparse.indices.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@
"type": "integer"
}
]
},
"extensions": { },
"extras": { }
}
},
"required": [ "bufferView", "componentType" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/accessor.sparse.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
"values": {
"allOf": [ { "$ref": "accessor.sparse.values.schema.json" } ],
"description": "An object pointing to a buffer view containing the deviating accessor values."
},
"extensions": { },
"extras": { }
}
},
"required": [ "count", "indices", "values" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/accessor.sparse.values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
"description": "The offset relative to the start of the bufferView in bytes.",
"minimum": 0,
"default": 0
},
"extensions": { },
"extras": { }
}
},
"required": [ "bufferView" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/animation.channel.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
"target": {
"allOf": [ { "$ref": "animation.channel.target.schema.json" } ],
"description": "The descriptor of the animated property."
},
"extensions": { },
"extras": { }
}
},
"required": [ "sampler", "target" ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
"type": "string"
}
]
},
"extensions": { },
"extras": { }
}
},
"required": [ "path" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/animation.sampler.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
"output": {
"allOf": [ { "$ref": "glTFid.schema.json" } ],
"description": "The index of an accessor, containing keyframe output values."
},
"extensions": { },
"extras": { }
}
},
"required": [ "input", "output" ]
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/animation.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"$ref": "animation.sampler.schema.json"
},
"minItems": 1
},
"name": { },
"extensions": { },
"extras": { }
}
},
"required": [ "channels", "samplers" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/asset.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
"type": "string",
"description": "The minimum glTF version in the form of `<major>.<minor>` that this asset targets. This property **MUST NOT** be greater than the asset version.",
"pattern": "^[0-9]+\\.[0-9]+$"
},
"extensions": { },
"extras": { }
}
},
"required": [ "version" ]
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/buffer.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
"type": "integer",
"description": "The length of the buffer in bytes.",
"minimum": 1
},
"name": { },
"extensions": { },
"extras": { }
}
},
"required": [ "byteLength" ]
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/bufferView.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@
"type": "integer"
}
]
},
"name": { },
"extensions": { },
"extras": { }
}
},
"required": [ "buffer", "byteLength" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/camera.orthographic.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
"type": "number",
"description": "The floating-point distance to the near clipping plane.",
"minimum": 0.0
},
"extensions": { },
"extras": { }
}
},
"required": [ "xmag", "ymag", "zfar", "znear" ]
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/camera.perspective.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
"description": "The floating-point distance to the near clipping plane.",
"exclusiveMinimum": 0.0,
"gltf_detailedDescription": "The floating-point distance to the near clipping plane."
},
"extensions": { },
"extras": { }
}
},
"required": [ "yfov", "znear" ]
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/camera.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
"type": "string"
}
]
},
"name": { },
"extensions": { },
"extras": { }
}
},
"required": [ "type" ],
"not": {
Expand Down
4 changes: 1 addition & 3 deletions specification/2.0/schema/glTF.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@
"$ref": "texture.schema.json"
},
"minItems": 1
},
"extensions": { },
"extras": { }
}
},
"dependencies": {
"scene": [ "scenes" ]
Expand Down
5 changes: 1 addition & 4 deletions specification/2.0/schema/image.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
"bufferView": {
"allOf": [ { "$ref": "glTFid.schema.json" } ],
"description": "The index of the bufferView that contains the image. This field **MUST NOT** be defined when `uri` is defined."
},
"name": { },
"extensions": { },
"extras": { }
}
},
"dependencies": {
"bufferView": [ "mimeType" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
"type": "object",
"allOf": [ { "$ref": "textureInfo.schema.json" } ],
"properties": {
"index": { },
"texCoord": { },
"scale": {
"type": "number",
"description": "The scalar parameter applied to each normal vector of the normal texture.",
"default": 1.0,
"gltf_detailedDescription": "The scalar parameter applied to each normal vector of the texture. This value scales the normal vector in X and Y directions using the formula: `scaledNormal = normalize((<sampled normal texture value> * 2.0 - 1.0) * vec3(<normal scale>, <normal scale>, 1.0))`."
},
"extensions": { },
"extras": { }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
"type": "object",
"allOf": [ { "$ref": "textureInfo.schema.json" } ],
"properties": {
"index": { },
"texCoord": { },
"strength": {
"type": "number",
"description": "A scalar multiplier controlling the amount of occlusion applied.",
"default": 1.0,
"minimum": 0.0,
"maximum": 1.0,
"gltf_detailedDescription": "A scalar parameter controlling the amount of occlusion applied. A value of `0.0` means no occlusion. A value of `1.0` means full occlusion. This value affects the final occlusion value as: `1.0 + strength * (<sampled occlusion texture value> - 1.0)`."
},
"extensions": { },
"extras": { }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
"allOf": [ { "$ref": "textureInfo.schema.json" } ],
"description": "The metallic-roughness texture.",
"gltf_detailedDescription": "The metallic-roughness texture. The metalness values are sampled from the B channel. The roughness values are sampled from the G channel. These values **MUST** be encoded with a linear transfer function. If other channels are present (R or A), they **MUST** be ignored for metallic-roughness calculations. When undefined, the texture **MUST** be sampled as having `1.0` in G and B components."
},
"extensions": { },
"extras": { }
}
}
}
3 changes: 0 additions & 3 deletions specification/2.0/schema/material.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"description": "The material appearance of a primitive.",
"allOf": [ { "$ref": "glTFChildOfRootProperty.schema.json" } ],
"properties": {
"name": { },
"extensions": { },
"extras": { },
"pbrMetallicRoughness": {
"allOf": [ { "$ref": "material.pbrMetallicRoughness.schema.json" } ],
"description": "A set of parameter values that are used to define the metallic-roughness material model from Physically Based Rendering (PBR) methodology. When undefined, all the default values of `pbrMetallicRoughness` **MUST** apply."
Expand Down
4 changes: 1 addition & 3 deletions specification/2.0/schema/mesh.primitive.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@
"description": "A plain JSON object specifying attributes displacements in a morph target, where each key corresponds to one of the three supported attribute semantic (`POSITION`, `NORMAL`, or `TANGENT`) and each value is the index of the accessor containing the attribute displacements' data."
},
"minItems": 1
},
"extensions": { },
"extras": { }
}
},
"gltf_webgl": "`drawElements()` and `drawArrays()`",
"required": [ "attributes" ]
Expand Down
5 changes: 1 addition & 4 deletions specification/2.0/schema/mesh.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"type": "number"
},
"minItems": 1
},
"name": { },
"extensions": { },
"extras": { }
}
},
"required": [ "primitives" ]
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/node.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,7 @@
"items": {
"type": "number"
}
},
"name": { },
"extensions": { },
"extras": { }
}
},
"dependencies": {
"weights": [ "mesh" ],
Expand Down
5 changes: 1 addition & 4 deletions specification/2.0/schema/sampler.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@
"type": "integer"
}
]
},
"name": { },
"extensions": { },
"extras": { }
}
}
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/scene.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
},
"uniqueItems": true,
"minItems": 1
},
"name": { },
"extensions": { },
"extras": { }
}
}
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/skin.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
"uniqueItems": true,
"minItems": 1,
"gltf_detailedDescription": "Indices of skeleton nodes, used as joints in this skin."
},
"name": { },
"extensions": { },
"extras": { }
}
},
"required": [ "joints" ]
}
5 changes: 1 addition & 4 deletions specification/2.0/schema/texture.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
"source": {
"allOf": [ { "$ref": "glTFid.schema.json" } ],
"description": "The index of the image used by this texture. When undefined, an extension or other mechanism **SHOULD** supply an alternate texture source, otherwise behavior is undefined."
},
"name": { },
"extensions": { },
"extras": { }
}
},
"gltf_webgl": "`createTexture()`, `deleteTexture()`, `bindTexture()`, `texImage2D()`, and `texParameterf()`"
}
4 changes: 1 addition & 3 deletions specification/2.0/schema/textureInfo.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
"default": 0,
"minimum": 0,
"gltf_detailedDescription": "This integer value is used to construct a string in the format `TEXCOORD_<set index>` which is a reference to a key in `mesh.primitives.attributes` (e.g. a value of `0` corresponds to `TEXCOORD_0`). A mesh primitive **MUST** have the corresponding texture coordinate attributes for the material to be applicable to it."
},
"extensions": { },
"extras": { }
}
},
"required": [ "index" ]
}