Skip to content

Commit

Permalink
Merge branch 'main' into Shahmaz0-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Shahmaz0 authored Jul 10, 2024
2 parents 9c6e588 + f397e2d commit bc53cd0
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 7 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -6023,6 +6023,24 @@
"contributions": [
"code"
]
},
{
"login": "ravixalgorithm",
"name": "Mr. Algorithm",
"avatar_url": "https://avatars.githubusercontent.com/u/148683640?v=4",
"profile": "https://github.com/ravixalgorithm",
"contributions": [
"doc"
]
},
{
"login": "sambensim",
"name": "sambensim",
"avatar_url": "https://avatars.githubusercontent.com/u/28797947?v=4",
"profile": "https://github.com/sambensim",
"contributions": [
"doc"
]
}
{
"login": "Shahmaz0",
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ The [p5js.org](https://p5js.org) website contains an extensive overview of the p

We are a community of, and in solidarity with, people from every gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, and background. We acknowledge that not everyone has the time, financial means, or capacity to actively participate, but we recognize and encourage involvement of all kinds. We facilitate and foster access and empowerment. We are all learners.

p5.js is a collaborative project created by many individuals, mostly volunteers, and you are invited to help. All types of involvement are welcome. See the [community section](https://p5js.org/community) to get started! You can also check out the [contributor docs](https://p5js.org/contributor-docs/#/) for more in-depth details about contributing to different areas of the project, including code, bug fixes, documentation, discussion, and more.
p5.js is a collaborative project created by many individuals, mostly volunteers, and you are invited to help. All types of involvement are welcome. See the [community section](https://p5js.org/community) to get started! You can also check out the [contributor docs](https://p5js.org/contribute/#docs) for more in-depth details about contributing to different areas of the project, including code, bug fixes, documentation, discussion, and more.

Learn more about [our community](https://p5js.org/community/) and read our community statement and [code of conduct](https://github.com/processing/p5.js/blob/main/CODE_OF_CONDUCT.md). You can directly support our work with p5.js by [donating to the Processing Foundation](https://processingfoundation.org/support).

## Get Started

Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn more about sketching with p5.js on the [Get Started](https://p5js.org/get-started/) and find everything you can do in the [Reference](https://p5js.org/reference/).

To get the complete p5.js library on your own computer, you can [download it here](https://p5js.org/download). If you are interested in the most recent, less stable version, or even simply in (**new!**) certain components of p5.js, you can clone this repository and run `grunt` from the command line to generate the library from source. See the [contributor docs](https://p5js.org/contributor-docs/#/) for more information about our build process.
To get the complete p5.js library on your own computer, you can [download it here](https://p5js.org/download). If you are interested in the most recent, less stable version, or even simply in (**new!**) certain components of p5.js, you can clone this repository and run `grunt` from the command line to generate the library from source. See the [contributor docs](https://p5js.org/contribute/#docs) for more information about our build process.


## Learning
Expand Down Expand Up @@ -1011,6 +1011,10 @@ We recognize all types of contributions. This project follows the [all-contribut
<td align="center" valign="top" width="16.66%"><a href="https://aboutmonica.com"><img src="https://avatars.githubusercontent.com/u/6998954?v=4?s=120" width="120px;" alt="Monica Powell"/><br /><sub><b>Monica Powell</b></sub></a><br /><a href="#talk-m0nica" title="Talks">📢</a> <a href="#example-m0nica" title="Examples">💡</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/rohanjulka19"><img src="https://avatars.githubusercontent.com/u/19673968?v=4?s=120" width="120px;" alt="Rohan Julka"/><br /><sub><b>Rohan Julka</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=rohanjulka19" title="Code">💻</a></td>
<td align="center" valign="top" width ="16.66%"><a href = "https://github.com/shahmaz0/"><img src="https://avatars.githubusercontent.com/Shahmaz0" width="120px;" alt="Shahma"/><br /><sub><b>Shahma</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=Shahmaz0" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/ravixalgorithm"><img src="https://avatars.githubusercontent.com/u/148683640?v=4?s=120" width="120px;" alt="Mr. Algorithm"/><br /><sub><b>Mr. Algorithm</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=ravixalgorithm" title="Documentation">📖</a></td>
</tr>
<tr>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/sambensim"><img src="https://avatars.githubusercontent.com/u/28797947?v=4?s=120" width="120px;" alt="sambensim"/><br /><sub><b>sambensim</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=sambensim" title="Documentation">📖</a></td>
</tr>
</tbody>
</table>
Expand Down
1 change: 0 additions & 1 deletion src/color/p5.Color.js
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,6 @@ p5.Color = class Color {
* @param {Number} alpha the new alpha value.
*
* @example
* @example
* <div>
* <code>
* function setup() {
Expand Down
1 change: 0 additions & 1 deletion src/math/random.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ p5.prototype.randomSeed = function(seed) {
* @method random
* @param {Array} choices array to choose from.
* @return {*} random element from the array.
* @example
*/
p5.prototype.random = function(min, max) {
p5._validateParameters('random', arguments);
Expand Down
2 changes: 1 addition & 1 deletion src/webgl/material.js
Original file line number Diff line number Diff line change
Expand Up @@ -2334,7 +2334,7 @@ p5.prototype.metalness = function (metallic) {
* @param {Number[]} color The currently set color, with values in 0-1 range
* @param {Boolean} [hasTransparency] Whether the shape being drawn has other
* transparency internally, e.g. via vertex colors
* @return {Number[]]} Normalized numbers array
* @return {Number[]} Normalized numbers array
*/
p5.RendererGL.prototype._applyColorBlend = function(colors, hasTransparency) {
const gl = this.GL;
Expand Down
1 change: 0 additions & 1 deletion src/webgl/p5.Quat.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ p5.Quat = class {
* This was taken from the below stackexchange link
* https://gamedev.stackexchange.com/questions/28395/rotating-vector3-by-a-quaternion/50545#50545
* @param {p5.Vector} [p] vector to rotate on the axis quaternion
* @returns
*/
rotateVector(p) {
return new p5.Vector.mult( p, this.w*this.w - this.vec.dot(this.vec) )
Expand Down
2 changes: 1 addition & 1 deletion src/webgl/p5.RendererGL.Immediate.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ p5.RendererGL.prototype._processVertices = function(mode) {
* Called from _processVertices(). This function calculates the stroke vertices for custom shapes and
* tesselates shapes when applicable.
* @private
* @returns {Array[Number]} indices for custom shape vertices indicating edges.
* @returns {Number[]} indices for custom shape vertices indicating edges.
*/
p5.RendererGL.prototype._calculateEdges = function(
shapeMode,
Expand Down

0 comments on commit bc53cd0

Please sign in to comment.