CesiumGS · pjcozzi · Feb 3, 2017 · Dec 23, 2016 · Jan 4, 2017 · Jan 4, 2017
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 Change Log
 ==========
 
+### Next release
+* Added `compressTextures` stage to compress input textures to a variety of compressed texture formats.
+
 ### 0.1.0-alpha9 - 2017-01-03
 * Fixed issue with embedding base64 encoded shader strings for assets using the KHR_materials_common extension
 

diff --git a/README.md b/README.md
@@ -35,13 +35,13 @@ node ./bin/gltf-pipeline.js -i ./specs/data/boxTexturedUnoptimized/CesiumTexture
 |`--output`, `-o`|output=PATH, Write optimized glTF to the specified file.|No|
 |`--binary`, `-b`|Write binary glTF file using KHR_binary_glTF extension.|No, default `false`|
 |`--separate`, `-s`|Write separate geometry/animation data files, shader files, and textures instead of embedding them in the glTF asset.|No, default `false`|
-|`--separateTexture`, `-t`|Write out separate textures, but embeds geometry/animation data files and shader files in the glTF asset.|No, default `false`|
+|`--separateImage`, `-t`|Write out separate textures, but embeds geometry/animation data files and shader files in the glTF asset.|No, default `false`|
 |`--quantize`, `-q`|Quantize the attributes of this glTF asset using the WEB3D_quantized_attributes extension.|No, default `false`|
 |`--encodeNormals`, `-n`|Oct-encode the normals of this glTF asset.|No, default `false`|
 |`--compressTextureCoordinates`, `-c`|Compress the testure coordinates of this glTF asset.|No, default `false`|
 |`--removeNormals`, `-r`|Strips off existing normals, allowing them to be regenerated.|No, default `false`|
 |`--faceNormals`, `-f`|If normals are missing, they should be generated using the face normal.|No, default `false`|
-|`--cesium`, `-c`|Optimize the glTF for Cesium by using the sun as a default light source.|No, default `false`|
+|`--cesium`|Optimize the glTF for Cesium by using the sun as a default light source.|No, default `false`|
 |`--kmc.enable`|Materials should be expressed using the KHR_materials_common extension. If other `kmc` flags are enabled, this is implicitly true.|No, default `false`|
 |`--kmc.doubleSided`|Declares whether backface culling should be disabled.|No, default `false`|
 |`--kmc.technique`|The lighting model to use.|No, default `PHONG`|
@@ -50,6 +50,12 @@ node ./bin/gltf-pipeline.js -i ./specs/data/boxTexturedUnoptimized/CesiumTexture
 |`--ao.groundPlane`|Simulate a groundplane at the lowest point of the model when baking AO.|No, default `false`|
 |`--ao.ambientShadowContribution`|Amount of AO to show when blending between shader computed lighting and AO. 1.0 is full AO, 0.5 is a 50/50 blend.|No, default `0.5`|
 |`--ao.quality`|Quality to use when baking AO. Valid settings are high, medium, and low.|No, default `low`|
+|`--texcomp.enable`|Compress textures.|No, default `false`|
+|`--texcomp.format`|The compressed texture format.|No, unless `texcomp.enable` is defined.|
+|`--texcomp.quality`|The compressed texture quality from 0 to 10.|No, default `5`|
+|`--texcomp.bitrate`|The bitrate when using the pvrtc or astc formats|No, default `2.0`|
+|`--texcomp.blockSize`|The block size for astc compression. Smaller block sizes result in higher bitrates. This value is ignored if options.bitrate is also set.|No, default `8x8`|
+|`--texcomp.alphaBit`|Store a single bit for alpha. Only supported for etc2.|No, default `false`|
 
 ## Build Instructions
 
