Merge branch 'master' of github.com:AnalyticalGraphicsInc/gltf-pipeli…

…ne into updateVersion

.gitignore

@@ -2,9 +2,6 @@
 node_modules
 npm-debug.log
 
-# TypeScript definitions
-typings
-
 # WebStorm user-specific
 .idea/workspace.xml
 .idea/tasks.xml

.npmignore

@@ -5,10 +5,9 @@
 /output
 /specs
 /test
-/typings
 .jshintrc
 .npmignore
 .travis.yml
+.appveyor.yml
 gulpfile.js
-typings.json
 *.tgz

CHANGES.md

@@ -1,7 +1,7 @@
 Change Log
 ==========
 
-### 0.1.0-alpha11 - ??
+### 0.1.0-alpha11 - 2017-03-07
 * Added `compressTextures` stage to compress input textures to a variety of compressed texture formats.
 * Optimized `mergeBuffers` to avoid repeated copies, drastically improving performance when there are lots of buffers to merge.
 * Fixed a bug in `addPipelineExtras` that made it try to add extras to null objects.

README.md

@@ -160,7 +160,6 @@ node -e "var test = require('gltf-pipeline');" # No output on success
   * `git push origin <version>`
 * Publish
 ```
-npm run prepublish
 npm publish
 ```
 

gulpfile.js

@@ -97,15 +97,15 @@ gulp.task('coverage', function () {
     // Travis runs Ubuntu 12.04.5 which has glibc 2.15, while crunch requires glibc 2.22 or higher
     var additionalExcludes = '';
     if (defined(argv.excludeCompressedTextures)) {
-        additionalExcludes += 'specs/lib/compressTexturesSpec.js';
-        additionalExcludes += 'specs/lib/compressTexturesMultipleFormatsSpec.js';
+        additionalExcludes += '-x "specs/lib/compressTexturesSpec.js"';
+        additionalExcludes += '-x "specs/lib/compressTexturesMultipleFormatsSpec.js"';
     }
 
     child_process.execSync('istanbul' +
         ' cover' +
         ' --include-all-sources' +
         ' --dir coverage' +
-        ' -x "specs/** coverage/** dist/** index.js gulpfile.js"' + additionalExcludes +
+        ' -x "specs/**" -x "bin/**" -x "coverage/**" -x "dist/**" -x "index.js" -x "gulpfile.js"' + additionalExcludes +
         ' node_modules/jasmine/bin/jasmine.js' +
         ' JASMINE_CONFIG_PATH=specs/jasmine.json', {
         stdio: [process.stdin, process.stdout, process.stderr]

index.js

@@ -10,7 +10,9 @@ module.exports = {
     combineMeshes : require('./lib/combineMeshes'),
     combineNodes : require('./lib/combineNodes'),
     compressIntegerAccessors : require('./lib/compressIntegerAccessors'),
+    compressTexture : require('./lib/compressTexture'),
     compressTextureCoordinates : require('./lib/compressTextureCoordinates'),
+    compressTextures : require('./lib/compressTextures'),
     convertDagToTree : require('./lib/convertDagToTree'),
     encodeImages : require('./lib/encodeImages'),
     findAccessorMinMax : require('./lib/findAccessorMinMax'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gltf-pipeline",
-  "version": "0.1.0-alpha10",
+  "version": "0.1.0-alpha11",
   "description": "Content pipeline tools for optimizing glTF assets.",
   "license": "Apache-2.0",
   "contributors": [
@@ -52,13 +52,11 @@
     "jshint": "^2.9.4",
     "jshint-stylish": "^2.2.1",
     "open": "^0.0.5",
-    "requirejs": "^2.3.2",
-    "typings": "^2.0.0"
+    "requirejs": "^2.3.2"
   },
   "scripts": {
     "build-cesium": "gulp build-cesium",
     "build-cesium-combine": "gulp build-cesium-combine",
-    "prepublish": "typings install",
     "jsdoc": "jsdoc ./lib -R ./README.md -d doc",
     "jsHint": "gulp jsHint",
     "jsHint-watch": "gulp jsHint-watch",