diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index b47fa68..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @lilleyse diff --git a/CHANGES.md b/CHANGES.md index 7f43c03..a4b64e7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,13 @@ Change Log ========== -### 2.1.0 ??? +### 2.1.0 2017-12-28 +* Fixed loading faces that contain less than 3 vertices. [#120](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/120) +* Attempt to load missing materials and textures from within the same directory as the obj. [#117](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/117) +* Fixed loading mtllib paths that contain spaces. [#116](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/116) +* Fixed checking for transparency when the diffuse texture is used in another texture slot. [#115](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/115) +* Fixed parsing mtl textures that contain texture map options. [#109](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/109) * Added back support for the `CONSTANT` technique when a model uses the `KHR_materials_common` extension and has no normals. [#108](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/108) * Improved handling of materials with alpha. If the alpha value is 0.0 it is now treated as 1.0. [#107](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/107) diff --git a/lib/outsideDirectory.js b/lib/outsideDirectory.js index df2c8a1..db42085 100644 --- a/lib/outsideDirectory.js +++ b/lib/outsideDirectory.js @@ -9,6 +9,8 @@ module.exports = outsideDirectory; * @param {String} file Path to the file. * @param {String} directory Path to the directory. * @returns {Boolean} Whether the file is outside of the directory. + * + * @private */ function outsideDirectory(file, directory) { return (path.relative(directory, file).indexOf('..') === 0); diff --git a/package.json b/package.json index f6e9fd1..eda5360 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obj2gltf", - "version": "2.0.0", + "version": "2.1.0", "description": "Convert OBJ model format to glTF", "license": "Apache-2.0", "contributors": [