Skip to content

Commit

Permalink
Merge branch 'main' into all-contributors/add-mohamedalisaifudeen
Browse files Browse the repository at this point in the history
  • Loading branch information
Qianqianye authored Jan 11, 2024
2 parents 466e88d + f79d312 commit 5b11be7
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 16 deletions.
49 changes: 49 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -5437,6 +5437,55 @@
"translation"
]
},
{
"login": "dexterco",
"name": "Nabeel (Dexter)",
"avatar_url": "https://avatars.githubusercontent.com/u/63152089?v=4",
"profile": "https://github.com/dexterco",
"contributions": [
"code"
]
},
{
"login": "umangutkarsh",
"name": "Umang Utkarsh",
"avatar_url": "https://avatars.githubusercontent.com/u/95426993?v=4",
"profile": "https://github.com/umangutkarsh",
"contributions": [
"doc",
"translation"
]
},
{
"login": "aditya123473892",
"name": "aditya123473892",
"avatar_url": "https://avatars.githubusercontent.com/u/117269123?v=4",
"profile": "https://github.com/aditya123473892",
"contributions": [
"code",
"bug",
"doc"
]
},
{
"login": "haarsh157",
"name": "Harsh Range",
"avatar_url": "https://avatars.githubusercontent.com/u/115213858?v=4",
"profile": "https://github.com/haarsh157",
"contributions": [
"code",
"bug"
]
},
{
"login": "sudhanshuv1",
"name": "Sudhanshu Tiwari",
"avatar_url": "https://avatars.githubusercontent.com/u/148856416?v=4",
"profile": "https://github.com/sudhanshuv1",
"contributions": [
"code"
]
},
{
"login": "mohamedalisaifudeen",
"name": "mohamedalisaifudeen",
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,13 @@ We recognize all types of contributions. This project follows the [all-contribut
<tr>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/vishwassrivastava"><img src="https://avatars.githubusercontent.com/u/84739867?v=4?s=120" width="120px;" alt="Vishwas Srivastava"/><br /><sub><b>Vishwas Srivastava</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=vishwassrivastava" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/suhani6904"><img src="https://avatars.githubusercontent.com/u/113185177?v=4?s=120" width="120px;" alt="suhani6904"/><br /><sub><b>suhani6904</b></sub></a><br /><a href="#translation-suhani6904" title="Translation">🌍</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/dexterco"><img src="https://avatars.githubusercontent.com/u/63152089?v=4?s=120" width="120px;" alt="Nabeel (Dexter)"/><br /><sub><b>Nabeel (Dexter)</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=dexterco" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/umangutkarsh"><img src="https://avatars.githubusercontent.com/u/95426993?v=4?s=120" width="120px;" alt="Umang Utkarsh"/><br /><sub><b>Umang Utkarsh</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=umangutkarsh" title="Documentation">📖</a> <a href="#translation-umangutkarsh" title="Translation">🌍</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/aditya123473892"><img src="https://avatars.githubusercontent.com/u/117269123?v=4?s=120" width="120px;" alt="aditya123473892"/><br /><sub><b>aditya123473892</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=aditya123473892" title="Code">💻</a> <a href="https://github.com/processing/p5.js/issues?q=author%3Aaditya123473892" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=aditya123473892" title="Documentation">📖</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/haarsh157"><img src="https://avatars.githubusercontent.com/u/115213858?v=4?s=120" width="120px;" alt="Harsh Range"/><br /><sub><b>Harsh Range</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=haarsh157" title="Code">💻</a> <a href="https://github.com/processing/p5.js/issues?q=author%3Ahaarsh157" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/sudhanshuv1"><img src="https://avatars.githubusercontent.com/u/148856416?v=4?s=120" width="120px;" alt="Sudhanshu Tiwari"/><br /><sub><b>Sudhanshu Tiwari</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=sudhanshuv1" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/mohamedalisaifudeen"><img src="https://avatars.githubusercontent.com/u/107266503?v=4?s=120" width="120px;" alt="mohamedalisaifudeen"/><br /><sub><b>mohamedalisaifudeen</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3Amohamedalisaifudeen" title="Bug reports">🐛</a></td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion contributor_docs/contributor_guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ Once the push is complete, you may see a link in the terminal that lets you open
### Pull request information
Before filing the pull request, you will need to fill out the pull request template. First of all the pull request title should briefly describe what the changes are, again avoid generic statements here.

Next, in the template, there is this line `Resolves #[Add issue number here]` which you should replace `[Add issue number here]` with the issue number of the issue you are addressing/fixing [above](#all-about-issues) (eg. `Resolves #1234`). This will make sure the issue is automatically closed after this PR is merged. If you do not wish to automatically close the issue after this PR is merged (maybe because there are more changes coming in a separate PR), change `Resovles` to `Addresses`.
Next, in the template, there is this line `Resolves #[Add issue number here]` which you should replace `[Add issue number here]` with the issue number of the issue you are addressing/fixing [above](#all-about-issues) (eg. `Resolves #1234`). This will make sure the issue is automatically closed after this PR is merged. If you do not wish to automatically close the issue after this PR is merged (maybe because there are more changes coming in a separate PR), change `Resolves` to `Addresses`.

For "Changes", you should give a clear description of the changes you have made in this PR. Include any implementation details and decisions you made here that are relevant to whoever will review this PR.

Expand Down
2 changes: 1 addition & 1 deletion docs/yuidoc-p5-theme/assets/js/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ var renderCode = function(exampleName) {

var s = function( p ) {
var fxns = ['setup', 'draw', 'preload', 'mousePressed', 'mouseReleased',
'mouseMoved', 'mouseDragged', 'mouseClicked', 'mouseWheel',
'mouseMoved', 'mouseDragged', 'mouseClicked','doubleClicked','mouseWheel',
'touchStarted', 'touchMoved', 'touchEnded',
'keyPressed', 'keyReleased', 'keyTyped'];
var _found = [];
Expand Down
8 changes: 4 additions & 4 deletions src/color/setting.js
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,10 @@ p5.prototype.background = function(...args) {
* </code>
* </div>
*
* @param {Number} r normalized red value.
* @param {Number} g normalized green value.
* @param {Number} b normalized blue value.
* @param {Number} a normalized alpha value.
* @param {Number} [r] normalized red value.
* @param {Number} [g] normalized green value.
* @param {Number} [b] normalized blue value.
* @param {Number} [a] normalized alpha value.
*/
p5.prototype.clear = function(...args) {
const _r = args[0] || 0;
Expand Down
1 change: 1 addition & 0 deletions src/core/p5.Graphics.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ p5.Graphics = class extends p5.Element {
* createFramebuffer function.</a>
*
* @method createFramebuffer
* @return {p5.Framebuffer}
*/
createFramebuffer(options) {
return new p5.Framebuffer(this, options);
Expand Down
1 change: 1 addition & 0 deletions src/core/rendering.js
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ p5.prototype.createGraphics = function(w, h, ...args) {
*
* @method createFramebuffer
* @param {Object} [options] An optional object with configuration
* @return {p5.Framebuffer}
*
* @example
* <div>
Expand Down
8 changes: 4 additions & 4 deletions src/core/shape/vertex.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,12 +647,12 @@ p5.prototype.endContour = function() {
*
* // gl_InstanceID represents a numeric value for each instance
* // using gl_InstanceID allows us to move each instance separately
* // here we move each instance horizontally by id * 40
* float xOffset = float(gl_InstanceID) * 40.0;
* // here we move each instance horizontally by id * 23
* float xOffset = float(gl_InstanceID) * 23.0;
*
* // apply the offset to the final position
* gl_Position = uProjectionMatrix * uModelViewMatrix * positionVec4 -
* vec4(xOffset, 0.0, 0.0, 0.0);
* gl_Position = uProjectionMatrix * uModelViewMatrix * (positionVec4 -
* vec4(xOffset, 0.0, 0.0, 0.0));
* }
* `;
* let fs = `#version 300 es
Expand Down
2 changes: 1 addition & 1 deletion src/math/random.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ p5.prototype.randomSeed = function(seed) {
* strokeWeight(5);
* point(x, y);
*
* describe('A black dot appears in a random posiiton on a gray square.');
* describe('A black dot appears in a random position on a gray square.');
* </code>
* </div>
*
Expand Down
2 changes: 1 addition & 1 deletion src/math/trigonometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ p5.prototype._angleMode = constants.RADIANS;
*
* <div>
* <code>
* let a = PI;
* let a = PI + QUARTER_PI;
* let c = cos(a);
* let ac = acos(c);
* text(`${round(a, 3)}`, 35, 25);
Expand Down
5 changes: 3 additions & 2 deletions src/webgl/p5.RendererGL.Immediate.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,14 @@ p5.RendererGL.prototype.vertex = function(x, y) {

/**
* Sets the normal to use for subsequent vertices.
* @method vertexNormal
* @private
* @method normal
* @param {Number} x
* @param {Number} y
* @param {Number} z
* @chainable
*
* @method vertexNormal
* @method normal
* @param {Vector} v
* @chainable
*/
Expand Down
4 changes: 2 additions & 2 deletions src/webgl/p5.Shader.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ p5.Shader = class {
);
uniform.size = uniformInfo.size;
let uniformName = uniformInfo.name;
//uniforms thats are arrays have their name returned as
//uniforms that are arrays have their name returned as
//someUniform[0] which is a bit silly so we trim it
//off here. The size property tells us that its an array
//so we dont lose any information by doing this
Expand Down Expand Up @@ -382,7 +382,7 @@ p5.Shader = class {
* @param {String} uniformName the name of the uniform.
* Must correspond to the name used in the vertex and fragment shaders
* @param {Boolean|Number|Number[]|p5.Image|p5.Graphics|p5.MediaElement|p5.Texture}
* data the data to associate with the uniform. The type can be
* data The value to assign to the uniform. This can be
* a boolean (true/false), a number, an array of numbers, or
* an image (p5.Image, p5.Graphics, p5.MediaElement, p5.Texture)
*
Expand Down

0 comments on commit 5b11be7

Please sign in to comment.