Merge pull request #1 from KhronosGroup/master

Update to latest

CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+A reminder that this issue tracker is managed by the Khronos Group. Interactions here should follow the Khronos Code of Conduct (https://www.khronos.org/developers/code-of-conduct), which prohibits aggressive or derogatory language. Please keep the discussion friendly and civil.

extensions/0.8/Vendor/CESIUM_binary_glTF/README.md

@@ -126,7 +126,7 @@ Using the Cesium [aircraft model](https://github.com/AnalyticalGraphicsInc/cesiu
 
 ![](BenchData/thumb/Cesium_Air.jpg)
 
-Using the 1200 12th Ave model (thanks to [Cube Cities](http://cubecities.com/)), which contians 30,235 triangles with 21 textures and no animations, statistics and results for the common glTF setups are:
+Using the 1200 12th Ave model (thanks to [Cube Cities](http://cubecities.com/)), which contains 30,235 triangles with 21 textures and no animations, statistics and results for the common glTF setups are:
 
 | 1200 12th Ave                         | # files |     size | size (gzip\*) |  load time | 
 | :------------------------------------ | ------: | -------: | ------------: | ---------: | 

extensions/1.0/Khronos/KHR_binary_glTF/README.md

@@ -205,7 +205,7 @@ Using the Cesium [aircraft model](https://github.com/AnalyticalGraphicsInc/cesiu
 
 ![](BenchData/thumb/Cesium_Air.jpg)
 
-Using the 1200 12th Ave model (thanks to [Cube Cities](http://cubecities.com/)), which contians 30,235 triangles with 21 textures and no animations, statistics and results for the common glTF setups are:
+Using the 1200 12th Ave model (thanks to [Cube Cities](http://cubecities.com/)), which contains 30,235 triangles with 21 textures and no animations, statistics and results for the common glTF setups are:
 
 | 1200 12th Ave                         | # files |     size | size (gzip\*) |  load time | 
 | :------------------------------------ | ------: | -------: | ------------: | ---------: | 

extensions/2.0/Khronos/KHR_draco_mesh_compression/README.md

@@ -28,23 +28,23 @@ The [conformance](#conformance) section specifies what an implementation must do
 
 If a `primitive` contains an `extension` property and the `extension` property defines its `KHR_draco_mesh_compression` property, then the Draco geometry compression must be used.
 
-The following picture shows the structure of the schema update. 
+The following picture shows the structure of the schema update.
 
 **Figure 1**: Structure of geometry compression extension.
 ![](figures/structure.png)
 
 The Draco extension points to the `bufferView` that contains the compressed data.
-If the uncompressed version of the asset is not provided, then `KHR_draco_mesh_compression` must be added to `extensionRequired`.
+If the uncompressed version of the asset is not provided, then `KHR_draco_mesh_compression` must be added to `extensionsRequired`.
 ```javascript
 "extensionsRequired" : [
     "KHR_draco_mesh_compression"
 ]
 
 ```
-If the `KHR_draco_mesh_compression` property is set in `extensionRequired` then the primitive must only contain the Draco compressed data.
-If a Draco compressed version of the asset is provided then `KHR_draco_mesh_compression` must be added to `extensionUsed`.
+If the `KHR_draco_mesh_compression` property is set in `extensionsRequired` then the primitive must only contain the Draco compressed data.
+If a Draco compressed version of the asset is provided then `KHR_draco_mesh_compression` must be added to `extensionsUsed`.
 
-Usage of the extension must be listed in the `extensionUsed`. 
+Usage of the extension must be listed in the `extensionsUsed`.
 
 ```javascript
 "extensionsUsed" : [
@@ -53,7 +53,7 @@ Usage of the extension must be listed in the `extensionUsed`.
 
 ```
 
-Below is an example of what a part of a glTF file my look like if the Draco extension is set. Note that all other nodes stay the same except `primitives`:
+Below is an example of what part of a glTF file will look like if the Draco extension is set. Note that all other nodes stay the same except `primitives`:
 
 ```javascript
 
@@ -65,10 +65,10 @@ Below is an example of what a part of a glTF file my look like if the Draco exte
                 "NORMAL" : 12,
                 "TEXCOORD_0" : 13,
                 "WEIGHTS_0" : 14,
-                "JOINTS_0" : 15,
+                "JOINTS_0" : 15
             },
             "indices" : 10,
-            "mode" : 4
+            "mode" : 4,
             "extensions" : {
                 "KHR_draco_mesh_compression" : {
                     "bufferView" : 5,
@@ -78,10 +78,10 @@ Below is an example of what a part of a glTF file my look like if the Draco exte
                         "TEXCOORD_0" : 2,
                         "WEIGHTS_0" : 3,
                         "JOINTS_0" : 4
-                    },
+                    }
                 }
             }
-        },
+        }
     ]
 }
 
@@ -101,7 +101,10 @@ Below is an example of what a part of a glTF file my look like if the Draco exte
 The `bufferView` property points to the buffer containing compressed data. The data must be passed to a mesh decoder and decompressed to a mesh.
 
 ### attributes
-`attributes` defines the attributes stored in the decompressed geometry. E.g, in the example above, `POSITION`, `NORMAL`, `TEXCOORD_0`, `WEIGHTS_0` and `JOINTS_0`. Each attribute is associated with an attribute id which is its unique id in the compressed data. The `attributes` defined in the extension must be a subset of the attributes of the primitive. To request an attribute, loaders must be able to use the correspondent attribute id specified in the `attributes` to get the attribute from the compressed data.
+`attributes` defines the attributes stored in the decompressed geometry. e.g., in the example above, `POSITION`, `NORMAL`, `TEXCOORD_0`, `WEIGHTS_0` and `JOINTS_0`. Each attribute is associated with an attribute id which is its unique id in the compressed data. The `attributes` defined in the extension must be a subset of the attributes of the primitive. To request an attribute, loaders must be able to use the correspondent attribute id specified in the `attributes` to get the attribute from the compressed data.
+
+### accessors
+The `accessors` properties corresponding to the `attributes` and `indices` of the `primitives` must match the decompressed data.
 
 #### Restrictions on geometry type
 When using this extension, the `mode` of `primitive` must be either `TRIANGLES` or `TRIANGLE_STRIP` and the mesh data will be decoded accordingly.
@@ -112,16 +115,16 @@ For full details on the `KHR_draco_mesh_compression` extension properties, see t
 
 * [extension property (the entirety of this specification is normative and included in Scope)](schema/node.KHR_draco_mesh_compression.schema.json)
 
-## Conformance 
+## Conformance
 
 Below is the recommended process when a loader encounters a glTF asset with the Draco extension set:
 
-* If `KHR_draco_mesh_compression` is in `extensionRequired` and the loader does not support the Draco extension, then the loader must fail loading the asset.
-* If the loader does not support the Draco extension and `KHR_draco_mesh_compression` is not in `extensionRequired`, then load the glTF asset ignoring `KHR_draco_mesh_compression` in `primitive`.
+* If `KHR_draco_mesh_compression` is in `extensionsRequired` and the loader does not support the Draco extension, then the loader must fail loading the asset.
+* If the loader does not support the Draco extension and `KHR_draco_mesh_compression` is not in `extensionsRequired`, then load the glTF asset ignoring `KHR_draco_mesh_compression` in `primitive`.
 * If the loader does support the Draco extension, but will not process `KHR_draco_mesh_compression`, then the loader must load the glTF asset ignoring `KHR_draco_mesh_compression` in `primitive`.
 * If the loader does support the Draco extension, and will process `KHR_draco_mesh_compression` then:
     * The loader must process `KHR_draco_mesh_compression` first. The loader must get the data from `KHR_draco_mesh_compression`'s `bufferView` property and decompress the data using a Draco decoder to a Draco geometry.
-    * Then the loader must process `attributes` and `indices` properties of the `primitive`. When loading each `accessor`, you must ignore the `bufferView` and go to the previously decoded Draco geometry in the `primitive` to get the data of indices and attributes. A loader must use the decompressed data to fill the `accessors` or render the decompressed Draco geometry directly (e.g. [ThreeJS (non-normative)](https://github.com/mrdoob/three.js/blob/dev/examples/js/loaders/draco/DRACOLoader.js)).
+    * Then the loader must process `attributes` and `indices` properties of the `primitive`. When loading each `accessor`, you must ignore the `bufferView` and `byteOffset` of the `accessor` and go to the previously decoded Draco geometry in the `primitive` to get the data of indices and attributes. A loader must use the decompressed data to fill the `accessors` or render the decompressed Draco geometry directly (e.g. [ThreeJS (non-normative)](https://github.com/mrdoob/three.js/blob/dev/examples/js/loaders/DRACOLoader.js)).
     * If additional attributes are defined in `primitive`'s `attributes`, but not defined in `KHR_draco_mesh_compression`'s `attributes`, then the loader must process the additional attributes as usual.
 
 ## Implementation note
@@ -130,65 +133,67 @@ Below is the recommended process when a loader encounters a glTF asset with the
 
 To prevent transmission of redundant data, exporters should generally write compressed Draco data into a separate buffer from the uncompressed fallback, and shared data into a third buffer. Loaders may then optimize to request only the necessary buffers.
 
+Draco compression may change the order and number of vertices in a mesh. To satisfy the requirement that `accessors` properties be correct for both compressed and uncompressed data, generators should create uncompressed `attributes` and `indices` using data that has been decompressed from the Draco buffer, rather than the original source data.
+
 ## Resources
 
 *This section is non-normative.*
 
 * [Draco Open Source Library](https://github.com/google/draco)
 * [ThreeJS
-  Loader](https://github.com/mrdoob/three.js/blob/dev/examples/js/loaders/draco/DRACOLoader.js)
+  Loader](https://github.com/mrdoob/three.js/blob/dev/examples/js/loaders/DRACOLoader.js)
   and
   [example](https://github.com/mrdoob/three.js/blob/dev/examples/webgl_loader_draco.html)
 
 ## Appendix: Full Khronos Copyright Statement
 
-Copyright 2013-2017 The Khronos Group Inc. 
+Copyright 2013-2017 The Khronos Group Inc.
 
 Some parts of this Specification are purely informative and do not define requirements
 necessary for compliance and so are outside the Scope of this Specification. These
-parts of the Specification are marked as being non-normative, or identified as 
+parts of the Specification are marked as being non-normative, or identified as
 **Implementation Notes**.
- 
+
 Where this Specification includes normative references to external documents, only the
 specifically identified sections and functionality of those external documents are in
 Scope. Requirements defined by external documents not created by Khronos may contain
 contributions from non-members of Khronos not covered by the Khronos Intellectual
 Property Rights Policy.
 
-This specification is protected by copyright laws and contains material proprietary 
-to Khronos. Except as described by these terms, it or any components 
-may not be reproduced, republished, distributed, transmitted, displayed, broadcast 
-or otherwise exploited in any manner without the express prior written permission 
-of Khronos. 
+This specification is protected by copyright laws and contains material proprietary
+to Khronos. Except as described by these terms, it or any components
+may not be reproduced, republished, distributed, transmitted, displayed, broadcast
+or otherwise exploited in any manner without the express prior written permission
+of Khronos.
 
-This specification has been created under the Khronos Intellectual Property Rights 
+This specification has been created under the Khronos Intellectual Property Rights
 Policy, which is Attachment A of the Khronos Group Membership Agreement available at
-www.khronos.org/files/member_agreement.pdf. Khronos grants a conditional 
-copyright license to use and reproduce the unmodified specification for any purpose, 
-without fee or royalty, EXCEPT no licenses to any patent, trademark or other 
-intellectual property rights are granted under these terms. Parties desiring to 
-implement the specification and make use of Khronos trademarks in relation to that 
-implementation, and receive reciprocal patent license protection under the Khronos 
-IP Policy must become Adopters and confirm the implementation as conformant under 
-the process defined by Khronos for this specification; 
+www.khronos.org/files/member_agreement.pdf. Khronos grants a conditional
+copyright license to use and reproduce the unmodified specification for any purpose,
+without fee or royalty, EXCEPT no licenses to any patent, trademark or other
+intellectual property rights are granted under these terms. Parties desiring to
+implement the specification and make use of Khronos trademarks in relation to that
+implementation, and receive reciprocal patent license protection under the Khronos
+IP Policy must become Adopters and confirm the implementation as conformant under
+the process defined by Khronos for this specification;
 see https://www.khronos.org/adopters.
 
-Khronos makes no, and expressly disclaims any, representations or warranties, 
-express or implied, regarding this specification, including, without limitation: 
-merchantability, fitness for a particular purpose, non-infringement of any 
-intellectual property, correctness, accuracy, completeness, timeliness, and 
-reliability. Under no circumstances will Khronos, or any of its Promoters, 
-Contributors or Members, or their respective partners, officers, directors, 
-employees, agents or representatives be liable for any damages, whether direct, 
-indirect, special or consequential damages for lost revenues, lost profits, or 
+Khronos makes no, and expressly disclaims any, representations or warranties,
+express or implied, regarding this specification, including, without limitation:
+merchantability, fitness for a particular purpose, non-infringement of any
+intellectual property, correctness, accuracy, completeness, timeliness, and
+reliability. Under no circumstances will Khronos, or any of its Promoters,
+Contributors or Members, or their respective partners, officers, directors,
+employees, agents or representatives be liable for any damages, whether direct,
+indirect, special or consequential damages for lost revenues, lost profits, or
 otherwise, arising from or in connection with these materials.
 
-Vulkan is a registered trademark and Khronos, OpenXR, SPIR, SPIR-V, SYCL, WebGL, 
-WebCL, OpenVX, OpenVG, EGL, COLLADA, glTF, NNEF, OpenKODE, OpenKCAM, StreamInput, 
-OpenWF, OpenSL ES, OpenMAX, OpenMAX AL, OpenMAX IL, OpenMAX DL, OpenML and DevU are 
-trademarks of The Khronos Group Inc. ASTC is a trademark of ARM Holdings PLC, 
-OpenCL is a trademark of Apple Inc. and OpenGL and OpenML are registered trademarks 
-and the OpenGL ES and OpenGL SC logos are trademarks of Silicon Graphics 
-International used under license by Khronos. All other product names, trademarks, 
-and/or company names are used solely for identification and belong to their 
+Vulkan is a registered trademark and Khronos, OpenXR, SPIR, SPIR-V, SYCL, WebGL,
+WebCL, OpenVX, OpenVG, EGL, COLLADA, glTF, NNEF, OpenKODE, OpenKCAM, StreamInput,
+OpenWF, OpenSL ES, OpenMAX, OpenMAX AL, OpenMAX IL, OpenMAX DL, OpenML and DevU are
+trademarks of The Khronos Group Inc. ASTC is a trademark of ARM Holdings PLC,
+OpenCL is a trademark of Apple Inc. and OpenGL and OpenML are registered trademarks
+and the OpenGL ES and OpenGL SC logos are trademarks of Silicon Graphics
+International used under license by Khronos. All other product names, trademarks,
+and/or company names are used solely for identification and belong to their
 respective owners.

extensions/2.0/Khronos/KHR_draco_mesh_compression/schema/node.KHR_draco_mesh_compression.schema.json

@@ -2,6 +2,7 @@
     "$schema": "http://json-schema.org/draft-04/schema",
     "title": "KHR_draco_mesh_compression extension",
     "type": "object",
+    "allOf": [ { "$ref": "glTFProperty.schema.json" } ],
     "properties": {
         "bufferView": {
             "allOf": [ { "$ref" : "glTFid.schema.json" } ],
@@ -14,8 +15,9 @@
                 "$ref": "glTFid.schema.json"
             },
             "description": "A dictionary object, where each key corresponds to an attribute and its unique attribute id stored in the compressed geometry."
-        }
+        },
+        "extensions": { },
+        "extras": { }
     },
-    "additionalProperties": false,
     "required": [ "bufferView", "attributes" ]
 }