@@ -94,6 +100,10 @@ The documentation will be placed in the `doc` folder.
 
 Pull requests are appreciated!  Please use the same [Contributor License Agreement (CLA)](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md) and [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Documentation/Contributors/CodingGuide/README.md) used for [Cesium](http://cesiumjs.org/).
 
+## Attribution
+
+This product includes components of the PowerVR Tools Software from Imagination Technologies Limited.
+
 ---
 
 <p align="center">

diff --git a/bin/darwin/EtcTool b/bin/darwin/EtcTool
diff --git a/bin/darwin/PVRTexToolCLI b/bin/darwin/PVRTexToolCLI
diff --git a/bin/darwin/astcenc b/bin/darwin/astcenc
diff --git a/bin/darwin/crunch b/bin/darwin/crunch
diff --git a/bin/linux/EtcTool b/bin/linux/EtcTool
diff --git a/bin/linux/PVRTexToolCLI b/bin/linux/PVRTexToolCLI
diff --git a/bin/linux/astcenc b/bin/linux/astcenc
diff --git a/bin/linux/crunch b/bin/linux/crunch
diff --git a/bin/win32/EtcTool.exe b/bin/win32/EtcTool.exe
diff --git a/bin/win32/PVRTexToolCLI.exe b/bin/win32/PVRTexToolCLI.exe
diff --git a/bin/win32/astcenc.exe b/bin/win32/astcenc.exe
diff --git a/bin/win32/crunch.exe b/bin/win32/crunch.exe
diff --git a/lib/Pipeline.js b/lib/Pipeline.js
@@ -11,6 +11,7 @@ var bakeAmbientOcclusion = require('./bakeAmbientOcclusion');
 var combineMeshes = require('./combineMeshes');
 var combineNodes = require('./combineNodes');
 var compressIntegerAccessors = require('./compressIntegerAccessors');
+var compressTextures = require('./compressTextures');
 var compressTextureCoordinates = require('./compressTextureCoordinates');
 var combinePrimitives = require('./combinePrimitives');
 var convertDagToTree = require('./convertDagToTree');
@@ -76,7 +77,9 @@ Pipeline.processJSON = function(gltf, options) {
  * @param {Object} [options.aoOptions=undefined] Options to pass to the bakeAmbientOcclusion stage, if undefined, stage is not run.
  * @param {Object} [options.encodeNormals=false] Flag to run octEncodeNormals stage.
  * @param {Object} [options.compressTextureCoordinates=false] Flag to run compressTextureCoordinates stage.
+ * @param {Object} [options.kmcOptions=undefined] Options to pass to the generateModelMaterialsCommon stage, if undefined, stage is not run.
  * @param {Object} [options.quantize] Flag to run quantizeAttributes stage.
+ * @param {Object} [options.textureCompressionOptions=undefined] Options to pass to the compressTextures stage, if undefined, stage is not run.
  * @returns {Promise} A promise that resolves to the processed glTF asset.
  */
 Pipeline.processJSONWithExtras  = function(gltfWithExtras, options) {
@@ -107,7 +110,7 @@ Pipeline.processJSONWithExtras  = function(gltfWithExtras, options) {
 
     // run AO after optimizeForVertexCache since AO adds new attributes.
     var aoOptions = options.aoOptions;
-    if (defined(aoOptions) && aoOptions.enabled) {
+    if (defined(aoOptions) && aoOptions.enable) {
         bakeAmbientOcclusion(gltfWithExtras, aoOptions);
     }
 
@@ -136,7 +139,12 @@ Pipeline.processJSONWithExtras  = function(gltfWithExtras, options) {
                 }
                 quantizeAttributes(gltfWithExtras, quantizedOptions);
             }
-            return encodeImages(gltfWithExtras);
+            var textureCompressionOptions = options.textureCompressionOptions;
+            if (defined(textureCompressionOptions) && textureCompressionOptions.enable) {
+                return compressTextures(gltfWithExtras, textureCompressionOptions);
+            } else {
+                return encodeImages(gltfWithExtras);
+            }
         })
         .then(function() {
             var kmcOptions = options.kmcOptions;