diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js index 1578016..2d53be3 100644 --- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js +++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js @@ -19,7 +19,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasGraphicsRenderer { @@ -35,7 +34,6 @@ * Renders a Graphics object to a canvas. * * @param {PIXI.Graphics} graphics - the actual graphics object to render - * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas */ render(graphics) { diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js index 1578016..2d53be3 100644 --- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js +++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js @@ -19,7 +19,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasGraphicsRenderer { @@ -35,7 +34,6 @@ * Renders a Graphics object to a canvas. * * @param {PIXI.Graphics} graphics - the actual graphics object to render - * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas */ render(graphics) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index e1ce9ce..df3bef2 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -508,7 +508,6 @@ * Handles a restored webgl context * * @private - * @param {WebGLContextEvent} event - The context restored event. */ handleContextRestored() { diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js index 1578016..2d53be3 100644 --- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js +++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js @@ -19,7 +19,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasGraphicsRenderer { @@ -35,7 +34,6 @@ * Renders a Graphics object to a canvas. * * @param {PIXI.Graphics} graphics - the actual graphics object to render - * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas */ render(graphics) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index e1ce9ce..df3bef2 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -508,7 +508,6 @@ * Handles a restored webgl context * * @private - * @param {WebGLContextEvent} event - The context restored event. */ handleContextRestored() { diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js index 18f6311..61245e8 100644 --- a/src/core/renderers/webgl/managers/MaskManager.js +++ b/src/core/renderers/webgl/managers/MaskManager.js @@ -3,6 +3,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class MaskManager extends WebGLManager diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js index 1578016..2d53be3 100644 --- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js +++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js @@ -19,7 +19,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasGraphicsRenderer { @@ -35,7 +34,6 @@ * Renders a Graphics object to a canvas. * * @param {PIXI.Graphics} graphics - the actual graphics object to render - * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas */ render(graphics) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index e1ce9ce..df3bef2 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -508,7 +508,6 @@ * Handles a restored webgl context * * @private - * @param {WebGLContextEvent} event - The context restored event. */ handleContextRestored() { diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js index 18f6311..61245e8 100644 --- a/src/core/renderers/webgl/managers/MaskManager.js +++ b/src/core/renderers/webgl/managers/MaskManager.js @@ -3,6 +3,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class MaskManager extends WebGLManager diff --git a/src/core/renderers/webgl/managers/StencilManager.js b/src/core/renderers/webgl/managers/StencilManager.js index 5876939..70ff230 100644 --- a/src/core/renderers/webgl/managers/StencilManager.js +++ b/src/core/renderers/webgl/managers/StencilManager.js @@ -2,6 +2,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class StencilManager extends WebGLManager diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js index 1578016..2d53be3 100644 --- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js +++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js @@ -19,7 +19,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasGraphicsRenderer { @@ -35,7 +34,6 @@ * Renders a Graphics object to a canvas. * * @param {PIXI.Graphics} graphics - the actual graphics object to render - * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas */ render(graphics) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index e1ce9ce..df3bef2 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -508,7 +508,6 @@ * Handles a restored webgl context * * @private - * @param {WebGLContextEvent} event - The context restored event. */ handleContextRestored() { diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js index 18f6311..61245e8 100644 --- a/src/core/renderers/webgl/managers/MaskManager.js +++ b/src/core/renderers/webgl/managers/MaskManager.js @@ -3,6 +3,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class MaskManager extends WebGLManager diff --git a/src/core/renderers/webgl/managers/StencilManager.js b/src/core/renderers/webgl/managers/StencilManager.js index 5876939..70ff230 100644 --- a/src/core/renderers/webgl/managers/StencilManager.js +++ b/src/core/renderers/webgl/managers/StencilManager.js @@ -2,6 +2,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class StencilManager extends WebGLManager diff --git a/src/core/sprites/canvas/CanvasSpriteRenderer.js b/src/core/sprites/canvas/CanvasSpriteRenderer.js index b51bb02..d2ab0c4 100644 --- a/src/core/sprites/canvas/CanvasSpriteRenderer.js +++ b/src/core/sprites/canvas/CanvasSpriteRenderer.js @@ -23,7 +23,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasSpriteRenderer { diff --git a/.gitignore b/.gitignore index b11702a..23731fd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ docs/ examples_old/ bin/ +coverage/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b41dd75..218b90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ - Xvfb :99 -screen 0 1024x768x24 -extension RANDR & script: + - xvfb-maybe npm run coverage - npm run build - - xvfb-maybe npm test - npm run docs deploy: + # Deploy config for non-tag branches - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -37,10 +38,12 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: bin upload-dir: "$TRAVIS_BRANCH" on: all_branches: true + condition: -z $TRAVIS_TAG - provider: s3 access_key_id: $S3_ACCESS_KEY_ID secret_access_key: $S3_SECRET_ACCESS_KEY @@ -48,7 +51,62 @@ skip_cleanup: true acl: public_read region: eu-west-1 + cache_control: "max-age=60" local_dir: docs upload-dir: "$TRAVIS_BRANCH/docs" on: all_branches: true + condition: -z $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=60" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: -z $TRAVIS_TAG + # Deploy config for tagged releases + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: bin + upload-dir: "$TRAVIS_BRANCH" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: docs + upload-dir: "$TRAVIS_BRANCH/docs" + on: + all_branches: true + condition: $TRAVIS_TAG + - provider: s3 + access_key_id: $S3_ACCESS_KEY_ID + secret_access_key: $S3_SECRET_ACCESS_KEY + bucket: "pixi-builds" + skip_cleanup: true + acl: public_read + region: eu-west-1 + cache_control: "max-age=2592000" + local_dir: coverage + upload-dir: "$TRAVIS_BRANCH/coverage" + on: + all_branches: true + condition: $TRAVIS_TAG diff --git a/README.md b/README.md index 5248e24..74311f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ hardware acceleration without prior knowledge of WebGL. Also, it's fast. Really fast. If you want to keep up to date with the latest pixi.js news then feel free to follow us on twitter -([@doormat23](https://twitter.com/doormat23), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) +([@doormat23](https://twitter.com/doormat23), [@rolnaaba](https://twitter.com/rolnaaba), [@bigtimebuddy](https://twitter.com/bigtimebuddy), [@ivanpopelyshev](https://twitter.com/ivanpopelyshev)) and we will keep you posted! You can also check back on [our site](http://www.goodboydigital.com/blog) as any breakthroughs will be posted up there too! diff --git a/package.json b/package.json index 056a353..94b3ffa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pixi.js", - "version": "4.0.2", + "version": "4.0.3", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "author": "Mat Groves", "contributors": [ @@ -23,8 +23,10 @@ "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", "watch": "pixify -n PIXI -o pixi -w", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", - "test": "floss --path test/index.js", + "test": "floss --path test/index.js -c bin/pixi.js -s", "test:debug": "npm test -- --debug", + "precoverage": "rimraf coverage && npm run build -- --noExternal", + "coverage": "npm test -- -h", "lint": "eslint scripts src test", "prebuild": "npm run lint && npm run clean", "build": "pixify -n PIXI -o pixi", @@ -46,12 +48,12 @@ "dependencies": { "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", - "eventemitter3": "^1.1.1", + "eventemitter3": "^2.0.0", "glslify": "^5.0.2", "ismobilejs": "^0.4.0", "object-assign": "^4.0.1", "pixi-gl-core": "^1.0.2", - "resource-loader": "^1.6.4", + "resource-loader": "^1.8.0", "browserify-versionify": "^1.0.6" }, "devDependencies": { @@ -60,14 +62,14 @@ "del": "^2.2.0", "electron-prebuilt": "^1.3.2", "eslint": "^3.5.0", - "floss": "^0.7.1", + "floss": "^1.2.0", "gh-pages": "^0.11.0", "jaguarjs-jsdoc": "^1.0.1", - "jsdoc": "^3.4.0", + "jsdoc": "git+https://github.com/jsdoc3/jsdoc.git#releases/3.4", "minimist": "^1.2.0", "mkdirp": "^0.5.1", "parallelshell": "^2.0.0", - "pixify": "^1.4.0", + "pixify": "^1.5.0", "rimraf": "^2.5.3", "watch": "^0.19.1" }, diff --git a/src/core/Shader.js b/src/core/Shader.js index 174df2e..7846567 100644 --- a/src/core/Shader.js +++ b/src/core/Shader.js @@ -27,6 +27,7 @@ * Adds precision string if vertexSrc or fragmentSrc have no mention of it. * * @class + * @extends GLShader * @memberof PIXI */ export default class Shader extends GLShader diff --git a/src/core/display/Container.js b/src/core/display/Container.js index 89e10a1..fa978cd 100644 --- a/src/core/display/Container.js +++ b/src/core/display/Container.js @@ -190,7 +190,7 @@ /** * Removes a child from the container. * - * @param {...PIXI.DisplayObject} child - The DisplayObject(s) to remove + * @param {...PIXI.DisplayObject} childs - The DisplayObject(s) to remove * @return {PIXI.DisplayObject} The first child that was removed. */ removeChild(...childs) diff --git a/src/core/display/DisplayObject.js b/src/core/display/DisplayObject.js index 6d7c02a..d5a2448 100644 --- a/src/core/display/DisplayObject.js +++ b/src/core/display/DisplayObject.js @@ -207,7 +207,7 @@ /** * Retrieves the local bounds of the displayObject as a rectangle object * - * @param {PIXI.Rectangle} rect - Optional rectangle to store the result of the bounds calculation + * @param {PIXI.Rectangle} [rect] - Optional rectangle to store the result of the bounds calculation * @return {PIXI.Rectangle} the rectangular bounding area */ getLocalBounds(rect) diff --git a/src/core/graphics/Graphics.js b/src/core/graphics/Graphics.js index 151b022..0a77d03 100644 --- a/src/core/graphics/Graphics.js +++ b/src/core/graphics/Graphics.js @@ -794,7 +794,7 @@ this._spriteRect.transform.worldTransform = this.transform.worldTransform; this._spriteRect.anchor.set(-rect.x / rect.width, -rect.y / rect.height); - this._spriteRect.onAnchorUpdate(); + this._spriteRect._onAnchorUpdate(); this._spriteRect._renderWebGL(renderer); } diff --git a/src/core/graphics/canvas/CanvasGraphicsRenderer.js b/src/core/graphics/canvas/CanvasGraphicsRenderer.js index 1578016..2d53be3 100644 --- a/src/core/graphics/canvas/CanvasGraphicsRenderer.js +++ b/src/core/graphics/canvas/CanvasGraphicsRenderer.js @@ -19,7 +19,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasGraphicsRenderer { @@ -35,7 +34,6 @@ * Renders a Graphics object to a canvas. * * @param {PIXI.Graphics} graphics - the actual graphics object to render - * @param {CanvasRenderingContext2D} context - the 2d drawing method of the canvas */ render(graphics) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index e1ce9ce..df3bef2 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -508,7 +508,6 @@ * Handles a restored webgl context * * @private - * @param {WebGLContextEvent} event - The context restored event. */ handleContextRestored() { diff --git a/src/core/renderers/webgl/managers/MaskManager.js b/src/core/renderers/webgl/managers/MaskManager.js index 18f6311..61245e8 100644 --- a/src/core/renderers/webgl/managers/MaskManager.js +++ b/src/core/renderers/webgl/managers/MaskManager.js @@ -3,6 +3,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class MaskManager extends WebGLManager diff --git a/src/core/renderers/webgl/managers/StencilManager.js b/src/core/renderers/webgl/managers/StencilManager.js index 5876939..70ff230 100644 --- a/src/core/renderers/webgl/managers/StencilManager.js +++ b/src/core/renderers/webgl/managers/StencilManager.js @@ -2,6 +2,7 @@ /** * @class + * @extends PIXI.WebGLManager * @memberof PIXI */ export default class StencilManager extends WebGLManager diff --git a/src/core/sprites/canvas/CanvasSpriteRenderer.js b/src/core/sprites/canvas/CanvasSpriteRenderer.js index b51bb02..d2ab0c4 100644 --- a/src/core/sprites/canvas/CanvasSpriteRenderer.js +++ b/src/core/sprites/canvas/CanvasSpriteRenderer.js @@ -23,7 +23,6 @@ * @class * @private * @memberof PIXI - * @extends PIXI.ObjectRenderer */ export default class CanvasSpriteRenderer { diff --git a/src/core/text/Text.js b/src/core/text/Text.js index 38841dd..0c85a5e 100644 --- a/src/core/text/Text.js +++ b/src/core/text/Text.js @@ -35,6 +35,10 @@ constructor(text, style) { const canvas = document.createElement('canvas'); + + canvas.width = 16; + canvas.height = 16; + const texture = Texture.fromCanvas(canvas); texture.orig = new Rectangle();