v4 JSON schema update (#1)

* Upgrade to json schema v4 syntax * More allOf changes
KhronosGroup · Nov 9, 2016 · 2f31de5 · 2f31de5
1 parent 1a31159
commit 2f31de5
Show file tree

Hide file tree

Showing 50 changed files with 120 additions and 121 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../Vendor/WEB3D_quantized_attributes/schema/WEB3D_quantized_attributes.accessor.schema.json b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",