diff --git a/extensions/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json b/extensions/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json index f656c75f5c..5cbd8007dc 100644 --- a/extensions/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json +++ b/extensions/Khronos/KHR_binary_glTF/schema/image.KHR_binary_glTF.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "KHR_binary_glTF image extension", "type" : "object", "properties" : { diff --git a/extensions/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json b/extensions/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json index 072777d22f..2549a32ef2 100644 --- a/extensions/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json +++ b/extensions/Khronos/KHR_binary_glTF/schema/shader.KHR_binary_glTF.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "KHR_binary_glTF shader extension", "type" : "object", "properties" : { diff --git a/extensions/Khronos/KHR_materials_common/schema/glTF.KHR_materials_common.schema.json b/extensions/Khronos/KHR_materials_common/schema/glTF.KHR_materials_common.schema.json index e228f6d4e6..0cf41e6bdc 100644 --- a/extensions/Khronos/KHR_materials_common/schema/glTF.KHR_materials_common.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/glTF.KHR_materials_common.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "KHR_materials_common glTF extension", "type" : "object", "properties" : { diff --git a/extensions/Khronos/KHR_materials_common/schema/light.ambient.schema.json b/extensions/Khronos/KHR_materials_common/schema/light.ambient.schema.json index aa83ea0b4e..dfad551122 100644 --- a/extensions/Khronos/KHR_materials_common/schema/light.ambient.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/light.ambient.schema.json @@ -1,8 +1,8 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "light/ambient", "type" : "object", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "color" : { "type" : "array", diff --git a/extensions/Khronos/KHR_materials_common/schema/light.directional.schema.json b/extensions/Khronos/KHR_materials_common/schema/light.directional.schema.json index d37de47f90..3531ac61be 100644 --- a/extensions/Khronos/KHR_materials_common/schema/light.directional.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/light.directional.schema.json @@ -1,8 +1,8 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "light/directional", "type" : "object", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "color" : { "type" : "array", diff --git a/extensions/Khronos/KHR_materials_common/schema/light.point.schema.json b/extensions/Khronos/KHR_materials_common/schema/light.point.schema.json index 7b94ac6780..a7daf74022 100644 --- a/extensions/Khronos/KHR_materials_common/schema/light.point.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/light.point.schema.json @@ -1,8 +1,8 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "light/point", "type" : "object", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "color" : { "type" : "array", diff --git a/extensions/Khronos/KHR_materials_common/schema/light.schema.json b/extensions/Khronos/KHR_materials_common/schema/light.schema.json index a317886a60..deef640048 100644 --- a/extensions/Khronos/KHR_materials_common/schema/light.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/light.schema.json @@ -1,24 +1,24 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "light", "type" : "object", "description" : "An ambient, directional, point, or spot light.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "ambient" : { - "extends" : { "$ref" : "light.ambient.schema.json" }, + "allOf" : [ { "$ref" : "light.ambient.schema.json" } ], "description" : "Ambient light source." }, "directional" : { - "extends" : { "$ref" : "light.directional.schema.json" }, + "allOf" : [ { "$ref" : "light.directional.schema.json" } ], "description" : "Directional light source." }, "point" : { - "extends" : { "$ref" : "light.point.schema.json" }, + "allOf" : [ { "$ref" : "light.point.schema.json" } ], "description" : "Point light source." }, "spot" : { - "extends" : { "$ref" : "light.spot.schema.json" }, + "allOf" : [ { "$ref" : "light.spot.schema.json" } ], "description" : "Spot light source." }, "type" : { diff --git a/extensions/Khronos/KHR_materials_common/schema/light.spot.schema.json b/extensions/Khronos/KHR_materials_common/schema/light.spot.schema.json index 97d5b8fa0c..8980704a12 100644 --- a/extensions/Khronos/KHR_materials_common/schema/light.spot.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/light.spot.schema.json @@ -1,8 +1,8 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "light/spot", "type" : "object", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "color" : { "type" : "array", diff --git a/extensions/Khronos/KHR_materials_common/schema/node.KHR_materials_common.schema.json b/extensions/Khronos/KHR_materials_common/schema/node.KHR_materials_common.schema.json index 7dfce7fb40..9623129103 100644 --- a/extensions/Khronos/KHR_materials_common/schema/node.KHR_materials_common.schema.json +++ b/extensions/Khronos/KHR_materials_common/schema/node.KHR_materials_common.schema.json @@ -1,10 +1,10 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "KHR_materials_common node extension", "type" : "object", "properties" : { "light" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The id of the light referenced by this node." } }, diff --git a/extensions/Vendor/CESIUM_RTC/CESIUM_RTC.schema.json b/extensions/Vendor/CESIUM_RTC/CESIUM_RTC.schema.json index bdd1b7efec..549ced7fbd 100644 --- a/extensions/Vendor/CESIUM_RTC/CESIUM_RTC.schema.json +++ b/extensions/Vendor/CESIUM_RTC/CESIUM_RTC.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "CESIUM_RTC", "type" : "object", "description" : "glTF CESIUM_RTC extension.", diff --git a/extensions/Vendor/WEB3D_quantized_attributes/schema/WEB3D_quantized_attributes.accessor.schema.json b/extensions/Vendor/WEB3D_quantized_attributes/schema/WEB3D_quantized_attributes.accessor.schema.json index 4dd0104827..3e38f7a05d 100644 --- a/extensions/Vendor/WEB3D_quantized_attributes/schema/WEB3D_quantized_attributes.accessor.schema.json +++ b/extensions/Vendor/WEB3D_quantized_attributes/schema/WEB3D_quantized_attributes.accessor.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "WEB3D_quantized_attributes accessor extension", "type" : "object", "properties" : { diff --git a/specification/schema/accessor.schema.json b/specification/schema/accessor.schema.json index fc42600ce6..efacfb6e86 100644 --- a/specification/schema/accessor.schema.json +++ b/specification/schema/accessor.schema.json @@ -1,15 +1,15 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "accessor", "type" : "object", "description" : "A typed view into a bufferView. A bufferView contains raw binary data. An accessor provides a typed view into a bufferView or a subset of a bufferView similar to how WebGL's `vertexAttribPointer()` defines an attribute in a buffer.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, "extras" : {}, "bufferView" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the bufferView.", "required" : true }, diff --git a/specification/schema/animation.channel.schema.json b/specification/schema/animation.channel.schema.json index 0dfb8b99f5..0210df8675 100644 --- a/specification/schema/animation.channel.schema.json +++ b/specification/schema/animation.channel.schema.json @@ -1,20 +1,20 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "channel", "type" : "object", "description" : "Targets an animation's sampler at a node's property.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, "sampler" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of a sampler in this animation used to compute the value for the target.", "required" : true, "gltf_detailedDescription" : "The ID of a sampler in this animation used to compute the value for the target, e.g., a node's translation, rotation, or scale (TRS)." }, "target" : { - "extends" : { "$ref" : "animation.channel.target.schema.json" }, + "allOf" : [ { "$ref" : "animation.channel.target.schema.json" } ], "description" : "The ID of the node and TRS property to target.", "required" : true } diff --git a/specification/schema/animation.channel.target.schema.json b/specification/schema/animation.channel.target.schema.json index 84997af0e8..e60d3a1778 100644 --- a/specification/schema/animation.channel.target.schema.json +++ b/specification/schema/animation.channel.target.schema.json @@ -1,14 +1,14 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "target", "type" : "object", "description" : "The ID of the node and TRS property that an animation channel targets.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, "id" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the node to target.", "required" : true }, diff --git a/specification/schema/animation.parameter.schema.json b/specification/schema/animation.parameter.schema.json index db24cd5b66..3ebd7f49c6 100644 --- a/specification/schema/animation.parameter.schema.json +++ b/specification/schema/animation.parameter.schema.json @@ -1,7 +1,7 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "parameter", - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the accessor containing keyframes for this parameter.", "additionalProperties" : false } diff --git a/specification/schema/animation.sampler.schema.json b/specification/schema/animation.sampler.schema.json index 8fbe8309dd..caeae40e39 100644 --- a/specification/schema/animation.sampler.schema.json +++ b/specification/schema/animation.sampler.schema.json @@ -1,14 +1,14 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "animation sampler", "type" : "object", "description" : "Combines input and output parameters with an interpolation algorithm to define a keyframe graph (but not its target).", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, "input" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of a parameter in this animation to use as keyframe input, e.g., time.", "required" : true, "gltf_detailedDescription" : "The ID of a parameter in this animation to use as keyframe input. This parameter must have type `FLOAT`. The values represent time in seconds with `time[0] >= 0.0`, and monotonically increasing values, i.e., `time[n + 1] >= time[n]`." @@ -21,7 +21,7 @@ "gltf_detailedDescription" : "Interpolation algorithm. When an animation targets a node's rotation, and the animation's interpolation is `\"LINEAR\"`, spherical linear interpolation (slerp) should be used to interpolate quaternions." }, "output" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of a parameter in this animation to use as keyframe output.", "required" : true } diff --git a/specification/schema/animation.schema.json b/specification/schema/animation.schema.json index febe3b5964..6f8777a38f 100644 --- a/specification/schema/animation.schema.json +++ b/specification/schema/animation.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "animation", "type" : "object", "description" : "A keyframe animation.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name": {}, "extensions" : {}, diff --git a/specification/schema/arrayValues.schema.json b/specification/schema/arrayValues.schema.json index bd4947e38c..69d3c70ffd 100644 --- a/specification/schema/arrayValues.schema.json +++ b/specification/schema/arrayValues.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "type" : "array", "items" : { "type" : ["number", "boolean", "string"] diff --git a/specification/schema/asset.profile.schema.json b/specification/schema/asset.profile.schema.json index 83f7e7f97c..656dee00e6 100644 --- a/specification/schema/asset.profile.schema.json +++ b/specification/schema/asset.profile.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "profile", "type" : "object", "description" : "Specifies the target rendering API and version, e.g., WebGL 1.0.3.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, diff --git a/specification/schema/asset.schema.json b/specification/schema/asset.schema.json index 290fbe2d97..fca98feefe 100644 --- a/specification/schema/asset.schema.json +++ b/specification/schema/asset.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "asset", "type" : "object", "description" : "Metadata about the glTF asset.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, diff --git a/specification/schema/buffer.schema.json b/specification/schema/buffer.schema.json index 0829a99e5c..d09c41f827 100644 --- a/specification/schema/buffer.schema.json +++ b/specification/schema/buffer.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "buffer", "type" : "object", "description" : "A buffer points to binary geometry, animation, or skins.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, diff --git a/specification/schema/bufferView.schema.json b/specification/schema/bufferView.schema.json index 17422f7ac8..8423697ab2 100644 --- a/specification/schema/bufferView.schema.json +++ b/specification/schema/bufferView.schema.json @@ -1,15 +1,15 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "bufferView", "type" : "object", "description" : "A view into a buffer generally representing a subset of the buffer.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, "extras" : {}, "buffer" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the buffer.", "required" : true }, diff --git a/specification/schema/camera.orthographic.schema.json b/specification/schema/camera.orthographic.schema.json index bf1174945b..e4c50756b9 100644 --- a/specification/schema/camera.orthographic.schema.json +++ b/specification/schema/camera.orthographic.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "orthographic", "type" : "object", "description" : "An orthographic camera containing properties to create an orthographic projection matrix.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, diff --git a/specification/schema/camera.perspective.schema.json b/specification/schema/camera.perspective.schema.json index e5502f2969..3f14eff78d 100644 --- a/specification/schema/camera.perspective.schema.json +++ b/specification/schema/camera.perspective.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "perspective", "type" : "object", "description" : "A perspective camera containing properties to create a perspective projection matrix.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, diff --git a/specification/schema/camera.schema.json b/specification/schema/camera.schema.json index 9ec624a3d8..2b6154a498 100644 --- a/specification/schema/camera.schema.json +++ b/specification/schema/camera.schema.json @@ -1,19 +1,19 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "camera", "type" : "object", "description" : "A camera's projection. A node can reference a camera ID to apply a transform to place the camera in the scene.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, "extras" : {}, "orthographic" : { - "extends" : { "$ref" : "camera.orthographic.schema.json" }, + "allOf" : [ { "$ref" : "camera.orthographic.schema.json" } ], "description" : "An orthographic camera containing properties to create an orthographic projection matrix." }, "perspective" : { - "extends" : { "$ref" : "camera.perspective.schema.json" }, + "allOf" : [ { "$ref" : "camera.perspective.schema.json" } ], "description" : "A perspective camera containing properties to create a perspective projection matrix." }, "type" : { diff --git a/specification/schema/extension.schema.json b/specification/schema/extension.schema.json index 4aa16053d0..4334913823 100644 --- a/specification/schema/extension.schema.json +++ b/specification/schema/extension.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "extension", "type" : "object", "description" : "Dictionary object with extension-specific objects.", diff --git a/specification/schema/extras.schema.json b/specification/schema/extras.schema.json index b7d78926a8..8fede88d72 100644 --- a/specification/schema/extras.schema.json +++ b/specification/schema/extras.schema.json @@ -1,6 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "extras", - "type" : "any", "description" : "Application-specific data." } diff --git a/specification/schema/glTF.schema.json b/specification/schema/glTF.schema.json index 7cf607fc28..7f23ff9967 100644 --- a/specification/schema/glTF.schema.json +++ b/specification/schema/glTF.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "glTF", "type" : "object", "description" : "The root object for a glTF asset.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, @@ -40,7 +40,7 @@ "gltf_detailedDescription" : "A dictionary object of keyframe animations. The name of each animation is an ID in the global glTF namespace that is used to reference the animation." }, "asset" : { - "extends" : { "$ref" : "asset.schema.json" }, + "allOf" : [ { "$ref" : "asset.schema.json" } ], "description" : "Metadata about the glTF asset.", "default" : {} }, @@ -144,7 +144,7 @@ "gltf_detailedDescription" : "A dictionary object of samplers. The name of each sampler is an ID in the global glTF namespace that is used to reference the sampler. A sampler contains properties for texture filtering and wrapping modes." }, "scene" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the default scene." }, "scenes" : { diff --git a/specification/schema/glTFChildOfRootProperty.schema.json b/specification/schema/glTFChildOfRootProperty.schema.json index 8bc2b9d3e8..34d75037d2 100644 --- a/specification/schema/glTFChildOfRootProperty.schema.json +++ b/specification/schema/glTFChildOfRootProperty.schema.json @@ -1,8 +1,8 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "Child of a glTF root property", "type" : "object", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "name" : { "type" : "string", diff --git a/specification/schema/glTFProperty.schema.json b/specification/schema/glTFProperty.schema.json index 0fa16297d5..0706c0ca34 100644 --- a/specification/schema/glTFProperty.schema.json +++ b/specification/schema/glTFProperty.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "glTF property", "type" : "object", "properties" : { diff --git a/specification/schema/glTFid.schema.json b/specification/schema/glTFid.schema.json index 90ebed733c..3fc91870ca 100644 --- a/specification/schema/glTFid.schema.json +++ b/specification/schema/glTFid.schema.json @@ -1,5 +1,5 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "glTF id", "type" : "string", "minLength" : 1 diff --git a/specification/schema/image.schema.json b/specification/schema/image.schema.json index 0af2887e78..1f0e376f99 100644 --- a/specification/schema/image.schema.json +++ b/specification/schema/image.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "image", "type" : "object", "description" : "Image data used to create a texture.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "uri" : { "type" : "string", diff --git a/specification/schema/material.schema.json b/specification/schema/material.schema.json index ab5b660415..b51dcb4696 100644 --- a/specification/schema/material.schema.json +++ b/specification/schema/material.schema.json @@ -1,15 +1,15 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "material", "type" : "object", "description" : "The material appearance of a primitive.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties": { "name" : {}, "extensions" : {}, "extras" : {}, "technique" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the technique.", "gltf_detailedDescription" : "The ID of the technique. If this is not supplied, and no extension is present that defines material properties, then the primitive should be rendered using a default material with 50% gray emissive color." }, diff --git a/specification/schema/material.values.schema.json b/specification/schema/material.values.schema.json index 2127dfec5c..864b576b82 100644 --- a/specification/schema/material.values.schema.json +++ b/specification/schema/material.values.schema.json @@ -1,6 +1,6 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "values", - "type" : ["number", "boolean", "string", { "$ref" : "arrayValues.schema.json" }], + "anyOf" : [ {"type": ["number", "boolean", "string"]} , { "$ref" : "arrayValues.schema.json" }], "description" : "A dictionary object of parameter values. Parameters with the same name as the technique's parameter override the technique's parameter value." } diff --git a/specification/schema/mesh.primitive.attribute.schema.json b/specification/schema/mesh.primitive.attribute.schema.json index ebab6fa52b..13e348562a 100644 --- a/specification/schema/mesh.primitive.attribute.schema.json +++ b/specification/schema/mesh.primitive.attribute.schema.json @@ -1,6 +1,6 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "attribute", - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "A dictionary object of strings, where each string is the ID of the accessor containing an attribute." } diff --git a/specification/schema/mesh.primitive.schema.json b/specification/schema/mesh.primitive.schema.json index 6f73db2444..805b1ea034 100644 --- a/specification/schema/mesh.primitive.schema.json +++ b/specification/schema/mesh.primitive.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "primitive", "type" : "object", "description" : "Geometry to be rendered with the given material.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, @@ -18,12 +18,12 @@ "default" : {} }, "indices" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the accessor that contains the indices.", "gltf_detailedDescription" : "The ID of the accessor that contains the indices. When this is not defined, the primitives should be rendered without indices using `drawArrays()`. When defined, the accessor must contain indices: the bufferView referenced by the accessor must have a target equal to 34963 (ELEMENT_ARRAY_BUFFER); a byteStride that is tightly packed, i.e., 0 or the byte size of componentType in bytes; componentType must be 5121 (UNSIGNED_BYTE) or 5123 (UNSIGNED_SHORT); and type must be \"SCALAR\"." }, "material" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the material to apply to this primitive when rendering.", "required" : true }, diff --git a/specification/schema/mesh.schema.json b/specification/schema/mesh.schema.json index c1c264b079..469f7c501c 100644 --- a/specification/schema/mesh.schema.json +++ b/specification/schema/mesh.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "mesh", "type" : "object", "description" : "A set of primitives to be rendered. A node can contain one or more meshes. A node's transform places the mesh in the scene.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, diff --git a/specification/schema/node.schema.json b/specification/schema/node.schema.json index dc59e3819b..9b3315a28d 100644 --- a/specification/schema/node.schema.json +++ b/specification/schema/node.schema.json @@ -1,15 +1,15 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "node", "type" : "object", "description" : "A node in the node hierarchy. A node can have either the `camera`, `meshes`, or `skeletons`/`skin`/`meshes` properties defined. In the later case, all `primitives` in the referenced `meshes` contain `JOINT` and `WEIGHT` attributes and the referenced `material`/`technique` from each `primitive` has parameters with `JOINT` and `WEIGHT` semantics. A node can have either a `matrix` or any combination of `translation`/`rotation`/`scale` (TRS) properties. TRS properties are converted to matrices and postmultiplied in the `T * R * S` order to compose the transformation matrix; first the scale is applied to the vertices, then the rotation, and then the translation. If none are provided, the transform is the identity. When a node is targeted for animation (referenced by an animation.channel.target), only TRS properties may be present; `matrix` will not be present.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, "extras" : {}, "camera" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the camera referenced by this node." }, "children" : { @@ -31,11 +31,11 @@ "gltf_detailedDescription" : "The ID of skeleton nodes. Each node defines a subtree, which has a `jointName` of the corresponding element in the referenced `skin.jointNames`." }, "skin" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the skin referenced by this node." }, "jointName" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "Name used when this node is a joint in a skin." }, "matrix" : { diff --git a/specification/schema/program.schema.json b/specification/schema/program.schema.json index 9414705e49..85362ea58b 100644 --- a/specification/schema/program.schema.json +++ b/specification/schema/program.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "program", "type" : "object", "description" : "A shader program, including its vertex and fragment shader, and names of vertex shader attributes.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties": { "name" : {}, "extensions" : {}, @@ -20,12 +20,12 @@ "gltf_webgl" : "`bindAttribLocation()`" }, "fragmentShader" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the fragment shader.", "required" : true }, "vertexShader" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the vertex shader.", "required" : true } diff --git a/specification/schema/sampler.schema.json b/specification/schema/sampler.schema.json index 667d397557..76ca7454df 100644 --- a/specification/schema/sampler.schema.json +++ b/specification/schema/sampler.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "sampler", "type" : "object", "description" : "Texture sampler properties for filtering and wrapping modes.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, diff --git a/specification/schema/scene.schema.json b/specification/schema/scene.schema.json index f7ca794ce9..e1f63a323d 100644 --- a/specification/schema/scene.schema.json +++ b/specification/schema/scene.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "scene", "type" : "object", "description" : "The root nodes of a scene.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, diff --git a/specification/schema/shader.schema.json b/specification/schema/shader.schema.json index d3b5d5db50..445519d1e9 100644 --- a/specification/schema/shader.schema.json +++ b/specification/schema/shader.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "shader", "type" : "object", "description" : "A vertex or fragment shader.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, diff --git a/specification/schema/skin.schema.json b/specification/schema/skin.schema.json index 1b035f096f..05c913aa29 100644 --- a/specification/schema/skin.schema.json +++ b/specification/schema/skin.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "skin", "type" : "object", "description" : "Joints and matrices defining a skin.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, @@ -19,7 +19,7 @@ "default" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, "inverseBindMatrices" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the accessor containing the floating-point 4x4 inverse-bind matrices.", "required" : true }, diff --git a/specification/schema/technique.attribute.schema.json b/specification/schema/technique.attribute.schema.json index 4ac0a2064f..25e59911de 100644 --- a/specification/schema/technique.attribute.schema.json +++ b/specification/schema/technique.attribute.schema.json @@ -1,6 +1,6 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "attribute", - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "A dictionary object of strings that maps GLSL attribute names to technique parameter IDs." } diff --git a/specification/schema/technique.parameters.schema.json b/specification/schema/technique.parameters.schema.json index 2d3cfba202..1dcf961d53 100644 --- a/specification/schema/technique.parameters.schema.json +++ b/specification/schema/technique.parameters.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "parameter", "type" : "object", "description" : "An attribute or uniform input to a technique, and an optional semantic and value.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, @@ -14,7 +14,7 @@ "gltf_detailedDescription" : "When defined, the parameter is an array of count elements of the specified type. Otherwise, the parameter is not an array. When defined, `value` is an array with length equal to count, times the number of components in the type, e.g., `3` for `FLOAT_VEC3`. An array parameter of scalar values is not the same as a vector parameter of the same size; for example, when count is 2 and type is 5126 (FLOAT), the parameter is an array of two floating-point values, not a FLOAT_VEC2." }, "node" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The id of the node whose transform is used as the parameter's value.", "gltf_detailedDescription" : "The id of the node whose transform is used as the parameter's value. When this is defined, `type` must be `35676` (FLOAT_MAT4), therefore, when the semantic is \"MODELINVERSETRANSPOSE\", \"MODELVIEWINVERSETRANSPOSE\", or \"VIEWPORT\", the node property can't be defined." }, @@ -32,7 +32,7 @@ "gltf_detailedDescription" : "Identifies a parameter with a well-known meaning. Uniform semantics include `\"LOCAL\"` (FLOAT_MAT4), `\"MODEL\"` (FLOAT_MAT4), `\"VIEW\"` (FLOAT_MAT4), `\"PROJECTION\"` (FLOAT_MAT4), `\"MODELVIEW\"` (FLOAT_MAT4), `\"MODELVIEWPROJECTION\"` (FLOAT_MAT4), `\"MODELINVERSE\"` (FLOAT_MAT4), `\"VIEWINVERSE\"` (FLOAT_MAT4), `\"PROJECTIONINVERSE\"` (FLOAT_MAT4), `\"MODELVIEWINVERSE\"` (FLOAT_MAT4), `\"MODELVIEWPROJECTIONINVERSE\"` (FLOAT_MAT4), `\"MODELINVERSETRANSPOSE\"` (FLOAT_MAT3), `\"MODELVIEWINVERSETRANSPOSE\"` (FLOAT_MAT3), `\"VIEWPORT\"` (FLOAT_VEC4), `\"JOINTMATRIX\"` (FLOAT_MAT4). Attribute semantics include `\"POSITION\"`, `\"NORMAL\"`, `\"TEXCOORD\"`, `\"COLOR\"`, `\"JOINT\"`, and `\"WEIGHT\"`. Attribute semantic property names can be of the form `[semantic]_[set_index]`, e.g., `\"TEXCOORD_0\"`." }, "value" : { - "type" : ["number", "boolean", "string", { "$ref" : "arrayValues.schema.json" }], + "anyOf" : [{"type" :["number", "boolean", "string"]}, { "$ref" : "arrayValues.schema.json" }], "description" : "The value of the parameter.", "gltf_detailedDescription" : "The value of the parameter. A material value with the same name, when specified, overrides this value." } diff --git a/specification/schema/technique.schema.json b/specification/schema/technique.schema.json index 69ff9d0ad9..3b988b32de 100644 --- a/specification/schema/technique.schema.json +++ b/specification/schema/technique.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "technique", "type" : "object", "description" : "A template for material appearances.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties": { "name" : {}, "extensions" : {}, @@ -30,7 +30,7 @@ "default" : {} }, "program" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the program.", "required" : true }, @@ -45,7 +45,7 @@ "default" : {} }, "states" : { - "extends" : { "$ref" : "technique.states.schema.json" }, + "allOf" : [ { "$ref" : "technique.states.schema.json" } ], "description" : "Fixed-function rendering states.", "default" : {} } diff --git a/specification/schema/technique.states.functions.schema.json b/specification/schema/technique.states.functions.schema.json index a7170fc75e..07934f4a2f 100644 --- a/specification/schema/technique.states.functions.schema.json +++ b/specification/schema/technique.states.functions.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "functions", "type" : "object", "description" : "Arguments for fixed-function rendering state functions other than `enable()`/`disable()`.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, diff --git a/specification/schema/technique.states.schema.json b/specification/schema/technique.states.schema.json index 44501cca36..a670bd1f39 100644 --- a/specification/schema/technique.states.schema.json +++ b/specification/schema/technique.states.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "states", "type" : "object", "description" : "Fixed-function rendering states.", - "extends" : { "$ref" : "glTFProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ], "properties" : { "extensions" : {}, "extras" : {}, diff --git a/specification/schema/technique.uniform.schema.json b/specification/schema/technique.uniform.schema.json index 02cb07aa94..45cf9a58b7 100644 --- a/specification/schema/technique.uniform.schema.json +++ b/specification/schema/technique.uniform.schema.json @@ -1,6 +1,6 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "uniform", - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "A dictionary object of strings that maps GLSL uniform names to technique parameter IDs." } diff --git a/specification/schema/texture.schema.json b/specification/schema/texture.schema.json index a6c133037f..f646e7f6fb 100644 --- a/specification/schema/texture.schema.json +++ b/specification/schema/texture.schema.json @@ -1,9 +1,9 @@ { - "$schema" : "http://json-schema.org/draft-03/schema", + "$schema" : "http://json-schema.org/draft-04/schema", "title" : "texture", "type" : "object", "description" : "A texture and its sampler.", - "extends" : { "$ref" : "glTFChildOfRootProperty.schema.json" }, + "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ], "properties" : { "name" : {}, "extensions" : {}, @@ -27,12 +27,12 @@ "gltf_webgl" : "`texImage2D()` internalFormat parameter" }, "sampler" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the sampler used by this texture.", "required" : true }, "source" : { - "extends" : { "$ref" : "glTFid.schema.json" }, + "allOf" : [ { "$ref" : "glTFid.schema.json" } ], "description" : "The ID of the image used by this texture.", "required" : true },