` wrapping separated
by a line break.
```
@@ -266,17 +266,18 @@ horizontal wave pattern effected by mouse x-position & updating noise values.
```
## Template for methods
-Here is an example for a well-documentated method. To create a new method, you can use [this template](https://github.com/processing/p5.js/tree/main/contributor_docs/method.example.js). Replace the text with your method's variables and remove the remaining ones.
+Here is an example for a well-documented method. To create a new method, you can use [this template](https://github.com/processing/p5.js/tree/main/contributor_docs/method.example.js). Replace the text with your method's variables and remove the remaining ones.
+
## Generating documentation
-* Run `grunt yui:build` once first to generate all local files needed, as well as a copy of the reference from the source code. Run it again anytime you make changes to the core JS files behind the yuidoc reference page. These are changes in files located in the yuidoc-p5-theme-src folder, NOT inline documentation changes to src.
-* If you only made changes to the source code, you can just run `grunt yui`, though `grunt yui:build` will also do the trick.
+* Run `npm run grunt yui:build` once first to generate all local files needed, as well as a copy of the reference from the source code. Run it again anytime you make changes to the core JS files behind the yuidoc reference page. These are changes in files located in the yuidoc-p5-theme folder, NOT inline documentation changes to src.
+* If you only made changes to the source code, you can just run `npm run grunt yui`, though `npm run grunt yui:build` will also do the trick.
* You can run `npm run docs:dev` to launch a live preview of the site that will update each time you make changes. (You will need to refresh the page after making changes to see them appear.)
-The build reference can be found in docs/reference. To preview it locally, run `grunt yui:dev` and view it as http://localhost:9001/docs/reference/.
+The build reference can be found in docs/reference. To preview it locally, run `npm run grunt yui:dev` and view it as http://localhost:9001/docs/reference/.
## Spanish language version
diff --git a/contributor_docs/ko/inline_documentation.md b/contributor_docs/ko/inline_documentation.md
index a33c920d03..8cba28438c 100644
--- a/contributor_docs/ko/inline_documentation.md
+++ b/contributor_docs/ko/inline_documentation.md
@@ -271,11 +271,11 @@ horizontal wave pattern effected by mouse x-position & updating noise values.
## 문서 생성
-* 먼저 `grunt yui:build`를 한 번 실행하여 필요한 모든 로컬 파일과 소스 코드의 참조 사본을 생성합니다. yuidoc 레퍼런스 페이지 뒤에서 코어 JS 파일을 변경할 때마다 다시 실행해주세요. 이는 src의 인라인 문서 변경이 아니라 yuidoc-p5-theme-src 폴더에있는 파일에 대한 변경 사항입니다.
-* 소스 코드만 변경했다면 `grunt yui`만 실행할 수 있지만 `grunt yui:build`도 사용할 수 있습니다.
+* 먼저 `npm run grunt yui:build`를 한 번 실행하여 필요한 모든 로컬 파일과 소스 코드의 참조 사본을 생성합니다. yuidoc 레퍼런스 페이지 뒤에서 코어 JS 파일을 변경할 때마다 다시 실행해주세요. 이는 src의 인라인 문서 변경이 아니라 yuidoc-p5-theme-src 폴더에있는 파일에 대한 변경 사항입니다.
+* 소스 코드만 변경했다면 `npm run grunt yui`만 실행할 수 있지만 `npm run grunt yui:build`도 사용할 수 있습니다.
* `npm run docs:dev`를 실행하여 변경할 때마다 업데이트되는 사이트의 실시간 미리보기를 할 수 있습니다.(변경 한 후 페이지를 새로고침해야 표시됩니다.)
-빌드 레퍼런스는 docs/reference에서 찾을 수 있으며. 로컬에서 미리 보려면 `grunt yui:dev`를 실행해 http://localhost:9001/docs/reference/ 에서 살펴보세요.
+빌드 레퍼런스는 docs/reference에서 찾을 수 있으며. 로컬에서 미리 보려면 `npm run grunt yui:dev`를 실행해 http://localhost:9001/docs/reference/ 에서 살펴보세요.
## 스페인어 버전
diff --git a/contributor_docs/release_process.md b/contributor_docs/release_process.md
index 5bfc23eba1..fe2952f707 100644
--- a/contributor_docs/release_process.md
+++ b/contributor_docs/release_process.md
@@ -39,6 +39,6 @@ In the case where you have push access to the repositories:
In the case where you don't have push access to the repositories:
* You will need to edit the `name` field of `package.json` to a namespaced version, eg. `@username/p5` and commit this change into git before running `npm run release -- --preview` as usual. When prompted just choose not to publish the package to the namespaced packaged on NPM, nothing will be published online.
-* You can do a full test run of the release with `npm run release` provided you have edited the `name` field of `package.json`. To choose where to clone and push the Bower release and website repositories from, you can set them by specifiying additional arguments like so: `npm run release -- --bowerReleaser=username --docsReleaser=username`.
+* You can do a full test run of the release with `npm run release` provided you have edited the `name` field of `package.json`. To choose where to clone and push the Bower release and website repositories from, you can set them by specifying additional arguments like so: `npm run release -- --bowerReleaser=username --docsReleaser=username`.
__NOTE:__ `np` (`6.2.0`) currently has a [bug](https://github.com/sindresorhus/np/issues/508) that prevents release to namespaced package name, you can revert to `5.2.1` if you must test this otherwise it will fail at the publish step.
\ No newline at end of file
diff --git a/contributor_docs/unit_testing.md b/contributor_docs/unit_testing.md
index 88f29e94ba..e060752fa6 100644
--- a/contributor_docs/unit_testing.md
+++ b/contributor_docs/unit_testing.md
@@ -40,7 +40,7 @@ Now when you use `npm test`, only tests within that `function()` body will be ru
This feature is the inverse of `.only()`. By appending `.skip()`, you may tell Mocha to simply ignore these suite(s) and test case(s). Anything skipped will be marked as pending, and reported as such.
-## Infrastucture
+## Infrastructure
### Frameworks
@@ -78,7 +78,7 @@ If you have to add a test file for a module to `test/unit`, then you'll also nee
### Writing Unit Tests
-Pick a unit, it can be a method or a variable to test. Lets use `p5.prototype.isKeyPressed` as an example. Before beginning to write tests, we need to understand the expected behaviour of this method.
+Pick a unit, it can be a method or a variable to test. Lets use `p5.prototype.keyIsPressed` as an example. Before beginning to write tests, we need to understand the expected behaviour of this method.
**Expected behaviour:** The boolean system variable should be true if any key is pressed and false if no keys are pressed.
Now you can think of various tests against this expected behaviour. Possible test cases could be:
@@ -89,7 +89,7 @@ Now you can think of various tests against this expected behaviour. Possible tes
- it should be false if no keys are pressed
- if you can think of more, go ahead and add tests for them!
-We can create a test suite for `p5.prototype.isKeyPressed` and start creating tests for it. We will use mocha for structuring our unit tests.
+We can create a test suite for `p5.prototype.keyIsPressed` and start creating tests for it. We will use mocha for structuring our unit tests.
```
suite('p5.prototype.keyIsPressed', function() {
diff --git a/contributor_docs/zh/contributing_documentation.md b/contributor_docs/zh/contributing_documentation.md
new file mode 100644
index 0000000000..0eb9bfcc4a
--- /dev/null
+++ b/contributor_docs/zh/contributing_documentation.md
@@ -0,0 +1,36 @@
+文档对于新的学习者和有经验的程序员来说都是必不可少的。它通过向那些不太熟悉p5.js的人伸出友好之手，帮助我们的社区变得更包容。它还能帮助我们找到代码本身的bug和问题，因为我们在文档中测试和尝试一些东西。
+
+有几种方法可以为文档做出贡献：
+
+## ☝️ Open issues
+如果你刚刚开始，一个非常有帮助的方式是通过打开文档需求的问题。如果你注意到一个错别字、一个缺失或损坏的例子、或者一个令人困惑的函数描述，[为它打开一个 issue](https://github.com/processing/p5.js/issues)！请附上需要修复的页面的链接，以便我们可以很容易地找到。
+
+## 🗯 为参考资料作出贡献
+仔细阅读[参考文献](http://p5js.org/reference/)，看看是否有错别字、损坏的例子或混乱的文档。如果是简单的修复，您可以直接修改。如果是需要讨论的问题，请创建一个 [issue](https://github.com/processing/p5.js/issues/new)。
+* 这里是[为初次使用p5.js代码库进行设置](./README.md)的说明。
+* 参考文献是根据源代码中的内联文档（在`src/`文件夹中找到）建立的。
+* 这里是关于[如何更新或添加内联文档和例子](./inline_documentation.md)的信息。
+* 如果你发现[西班牙语文档](http://p5js.org/es)有错误，在[这里](https://github.com/processing/p5.js-website#internationalization-i18n-and-structure)能找到更新指示。
+* 社区维护的Typescript定义在[此处](https://github.com/p5-types/p5.ts)。
+
+## ✨ 制作示例
+虽然参考文的例子通常是非常简单的代码片段，但更长、更复杂的示例也是有用的。
+* 目前我们正在努力将[processing示例页](https://processing.org/examples/)中的示例移植到[p5.js示例页](http://p5js.org/examples)。如果你愿意帮忙，请看说明[这里](https://github.com/processing/p5.js-website/blob/main/contributor_docs/Adding_examples.md)。
+* 或者，你可以创建你自己的示例，并在你喜欢的地方独立发布。如果你在网上分享它们，请标记[@p5xjs](https://twitter.com/p5xjs)或发送电子邮件到[hello@p5js.org](mailto:hello@p5js.org)让我们知道，我们将广泛分享! 这个[嵌入p5.js指南](https://github.com/processing/p5.js/wiki/Embedding-p5.js)可能对你在网上发布你的示例很有用。
+* 如果你发现p5.js中的bug，请在[issues](https://github.com/processing/p5.js/issues)中记录下来。
+
+## 👯 制作教程
+* 如果你是p5.js的新手，这是一个很好开始的地方。试着自己做一些东西，然后做一个教程来教别人做。
+* 目前，我们正在努力将教程从[processing教程页](https://processing.org/tutorials)移植到[p5.js学习页](http://p5js.org/learn)。如果你愿意帮忙，请看[这个](https://p5js.org/learn/tutorial-guide.html)教程制作教程。
+* 我们也欢迎不同主题的教程。你可以在任何地方，以任何格式发布这些教程。如果您在网上分享这些教程，请给[@p5xjs](https://twitter.com/p5xjs)打上标签，或者给[hello@p5js.org](mailto:hello@p5js.org)发邮件，让我们知道，我们会广泛地分享这些教程。我们特别鼓励针对特定受众或使用案例创建的教程（例如：记者、维权人士、诗人、孩子、老人、梦想家、不同语言的p5等等）。我们喜欢考虑，谁还没有感觉到自己在p5社区中受到欢迎或融入，我们能否把学习作为一种邀请？你用什么语言和你的听众沟通，让他们感到被了解？请自由尝试你的形式。可以参考[Sharon De La Cruz关于代码俚语的演讲](https://www.youtube.com/watch?v=CFT6w9NKfCs)获得灵感。
+* 如果你发现p5.js中的bug，请在[issues](https://github.com/processing/p5.js/issues)中记录下来。
+
+## 👉 开始
+* 阅读[p5.js社区声明](http://p5js.org/community/)
+* 可选：查看[贡献者文档](./README.md)以了解版本库的概况，并学习如何构建代码(如果与你相关的话)。
+* 所有的讨论都发生在github issue上，所以你不需要加入slack/gitter/等等频道。
+* 在readme.md文件中把你的名字加入[贡献者名单](https://github.com/processing/p5.js#contributors)! 说明[在此](https://github.com/processing/p5.js/issues/2309)。
+* 当然，如果你更喜欢修复bug，可以随时跳进任何一个[issue](https://github.com/processing/p5.js/issues)!
+
+欢迎！我们很高兴你在这里！
+❤️ p5.js社区
diff --git a/package-lock.json b/package-lock.json
index 09a6dbdec7..40991b753d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1771,6 +1771,16 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true
},
+ "@types/yauzl": {
+ "version": "2.9.1",
+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+ "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
"JSONStream": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
@@ -1858,13 +1868,10 @@
"dev": true
},
"agent-base": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
- "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
- "dev": true,
- "requires": {
- "es6-promisify": "^5.0.0"
- }
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+ "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+ "dev": true
},
"ajv": {
"version": "5.5.2",
@@ -3652,8 +3659,7 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
"integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
- "dev": true,
- "optional": true
+ "dev": true
},
"ci-info": {
"version": "2.0.0",
@@ -4619,6 +4625,12 @@
"minimist": "^1.1.1"
}
},
+ "devtools-protocol": {
+ "version": "0.0.818844",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+ "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
+ "dev": true
+ },
"didyoumean": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz",
@@ -4891,15 +4903,6 @@
"integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
"dev": true
},
- "es6-promisify": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
- "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
- "dev": true,
- "requires": {
- "es6-promise": "^4.0.3"
- }
- },
"es6-set": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@@ -5659,28 +5662,40 @@
}
},
"extract-zip": {
- "version": "1.6.7",
- "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
- "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
"dev": true,
"requires": {
- "concat-stream": "1.6.2",
- "debug": "2.6.9",
- "mkdirp": "0.5.1",
- "yauzl": "2.4.1"
+ "@types/yauzl": "^2.9.1",
+ "debug": "^4.1.1",
+ "get-stream": "^5.1.0",
+ "yauzl": "^2.10.0"
},
"dependencies": {
- "concat-stream": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
- "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+ "debug": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true,
"requires": {
- "buffer-from": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^2.2.2",
- "typedarray": "^0.0.6"
+ "ms": "2.1.2"
}
+ },
+ "get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
}
}
},
@@ -5798,9 +5813,9 @@
}
},
"fd-slicer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
- "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
"dev": true,
"requires": {
"pend": "~1.2.0"
@@ -7299,22 +7314,22 @@
"dev": true
},
"https-proxy-agent": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
- "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+ "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
"dev": true,
"requires": {
- "agent-base": "^4.3.0",
- "debug": "^3.1.0"
+ "agent-base": "5",
+ "debug": "4"
},
"dependencies": {
"debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true,
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
"ms": {
@@ -7630,9 +7645,9 @@
"dev": true
},
"ini": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
- "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+ "version": "1.3.7",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+ "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
"dev": true
},
"inline-source-map": {
@@ -12153,7 +12168,7 @@
},
"find-up": {
"version": "3.0.0",
- "resolved": false,
+ "resolved": "",
"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
"dev": true,
"requires": {
@@ -12168,7 +12183,7 @@
},
"is-fullwidth-code-point": {
"version": "2.0.0",
- "resolved": false,
+ "resolved": "",
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
@@ -12196,7 +12211,7 @@
},
"resolve-from": {
"version": "4.0.0",
- "resolved": false,
+ "resolved": "",
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
"dev": true
},
@@ -12234,7 +12249,7 @@
},
"which-module": {
"version": "2.0.0",
- "resolved": false,
+ "resolved": "",
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
@@ -12251,7 +12266,7 @@
},
"y18n": {
"version": "4.0.0",
- "resolved": false,
+ "resolved": "",
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
"dev": true
},
@@ -13219,9 +13234,9 @@
}
},
"proxy-from-env": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
- "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
"dev": true
},
"pseudomap": {
@@ -13284,35 +13299,52 @@
}
},
"puppeteer": {
- "version": "1.20.0",
- "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz",
- "integrity": "sha512-bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ==",
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz",
+ "integrity": "sha512-OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==",
"dev": true,
"requires": {
"debug": "^4.1.0",
- "extract-zip": "^1.6.6",
- "https-proxy-agent": "^2.2.1",
- "mime": "^2.0.3",
+ "devtools-protocol": "0.0.818844",
+ "extract-zip": "^2.0.0",
+ "https-proxy-agent": "^4.0.0",
+ "node-fetch": "^2.6.1",
+ "pkg-dir": "^4.2.0",
"progress": "^2.0.1",
"proxy-from-env": "^1.0.0",
- "rimraf": "^2.6.1",
- "ws": "^6.1.0"
+ "rimraf": "^3.0.2",
+ "tar-fs": "^2.0.0",
+ "unbzip2-stream": "^1.3.3",
+ "ws": "^7.2.3"
},
"dependencies": {
"debug": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
- "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true,
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.2"
}
},
- "mime": {
- "version": "2.4.4",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
- "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
- "dev": true
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
},
"ms": {
"version": "2.1.2",
@@ -13320,20 +13352,65 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
+ "node-fetch": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+ "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+ "dev": true
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
+ "pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "requires": {
+ "find-up": "^4.0.0"
+ }
+ },
"progress": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
"dev": true
},
- "ws": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
- "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+ "rimraf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
"dev": true,
"requires": {
- "async-limiter": "~1.0.0"
+ "glob": "^7.1.3"
}
+ },
+ "ws": {
+ "version": "7.4.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz",
+ "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==",
+ "dev": true
}
}
},
@@ -15569,7 +15646,6 @@
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
"integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
"dev": true,
- "optional": true,
"requires": {
"chownr": "^1.1.1",
"mkdirp": "^0.5.1",
@@ -15582,7 +15658,6 @@
"resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz",
"integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==",
"dev": true,
- "optional": true,
"requires": {
"readable-stream": "^3.0.1"
}
@@ -15592,7 +15667,6 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
"integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
"dev": true,
- "optional": true,
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -15603,15 +15677,13 @@
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
- "dev": true,
- "optional": true
+ "dev": true
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "~5.2.0"
}
@@ -15621,7 +15693,6 @@
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz",
"integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==",
"dev": true,
- "optional": true,
"requires": {
"bl": "^3.0.0",
"end-of-stream": "^1.4.1",
@@ -16048,6 +16119,16 @@
"integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
"dev": true
},
+ "unbzip2-stream": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+ "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+ "dev": true,
+ "requires": {
+ "buffer": "^5.2.1",
+ "through": "^2.3.8"
+ }
+ },
"unc-path-regex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -16892,12 +16973,13 @@
}
},
"yauzl": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
- "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
"dev": true,
"requires": {
- "fd-slicer": "~1.0.1"
+ "buffer-crc32": "~0.2.3",
+ "fd-slicer": "~1.1.0"
}
},
"yui": {
diff --git a/package.json b/package.json
index af48339e86..7ae46700d8 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
"opentype.js": "^0.9.0",
"prettier": "^1.7.4",
"promise-map-series": "^0.2.3",
- "puppeteer": "^1.20.0",
+ "puppeteer": "^5.5.0",
"regenerator-runtime": "^0.13.3",
"release-it": "^12.6.2",
"request": "^2.88.0",
diff --git a/src/color/p5.Color.js b/src/color/p5.Color.js
index 8832386db8..6eda86a0c1 100644
--- a/src/color/p5.Color.js
+++ b/src/color/p5.Color.js
@@ -104,7 +104,7 @@ p5.Color.prototype.toString = function(format) {
a[0] < 16 ? '0'.concat(a[0].toString(16)) : a[0].toString(16),
a[1] < 16 ? '0'.concat(a[1].toString(16)) : a[1].toString(16),
a[2] < 16 ? '0'.concat(a[2].toString(16)) : a[2].toString(16),
- a[3] < 16 ? '0'.concat(a[2].toString(16)) : a[3].toString(16)
+ a[3] < 16 ? '0'.concat(a[3].toString(16)) : a[3].toString(16)
);
case '#rgb':
diff --git a/src/core/internationalization.js b/src/core/internationalization.js
index 55f79576e5..7c98055182 100644
--- a/src/core/internationalization.js
+++ b/src/core/internationalization.js
@@ -140,7 +140,12 @@ export const initialize = () => {
escapeValue: false
},
detection: {
- checkWhitelist: false
+ checkWhitelist: false,
+
+ // prevent storing or locating language from cookie or localStorage
+ // more info on https://github.com/processing/p5.js/issues/4862
+ order: ['querystring', 'navigator', 'htmlTag', 'path', 'subdomain'],
+ caches: []
},
backend: {
fallback: 'en',
diff --git a/src/core/main.js b/src/core/main.js
index cebb712d59..fd5b1ad0a4 100644
--- a/src/core/main.js
+++ b/src/core/main.js
@@ -166,12 +166,6 @@ class p5 {
// PRIVATE p5 PROPERTIES AND METHODS
//////////////////////////////////////////////
- this._accessibleOutputs = {
- text: false,
- grid: false,
- textLabel: false,
- gridLabel: false
- };
this._setupDone = false;
// for handling hidpi
this._pixelDensity = Math.ceil(window.devicePixelRatio) || 1;
@@ -583,6 +577,13 @@ class p5 {
}
_initializeInstanceVariables() {
+ this._accessibleOutputs = {
+ text: false,
+ grid: false,
+ textLabel: false,
+ gridLabel: false
+ };
+
this._styles = [];
this._bezierDetail = 20;
diff --git a/src/core/shape/2d_primitives.js b/src/core/shape/2d_primitives.js
index 081ac1ad01..9819ce252a 100644
--- a/src/core/shape/2d_primitives.js
+++ b/src/core/shape/2d_primitives.js
@@ -488,6 +488,8 @@ p5.prototype.point = function(...args) {
* @param {Number} y3 the y-coordinate of the third point
* @param {Number} x4 the x-coordinate of the fourth point
* @param {Number} y4 the y-coordinate of the fourth point
+ * @param {Integer} [detailX] number of segments in the x-direction
+ * @param {Integer} [detailY] number of segments in the y-direction
* @chainable
* @example
*
@@ -513,13 +515,15 @@ p5.prototype.point = function(...args) {
* @param {Number} x4
* @param {Number} y4
* @param {Number} z4 the z-coordinate of the fourth point
+ * @param {Integer} [detailX]
+ * @param {Integer} [detailY]
* @chainable
*/
p5.prototype.quad = function(...args) {
p5._validateParameters('quad', args);
if (this._renderer._doStroke || this._renderer._doFill) {
- if (this._renderer.isP3D && args.length !== 12) {
+ if (this._renderer.isP3D && args.length <= 12) {
// if 3D and we weren't passed 12 args, assume Z is 0
// prettier-ignore
this._renderer.quad.call(
@@ -527,7 +531,8 @@ p5.prototype.quad = function(...args) {
args[0], args[1], 0,
args[2], args[3], 0,
args[4], args[5], 0,
- args[6], args[7], 0);
+ args[6], args[7], 0,
+ args[8], args[9]);
} else {
this._renderer.quad(...args);
//accessibile outputs
diff --git a/src/dom/dom.js b/src/dom/dom.js
index e2d04beb57..275f4a8c09 100644
--- a/src/dom/dom.js
+++ b/src/dom/dom.js
@@ -79,19 +79,20 @@ p5.prototype.select = function(e, p) {
* , or HTML element to search within
* @return {p5.Element[]} Array of
p5.Elements containing nodes found
* @example
- *
+ *
* function setup() {
* createButton('btn');
* createButton('2nd btn');
* createButton('3rd btn');
* let buttons = selectAll('button');
*
- * for (let i = 0; i < buttons.length; i++) {
- * buttons[i].size(100, 100);
+ * for (let i = 0; i < 3; i++) {
+ * buttons[i].size(100);
+ * buttons[i].position(0, i * 30);
* }
* }
*
- *
+ *
* // these are all valid calls to selectAll()
* let a = selectAll('.beep');
* a = selectAll('div');
@@ -142,9 +143,9 @@ p5.prototype._getContainer = function(p) {
* Helper function for getElement and getElements.
*/
p5.prototype._wrapElement = function(elt) {
- var children = Array.prototype.slice.call(elt.children);
+ const children = Array.prototype.slice.call(elt.children);
if (elt.tagName === 'INPUT' && elt.type === 'checkbox') {
- var converted = new p5.Element(elt, this);
+ let converted = new p5.Element(elt, this);
converted.checked = function() {
if (arguments.length === 0) {
return this.elt.checked;
@@ -178,11 +179,14 @@ p5.prototype._wrapElement = function(elt) {
* Event handlers are removed, and element is removed from the DOM.
* @method removeElements
* @example
- *
+ *
* function setup() {
* createCanvas(100, 100);
- * createDiv('this is some text');
- * createP('this is a paragraph');
+ * background('grey');
+ * let div = createDiv('this is some text');
+ * let p = createP('this is a paragraph');
+ * div.style('font-size', '16px');
+ * p.style('font-size', '16px');
* }
* function mousePressed() {
* removeElements(); // this will remove the div and p, not canvas
@@ -278,10 +282,14 @@ p5.Element.prototype.changed = function(fxn) {
* firing function will no longer fire.
* @chainable
* @example
- *
+ *
* // Open your console to see the output
* function setup() {
+ * createCanvas(100, 100);
+ * background('grey');
* let inp = createInput('');
+ * inp.position(0, 0);
+ * inp.size(100);
* inp.input(myInputEvent);
* }
*
@@ -302,9 +310,11 @@ p5.Element.prototype.input = function(fxn) {
* Helpers for create methods.
*/
function addElement(elt, pInst, media) {
- var node = pInst._userNode ? pInst._userNode : document.body;
+ const node = pInst._userNode ? pInst._userNode : document.body;
node.appendChild(elt);
- var c = media ? new p5.MediaElement(elt, pInst) : new p5.Element(elt, pInst);
+ const c = media
+ ? new p5.MediaElement(elt, pInst)
+ : new p5.Element(elt, pInst);
pInst._elements.push(c);
return c;
}
@@ -316,8 +326,10 @@ function addElement(elt, pInst, media) {
* @param {String} [html] inner HTML for element created
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
- * createDiv('this is some text');
+ *
+ * let div = createDiv('this is some text');
+ * div.style('font-size', '16px');
+ * div.position(10, 0);
*
*/
p5.prototype.createDiv = function(html = '') {
@@ -334,8 +346,10 @@ p5.prototype.createDiv = function(html = '') {
* @param {String} [html] inner HTML for element created
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
- * createP('this is some text');
+ *
+ * let p = createP('this is some text');
+ * p.style('font-size', '16px');
+ * p.position(10, 0);
*
*/
p5.prototype.createP = function(html = '') {
@@ -351,8 +365,9 @@ p5.prototype.createP = function(html = '') {
* @param {String} [html] inner HTML for element created
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
- * createSpan('this is some text');
+ *
+ * let span = createSpan('this is some text');
+ * span.position(0, 0);
*
*/
p5.prototype.createSpan = function(html = '') {
@@ -370,11 +385,12 @@ p5.prototype.createSpan = function(html = '') {
* @param {String} alt alternate text to be used if image does not load. You can use also an empty string (`""`) if that an image is not intended to be viewed.
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
- * createImg(
+ *
+ * let img = createImg(
* 'https://p5js.org/assets/img/asterisk-01.png',
* 'the p5 magenta asterisk'
* );
+ * img.position(0, -10);
*
*/
/**
@@ -387,9 +403,9 @@ p5.prototype.createSpan = function(html = '') {
*/
p5.prototype.createImg = function() {
p5._validateParameters('createImg', arguments);
- var elt = document.createElement('img');
- var args = arguments;
- var self;
+ const elt = document.createElement('img');
+ const args = arguments;
+ let self;
if (args.length > 1 && typeof args[1] === 'string') {
elt.alt = args[1];
}
@@ -401,7 +417,7 @@ p5.prototype.createImg = function() {
elt.addEventListener('load', function() {
self.width = elt.offsetWidth || elt.width;
self.height = elt.offsetHeight || elt.height;
- var last = args[args.length - 1];
+ const last = args[args.length - 1];
if (typeof last === 'function') last(self);
});
return self;
@@ -417,13 +433,14 @@ p5.prototype.createImg = function() {
* could be _blank, _self, _parent, _top.
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
- * createA('http://p5js.org/', 'this is a link');
+ *
+ * let a = createA('http://p5js.org/', 'this is a link');
+ * a.position(0, 0);
*
*/
p5.prototype.createA = function(href, html, target) {
p5._validateParameters('createA', arguments);
- var elt = document.createElement('a');
+ const elt = document.createElement('a');
elt.href = href;
elt.innerHTML = html;
if (target) elt.target = target;
@@ -474,7 +491,7 @@ p5.prototype.createA = function(href, html, target) {
*/
p5.prototype.createSlider = function(min, max, value, step) {
p5._validateParameters('createSlider', arguments);
- var elt = document.createElement('input');
+ const elt = document.createElement('input');
elt.type = 'range';
elt.min = min;
elt.max = max;
@@ -497,13 +514,13 @@ p5.prototype.createSlider = function(min, max, value, step) {
* @param {String} [value] value of the button
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
+ *
* let button;
* function setup() {
* createCanvas(100, 100);
* background(0);
* button = createButton('click me');
- * button.position(19, 19);
+ * button.position(0, 0);
* button.mousePressed(changeBG);
* }
*
@@ -515,7 +532,7 @@ p5.prototype.createSlider = function(min, max, value, step) {
*/
p5.prototype.createButton = function(label, value) {
p5._validateParameters('createButton', arguments);
- var elt = document.createElement('button');
+ const elt = document.createElement('button');
elt.innerHTML = label;
if (value) elt.value = value;
return addElement(elt, this);
@@ -530,7 +547,7 @@ p5.prototype.createButton = function(label, value) {
* @param {boolean} [value] value of the checkbox; checked is true, unchecked is false
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
+ *
* let checkbox;
*
* function setup() {
@@ -549,14 +566,14 @@ p5.prototype.createButton = function(label, value) {
*/
p5.prototype.createCheckbox = function() {
p5._validateParameters('createCheckbox', arguments);
- var elt = document.createElement('div');
- var checkbox = document.createElement('input');
+ const elt = document.createElement('div');
+ const checkbox = document.createElement('input');
checkbox.type = 'checkbox';
elt.appendChild(checkbox);
//checkbox must be wrapped in p5.Element before label so that label appears after
- var self = addElement(elt, this);
+ const self = addElement(elt, this);
self.checked = function() {
- var cb = self.elt.getElementsByTagName('input')[0];
+ const cb = self.elt.getElementsByTagName('input')[0];
if (cb) {
if (arguments.length === 0) {
return cb.checked;
@@ -573,10 +590,10 @@ p5.prototype.createCheckbox = function() {
return this;
};
if (arguments[0]) {
- var ran = Math.random()
+ const ran = Math.random()
.toString(36)
.slice(2);
- var label = document.createElement('label');
+ const label = document.createElement('label');
checkbox.setAttribute('id', ran);
label.htmlFor = ran;
self.value(arguments[0]);
@@ -779,10 +796,10 @@ p5.prototype.createSelect = function() {
*
* function setup() {
* radio = createRadio();
- * radio.option('apple', 1);
- * radio.option('bread', 2);
- * radio.option('juice', 3);
- * radio.style('width', '60px');
+ * radio.option(1, 'apple');
+ * radio.option(2, 'bread');
+ * radio.option(3, 'juice');
+ * radio.style('width', '30px');
* textAlign(CENTER);
* }
*
@@ -969,8 +986,8 @@ p5.prototype.createRadio = function() {
*/
p5.prototype.createColorPicker = function(value) {
p5._validateParameters('createColorPicker', arguments);
- var elt = document.createElement('input');
- var self;
+ const elt = document.createElement('input');
+ let self;
elt.type = 'color';
if (value) {
if (value instanceof p5.Color) {
@@ -1013,9 +1030,13 @@ p5.prototype.createColorPicker = function(value) {
* Needs a value to be specified first.
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
+ *
* function setup() {
+ * createCanvas(100, 100);
+ * background('grey');
* let inp = createInput('');
+ * inp.position(0, 0);
+ * inp.size(100);
* inp.input(myInputEvent);
* }
*
@@ -1256,7 +1277,7 @@ if (navigator.mediaDevices === undefined) {
if (navigator.mediaDevices.getUserMedia === undefined) {
navigator.mediaDevices.getUserMedia = function(constraints) {
// First get ahold of the legacy getUserMedia, if present
- var getUserMedia =
+ const getUserMedia =
navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
// Some browsers just don't implement it - return a rejected promise with an error
@@ -1301,12 +1322,12 @@ if (navigator.mediaDevices.getUserMedia === undefined) {
* stream has loaded
* @return {p5.Element} capture video p5.Element
* @example
- *
+ *
*
* let capture;
*
* function setup() {
- * createCanvas(480, 480);
+ * createCanvas(100, 100);
* capture = createCapture(VIDEO);
* capture.hide();
* }
@@ -1318,7 +1339,7 @@ if (navigator.mediaDevices.getUserMedia === undefined) {
*
*
*
- *
+ *
*
* function setup() {
* createCanvas(480, 120);
@@ -1338,7 +1359,7 @@ if (navigator.mediaDevices.getUserMedia === undefined) {
* }
*
*
- *
+ *
*
* let capture;
*
@@ -1419,13 +1440,15 @@ p5.prototype.createCapture = function() {
* @param {String} [content] html content to be inserted into the element
* @return {p5.Element} pointer to p5.Element holding created node
* @example
- *
- * createElement('h2', 'im an h2 p5.element!');
+ *
+ * let h5 = createElement('h5', 'im an h5 p5.element!');
+ * h5.style('color', '#00a1d3');
+ * h5.position(0, 0);
*
*/
p5.prototype.createElement = function(tag, content) {
p5._validateParameters('createElement', arguments);
- var elt = document.createElement(tag);
+ const elt = document.createElement(tag);
if (typeof content !== 'undefined') {
elt.innerHTML = content;
}
@@ -1626,18 +1649,18 @@ p5.Element.prototype.child = function(childNode) {
*
*/
p5.MediaElement.prototype.addCue = function(time, callback, val) {
- var id = this._cueIDCounter++;
+ const id = this._cueIDCounter++;
- var cue = new Cue(callback, time, id, val);
+ const cue = new Cue(callback, time, id, val);
this._cues.push(cue);
if (!this.elt.ontimeupdate) {
@@ -3387,7 +3415,7 @@ p5.MediaElement.prototype.addCue = function(time, callback, val) {
*
*/
p5.MediaElement.prototype.removeCue = function(id) {
- for (var i = 0; i < this._cues.length; i++) {
+ for (let i = 0; i < this._cues.length; i++) {
if (this._cues[i].id === id) {
console.log(id);
this._cues.splice(i, 1);
@@ -3441,11 +3469,11 @@ p5.MediaElement.prototype.clearCues = function() {
// private method that checks for cues to be fired if events
// have been scheduled using addCue(callback, time).
p5.MediaElement.prototype._onTimeUpdate = function() {
- var playbackTime = this.time();
+ const playbackTime = this.time();
- for (var i = 0; i < this._cues.length; i++) {
- var callbackTime = this._cues[i].time;
- var val = this._cues[i].val;
+ for (let i = 0; i < this._cues.length; i++) {
+ const callbackTime = this._cues[i].time;
+ const val = this._cues[i].val;
if (this._prevTime < callbackTime && callbackTime <= playbackTime) {
// pass the scheduled callbackTime as parameter to the callback
@@ -3476,7 +3504,7 @@ p5.File = function(file, pInst) {
// Splitting out the file type into two components
// This makes determining if image or text etc simpler
- var typeList = file.type.split('/');
+ const typeList = file.type.split('/');
/**
* File type (image, text, etc.)
*
@@ -3512,9 +3540,9 @@ p5.File = function(file, pInst) {
};
p5.File._createLoader = function(theFile, callback) {
- var reader = new FileReader();
+ const reader = new FileReader();
reader.onload = function(e) {
- var p5file = new p5.File(theFile);
+ const p5file = new p5.File(theFile);
if (p5file.file.type === 'application/json') {
// Parse JSON and store the result in data
p5file.data = JSON.parse(e.target.result);
@@ -3539,7 +3567,7 @@ p5.File._load = function(f, callback) {
} else if (!/^(video|audio)\//.test(f.type)) {
p5.File._createLoader(f, callback).readAsDataURL(f);
} else {
- var file = new p5.File(f);
+ const file = new p5.File(f);
file.data = URL.createObjectURL(f);
callback(file);
}
diff --git a/src/image/loading_displaying.js b/src/image/loading_displaying.js
index 9f80ff8721..86f705857e 100644
--- a/src/image/loading_displaying.js
+++ b/src/image/loading_displaying.js
@@ -193,9 +193,14 @@ function _createGif(
loadGIFFrameIntoImage(j, gifReader);
const imageData = new ImageData(framePixels, pImg.width, pImg.height);
pImg.drawingContext.putImageData(imageData, 0, 0);
+ let frameDelay = frameInfo.delay;
+ // To maintain the default of 10FPS when frameInfo.delay equals to 0
+ if (frameDelay === 0) {
+ frameDelay = 10;
+ }
frames.push({
image: pImg.drawingContext.getImageData(0, 0, pImg.width, pImg.height),
- delay: frameInfo.delay * 10 //GIF stores delay in one-hundredth of a second, shift to ms
+ delay: frameDelay * 10 //GIF stores delay in one-hundredth of a second, shift to ms
});
}
diff --git a/src/io/files.js b/src/io/files.js
index 9971b7c9ad..6f56238092 100644
--- a/src/io/files.js
+++ b/src/io/files.js
@@ -411,8 +411,6 @@ p5.prototype.loadTable = function(path) {
}
}
- console.log('SEP IS ' + sep);
-
const t = new p5.Table();
const self = this;
@@ -1729,14 +1727,14 @@ p5.prototype.saveTable = function(table, filename, options) {
for (j = 0; j < table.rows[i].arr.length; j++) {
if (j < table.rows[i].arr.length - 1) {
//double quotes should be inserted in csv only if contains comma separated single value
- if (ext === 'csv' && table.rows[i].arr[j].includes(',')) {
+ if (ext === 'csv' && String(table.rows[i].arr[j]).includes(',')) {
pWriter.write('"' + table.rows[i].arr[j] + '"' + sep);
} else {
pWriter.write(table.rows[i].arr[j] + sep);
}
} else {
//double quotes should be inserted in csv only if contains comma separated single value
- if (ext === 'csv' && table.rows[i].arr[j].includes(',')) {
+ if (ext === 'csv' && String(table.rows[i].arr[j]).includes(',')) {
pWriter.write('"' + table.rows[i].arr[j] + '"');
} else {
pWriter.write(table.rows[i].arr[j]);
diff --git a/src/math/calculation.js b/src/math/calculation.js
index 59c109136b..bd7bd7c15e 100644
--- a/src/math/calculation.js
+++ b/src/math/calculation.js
@@ -501,7 +501,6 @@ p5.prototype.map = function(n, start1, stop1, start2, stop2, withinBounds) {
* @return {Number}
*/
p5.prototype.max = function(...args) {
- p5._validateParameters('max', args);
if (args[0] instanceof Array) {
return Math.max.apply(null, args[0]);
} else {
@@ -550,7 +549,6 @@ p5.prototype.max = function(...args) {
* @return {Number}
*/
p5.prototype.min = function(...args) {
- p5._validateParameters('min', args);
if (args[0] instanceof Array) {
return Math.min.apply(null, args[0]);
} else {
diff --git a/src/math/p5.Vector.js b/src/math/p5.Vector.js
index e4e592b353..f7ac8bc1b4 100644
--- a/src/math/p5.Vector.js
+++ b/src/math/p5.Vector.js
@@ -1213,6 +1213,20 @@ p5.Vector.prototype.dist = function dist(v) {
* // [0.4454354, 0.8908708, 0.089087084]
*
*
+ *
+ *
+ *
+ * // Static method
+ * let v_initial = createVector(10, 20, 2);
+ * // v_initial has components [10.0, 20.0, 2.0]
+ * let v_normalized = p5.Vector.normalize(v_initial);
+ * print(v_normalized);
+ * // returns a new vector with components set to
+ * // [0.4454354, 0.8908708, 0.089087084]
+ * // v_initial remains unchanged
+ *
+ *
+ *
*
*
* function draw() {
@@ -1440,6 +1454,31 @@ p5.Vector.prototype.heading = function heading() {
return h;
};
+/**
+ * Rotate the vector to a specific angle (only 2D vectors), magnitude remains the
+ * same
+ *
+ * @method setHeading
+ * @param {number} angle the angle of rotation
+ * @chainable
+ * @example
+ *
+ *
+ * let v = createVector(10.0, 20.0);
+ * // result of v.heading() is 1.1071487177940904
+ * v.setHeading(Math.PI);
+ * // result of v.heading() is now 3.141592653589793
+ *
+ *
+ */
+
+p5.Vector.prototype.setHeading = function setHeading(a) {
+ let m = this.mag();
+ this.x = m * Math.cos(a);
+ this.y = m * Math.sin(a);
+ return this;
+};
+
/**
* Rotate the vector by an angle (only 2D vectors), magnitude remains the
* same
@@ -1457,6 +1496,19 @@ p5.Vector.prototype.heading = function heading() {
*
*
*
+ *
+ *
+ * // static function implementation
+ * let v = createVector(10.0, 20.0);
+ * // v has components [10.0, 20.0, 0.0]
+ * let rotated_v = p5.Vector.rotate(v, HALF_PI);
+ * console.log(rotated_v);
+ * // rotated_v's components are set to [-20.0, 9.999999, 0.0]
+ * console.log(v);
+ * // v's components remains the same (i.e, [10.0, 20.0, 0.0])
+ *
+ *
+ *
*
*
* let angle = 0;
@@ -2113,6 +2165,33 @@ p5.Vector.mult = function mult(v, n, target) {
return target;
};
+/**
+ * Rotates the vector (only 2D vectors) by the given angle, magnitude remains the same and returns a new vector.
+ */
+
+/**
+ * @method rotate
+ * @static
+ * @param {p5.Vector} v
+ * @param {Number} angle
+ * @param {p5.Vector} [target] the vector to receive the result (Optional)
+ */
+p5.Vector.rotate = function rotate(v, a, target) {
+ if (arguments.length === 2) {
+ target = v.copy();
+ } else {
+ if (!(target instanceof p5.Vector)) {
+ p5._friendlyError(
+ 'The target parameter should be of type p5.Vector',
+ 'p5.Vector.rotate'
+ );
+ }
+ target.set(v);
+ }
+ target.rotate(a);
+ return target;
+};
+
/**
* Divides a vector by a scalar and returns a new vector.
*/
@@ -2238,11 +2317,15 @@ p5.Vector.lerp = function lerp(v1, v2, amt, target) {
return target;
};
+/**
+ * Calculates the magnitude (length) of the vector and returns the result as
+ * a float (this is simply the equation sqrt(x\*x + y\*y + z\*z).)
+ */
/**
* @method mag
+ * @static
* @param {p5.Vector} vecT the vector to return the magnitude of
* @return {Number} the magnitude of vecT
- * @static
*/
p5.Vector.mag = function mag(vecT) {
const x = vecT.x,
@@ -2252,4 +2335,29 @@ p5.Vector.mag = function mag(vecT) {
return Math.sqrt(magSq);
};
+/**
+ * Normalize the vector to length 1 (make it a unit vector).
+ */
+/**
+ * @method normalize
+ * @static
+ * @param {p5.Vector} v the vector to normalize
+ * @param {p5.Vector} [target] the vector to receive the result (Optional)
+ * @return {p5.Vector} v normalized to a length of 1
+ */
+p5.Vector.normalize = function normalize(v, target) {
+ if (arguments.length < 2) {
+ target = v.copy();
+ } else {
+ if (!(target instanceof p5.Vector)) {
+ p5._friendlyError(
+ 'The target parameter should be of type p5.Vector',
+ 'p5.Vector.normalize'
+ );
+ }
+ target.set(v);
+ }
+ return target.normalize();
+};
+
export default p5.Vector;
diff --git a/src/typography/p5.Font.js b/src/typography/p5.Font.js
index c6b4bc9ffa..d57036dbdf 100644
--- a/src/typography/p5.Font.js
+++ b/src/typography/p5.Font.js
@@ -130,17 +130,17 @@ p5.Font.prototype.textBounds = function(str, x = 0, y = 0, fontSize, opts) {
maxX[lineCount] = Math.max.apply(null, xCoords[lineCount]);
}
- var finalMaxX = 0;
- for (var i = 0; i <= lineCount; i++) {
+ let finalMaxX = 0;
+ for (let i = 0; i <= lineCount; i++) {
minX[i] = Math.min.apply(null, xCoords[i]);
maxX[i] = Math.max.apply(null, xCoords[i]);
- var lineLength = maxX[i] - minX[i];
+ const lineLength = maxX[i] - minX[i];
if (lineLength > finalMaxX) {
finalMaxX = lineLength;
}
}
- var finalMinX = Math.min.apply(null, minX);
+ const finalMinX = Math.min.apply(null, minX);
minY = Math.min.apply(null, yCoords);
maxY = Math.max.apply(null, yCoords);
diff --git a/src/webgl/3d_primitives.js b/src/webgl/3d_primitives.js
index 3c17821f4c..5f91b564f0 100644
--- a/src/webgl/3d_primitives.js
+++ b/src/webgl/3d_primitives.js
@@ -1233,24 +1233,60 @@ p5.RendererGL.prototype.rect = function(args) {
};
// prettier-ignore
-p5.RendererGL.prototype.quad = function(x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4) {
+p5.RendererGL.prototype.quad = function(x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4, detailX, detailY) {
+ if (typeof detailX === 'undefined') {
+ detailX = 2;
+ }
+ if (typeof detailY === 'undefined') {
+ detailY = 2;
+ }
+
const gId =
- `quad|${x1}|${y1}|${z1}|${x2}|${y2}|${z2}|${x3}|${y3}|${z3}|${x4}|${y4}|${z4}`;
+ `quad|${x1}|${y1}|${z1}|${x2}|${y2}|${z2}|${x3}|${y3}|${z3}|${x4}|${y4}|${z4}|${detailX}|${detailY}`;
+
if (!this.geometryInHash(gId)) {
- const _quad = function() {
- this.vertices.push(new p5.Vector(x1, y1, z1));
- this.vertices.push(new p5.Vector(x2, y2, z2));
- this.vertices.push(new p5.Vector(x3, y3, z3));
- this.vertices.push(new p5.Vector(x4, y4, z4));
- this.uvs.push(0, 0, 1, 0, 1, 1, 0, 1);
- this.strokeIndices = [[0, 1], [1, 2], [2, 3], [3, 0]];
- };
- const quadGeom = new p5.Geometry(2, 2, _quad);
+ const quadGeom = new p5.Geometry(detailX, detailY, function() {
+ //algorithm adapted from c++ to js
+ //https://stackoverflow.com/questions/16989181/whats-the-correct-way-to-draw-a-distorted-plane-in-opengl/16993202#16993202
+ let xRes = 1.0 / (this.detailX - 1);
+ let yRes = 1.0 / (this.detailY - 1);
+ for (let y = 0; y < this.detailY; y++) {
+ for (let x = 0; x < this.detailX; x++) {
+ let pctx = x * xRes;
+ let pcty = y * yRes;
+
+ let linePt0x = (1 - pcty) * x1 + pcty * x4;
+ let linePt0y = (1 - pcty) * y1 + pcty * y4;
+ let linePt0z = (1 - pcty) * z1 + pcty * z4;
+ let linePt1x = (1 - pcty) * x2 + pcty * x3;
+ let linePt1y = (1 - pcty) * y2 + pcty * y3;
+ let linePt1z = (1 - pcty) * z2 + pcty * z3;
+
+ let ptx = (1 - pctx) * linePt0x + pctx * linePt1x;
+ let pty = (1 - pctx) * linePt0y + pctx * linePt1y;
+ let ptz = (1 - pctx) * linePt0z + pctx * linePt1z;
+
+ this.vertices.push(new p5.Vector(ptx, pty, ptz));
+ this.uvs.push([pctx, pcty]);
+ }
+ }
+ });
+
+ quadGeom.faces = [];
+ for(let y = 0; y < detailY-1; y++){
+ for(let x = 0; x < detailX-1; x++){
+ let pt0 = x + y * detailX;
+ let pt1 = (x + 1) + y * detailX;
+ let pt2 = (x + 1) + (y + 1) * detailX;
+ let pt3 = x + (y + 1) * detailX;
+ quadGeom.faces.push([pt0, pt1, pt2]);
+ quadGeom.faces.push([pt0, pt2, pt3]);
+ }
+ }
quadGeom
.computeNormals()
._makeTriangleEdges()
._edgesToVertices();
- quadGeom.faces = [[0, 1, 2], [2, 3, 0]];
this.createBuffers(gId, quadGeom);
}
this.drawBuffers(gId);
diff --git a/src/webgl/loading.js b/src/webgl/loading.js
index 413ebf972d..78e19145c2 100755
--- a/src/webgl/loading.js
+++ b/src/webgl/loading.js
@@ -222,8 +222,10 @@ function parseObj(model, lines) {
loadedVerts[tokens[0]].push(vertex);
} else if (tokens[0] === 'vt') {
// Check if this line describes a texture coordinate.
- // It will have two numeric parameters.
- const texVertex = [parseFloat(tokens[1]), parseFloat(tokens[2])];
+ // It will have two numeric parameters U and V (W is omitted).
+ // Because of WebGL texture coordinates rendering behaviour, the V
+ // coordinate is inversed.
+ const texVertex = [parseFloat(tokens[1]), 1 - parseFloat(tokens[2])];
loadedVerts[tokens[0]].push(texVertex);
} else if (tokens[0] === 'f') {
// Check if this line describes a face.
diff --git a/src/webgl/p5.Camera.js b/src/webgl/p5.Camera.js
index deb7b9880c..af344e1ca5 100644
--- a/src/webgl/p5.Camera.js
+++ b/src/webgl/p5.Camera.js
@@ -882,13 +882,17 @@ p5.Camera.prototype.camera = function(
this.eyeY = eyeY;
this.eyeZ = eyeZ;
- this.centerX = centerX;
- this.centerY = centerY;
- this.centerZ = centerZ;
+ if (typeof centerX !== 'undefined') {
+ this.centerX = centerX;
+ this.centerY = centerY;
+ this.centerZ = centerZ;
+ }
- this.upX = upX;
- this.upY = upY;
- this.upZ = upZ;
+ if (typeof upX !== 'undefined') {
+ this.upX = upX;
+ this.upY = upY;
+ this.upZ = upZ;
+ }
const local = this._getLocalAxes();
diff --git a/src/webgl/p5.RendererGL.js b/src/webgl/p5.RendererGL.js
index bbe89a842d..c0fdc2b9ba 100755
--- a/src/webgl/p5.RendererGL.js
+++ b/src/webgl/p5.RendererGL.js
@@ -1310,7 +1310,10 @@ p5.RendererGL.prototype._setPointUniforms = function(pointShader) {
pointShader.setUniform('uMaterialColor', this.curStrokeColor);
// @todo is there an instance where this isn't stroke weight?
// should be they be same var?
- pointShader.setUniform('uPointSize', this.pointSize);
+ pointShader.setUniform(
+ 'uPointSize',
+ this.pointSize * this._pInst._pixelDensity
+ );
};
/* Binds a buffer to the drawing context
diff --git a/tasks/test/mocha-chrome.js b/tasks/test/mocha-chrome.js
index fe02a99873..b6903b3b90 100644
--- a/tasks/test/mocha-chrome.js
+++ b/tasks/test/mocha-chrome.js
@@ -16,7 +16,7 @@ module.exports = function(grunt) {
// Launch Chrome in headless mode
const browser = await puppeteer.launch({
headless: true,
- args: ['--no-sandbox']
+ args: ['--no-sandbox', '--disable-setuid-sandbox']
});
try {
diff --git a/test/unit/core/error_helpers.js b/test/unit/core/error_helpers.js
index b29a8d80b1..47e6a29d0e 100644
--- a/test/unit/core/error_helpers.js
+++ b/test/unit/core/error_helpers.js
@@ -391,7 +391,7 @@ suite('Error Helpers', function() {
const logMsg = help(new ReferenceError('MouseX is not defined'));
assert.match(
logMsg,
- /It seems that you may have accidently written "MouseX"/
+ /It seems that you may have accidentally written "MouseX"/
);
assert.match(logMsg, /mouseX/);
});
@@ -400,7 +400,7 @@ suite('Error Helpers', function() {
const logMsg = help(new ReferenceError('colour is not defined'));
assert.match(
logMsg,
- /It seems that you may have accidently written "colour"/
+ /It seems that you may have accidentally written "colour"/
);
assert.match(logMsg, /color/);
});
@@ -411,7 +411,7 @@ suite('Error Helpers', function() {
const logMsg = help(new ReferenceError('strok is not defined'));
assert.match(
logMsg,
- /It seems that you may have accidently written "strok"/
+ /It seems that you may have accidentally written "strok"/
);
assert.match(logMsg, /stroke/);
assert.match(logMsg, /STROKE/);
@@ -422,7 +422,7 @@ suite('Error Helpers', function() {
const logMsg = help(new ReferenceError('RandomGossian is not defined'));
assert.match(
logMsg,
- /It seems that you may have accidently written "RandomGossian"/
+ /It seems that you may have accidentally written "RandomGossian"/
);
assert.match(logMsg, /randomGaussian/);
});
@@ -459,7 +459,7 @@ suite('Error Helpers', function() {
assert.strictEqual(log.length, 1, 'One message is displayed');
assert.match(
log[0],
- /It seems that you may have accidently written preLoad instead of preload/
+ /It seems that you may have accidentally written preLoad instead of preload/
);
}
);
@@ -492,7 +492,7 @@ suite('Error Helpers', function() {
assert.strictEqual(log.length, 1);
assert.match(
log[0],
- /It seems that you may have accidently written DRAW instead of draw/
+ /It seems that you may have accidentally written DRAW instead of draw/
);
});
}
diff --git a/test/unit/math/p5.Vector.js b/test/unit/math/p5.Vector.js
index 6431b0f778..7c317c4822 100644
--- a/test/unit/math/p5.Vector.js
+++ b/test/unit/math/p5.Vector.js
@@ -18,6 +18,15 @@ suite('p5.Vector', function() {
});
var v;
+ suite('setHeading', function() {
+ setup(function() {
+ v = myp5.createVector(1, 1);
+ v.setHeading(1);
+ });
+ test('should have heading() value of 1', function() {
+ assert.closeTo(v.heading(), 1, 0.001);
+ });
+ });
suite('p5.prototype.createVector()', function() {
setup(function() {
v = myp5.createVector();
@@ -859,18 +868,16 @@ suite('p5.Vector', function() {
});
suite('normalize', function() {
- setup(function() {
- v.x = 1;
- v.y = 1;
- v.z = 1;
- });
+ suite('v.normalize()', function() {
+ setup(function() {
+ v = myp5.createVector(1, 1, 1);
+ });
- test('should return the same object', function() {
- expect(v.normalize()).to.eql(v);
- });
+ test('should return the same object', function() {
+ expect(v.normalize()).to.eql(v);
+ });
- suite('with unit vector', function() {
- test('should not change the vector', function() {
+ test('unit vector should not change values', function() {
v.x = 1;
v.y = 0;
v.z = 0;
@@ -879,10 +886,8 @@ suite('p5.Vector', function() {
expect(v.y).to.eql(0);
expect(v.z).to.eql(0);
});
- });
- suite('with 2,2,1', function() {
- test('should normalize to 0.66,0.66,0.33', function() {
+ test('2,2,1 should normalize to ~0.66,0.66,0.33', function() {
v.x = 2;
v.y = 2;
v.z = 1;
@@ -892,6 +897,38 @@ suite('p5.Vector', function() {
expect(v.z).to.be.closeTo(0.3333, 0.01);
});
});
+
+ suite('p5.Vector.normalize(v)', function() {
+ var res;
+ setup(function() {
+ v = myp5.createVector(1, 0, 0);
+ res = p5.Vector.normalize(v);
+ });
+
+ test('should not be undefined', function() {
+ expect(res).to.not.eql(undefined);
+ });
+
+ test('should not return same object v', function() {
+ expect(res).to.not.equal(v);
+ });
+
+ test('unit vector 1,0,0 should normalize to 1,0,0', function() {
+ expect(res.x).to.eql(1);
+ expect(res.y).to.eql(0);
+ expect(res.z).to.eql(0);
+ });
+
+ test('2,2,1 should normalize to ~0.66,0.66,0.33', function() {
+ v.x = 2;
+ v.y = 2;
+ v.z = 1;
+ res = p5.Vector.normalize(v);
+ expect(res.x).to.be.closeTo(0.6666, 0.01);
+ expect(res.y).to.be.closeTo(0.6666, 0.01);
+ expect(res.z).to.be.closeTo(0.3333, 0.01);
+ });
+ });
});
suite('limit', function() {
diff --git a/translations/en/translation.json b/translations/en/translation.json
index dfae559192..ff45b2c26d 100644
--- a/translations/en/translation.json
+++ b/translations/en/translation.json
@@ -1,7 +1,7 @@
{
"fes": {
"autoplay": "The media that tried to play (with '{{src}}') wasn't allowed to by this browser, most likely due to the browser's autoplay policy. Check out {{link}} for more information about why.",
- "checkUserDefinedFns": "It seems that you may have accidently written {{name}} instead of {{actualName}}.\n\nPlease correct it if it's not intentional.",
+ "checkUserDefinedFns": "It seems that you may have accidentally written {{name}} instead of {{actualName}}.\n\nPlease correct it if it's not intentional.",
"fileLoadError": {
"bytes": "It looks like there was a problem loading your file. {{suggestion}}",
"font": "It looks like there was a problem loading your font. {{suggestion}}",
@@ -37,8 +37,8 @@
},
"libraryError": "An error with message \"{{error}}\" occured inside the p5js library when {{func}} was called {{location}}\n\nIf not stated otherwise, it might be an issue with the arguments passed to {{func}}.",
"location": "(on line {{line}} in {{file}} [{{location}}])",
- "misspelling": "It seems that you may have accidently written \"{{name}}\" instead of \"{{actualName}}\" {{location}}.\n\nPlease correct it to {{actualName}} if you wish to use the {{type}} from p5.js",
- "misspelling_plural": "It seems that you may have accidently written \"{{name}}\" {{location}}.\n\nYou may have meant one of the following:\n{{suggestions}}",
+ "misspelling": "It seems that you may have accidentally written \"{{name}}\" instead of \"{{actualName}}\" {{location}}.\n\nPlease correct it to {{actualName}} if you wish to use the {{type}} from p5.js",
+ "misspelling_plural": "It seems that you may have accidentally written \"{{name}}\" {{location}}.\n\nYou may have meant one of the following:\n{{suggestions}}",
"misusedTopLevel": "Did you just try to use p5.js's {{symbolName}} {{symbolType}}? If so, you may want to move it into your sketch's setup() function.\n\nFor more details, see: {{link}}",
"positions": {
"p_1": "first",
@@ -58,4 +58,4 @@
"welcome": "Welcome! This is your friendly debugger. To turn me off, switch to using p5.min.js.",
"wrongPreload": "An error with message \"{{error}}\" occured inside the p5js library when \"{{func}}\" was called {{location}}.\n\nIf not stated otherwise, it might be due to \"{{func}}\" being called from preload. Nothing besides load calls (loadImage, loadJSON, loadFont, loadStrings, etc.) should be inside the preload function."
}
-}
+}
\ No newline at end of file
