Skip to content

Commit 4278941

Browse files
authored
Merge pull request #776 from processing/main
Merge main into 2.0 beta
2 parents 353a3dd + d875f93 commit 4278941

File tree

10 files changed

+60
-10
lines changed

10 files changed

+60
-10
lines changed

src/content/contributor-docs/en/how-to-add-friendly-error-messages.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Next, you will file an issue ticket to discuss creating a new case or confirm yo
162162

163163
Go to the [issue board](https://github.com/processing/p5.js/issues/), press the "New Issue" button, and then choose the "Issue: 💡 Existing Feature Enhancement" option. An empty form should appear.
164164

165-
Add a title along the lines of “Adding a new case to `fileLoadErrrorCases`: \[a high-level description of your file load error case].” For the “Increasing access” section, enter a short paragraph on the typical scenario you prepared at the beginning of this step.
165+
Add a title along the lines of “Adding a new case to `fileLoadErrorCases`: \[a high-level description of your file load error case].” For the “Increasing access” section, enter a short paragraph on the typical scenario you prepared at the beginning of this step.
166166

167167
Then, check the “Friendly Errors” box for the “Most appropriate sub-area of p5.js?” question. Lastly, for the “Feature enhancement details” section, enter your paragraph detailing your error handling and what file types it loads.
168168

src/content/examples/en/01_Shapes_And_Color/00_Shape_Primitives/code.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function setup() {
3434
circle(560, 100, 100);
3535

3636
// Draw arc (compare to ellipse()) as eyelid
37-
// x, y, width, heght, start angle, stop angle, mode
37+
// x, y, width, height, start angle, stop angle, mode
3838
arc(540, 100, 300, 100, 180, 360, CHORD);
3939

4040
// Draw line

src/content/examples/en/07_Repetition/More/Radial_Gradient.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* @name Radial Gradient
3-
* @arialabel Three circles on a black background. The middle circle is completely visible but the user can only see half of the other two. There is a gradiant from the center of the circle to the outer edge that changes every second
3+
* @arialabel Three circles on a black background. The middle circle is completely visible but the user can only see half of the other two. There is a gradient from the center of the circle to the outer edge that changes every second
44
* @description Draws a series of concentric circles to create a gradient
55
* from one color to another.
66
*/

src/content/examples/en/09_Angles_And_Motion/More/polartocartesian.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
let r;
99

10-
// Angle and angular velocity, accleration
10+
// Angle and angular velocity, acceleration
1111
let theta;
1212
let theta_vel;
1313
let theta_acc;

src/content/examples/en/15_Math_And_Physics/More/WolframCA.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ function draw() {
4444
function generate() {
4545
// First we create an empty array for the new values
4646
let nextgen = Array(cells.length);
47-
// For every spot, determine new state by examing current state, and neighbor states
48-
// Ignore edges that only have one neighor
47+
// For every spot, determine new state by examining current state, and neighbor states
48+
// Ignore edges that only have one neighbor
4949
for (let i = 1; i < cells.length-1; i++) {
5050
let left = cells[i-1]; // Left neighbor state
5151
let me = cells[i]; // Current state

src/content/pages/en/education-resources.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,13 @@ Thank you to Tuan Huang, Yu Lee, and Janis Sepúlveda for initiating the educati
304304
featuredImageAlt="a screenshot of the syllabus with title and texts"
305305
>
306306
<Fragment slot="author">
307-
Barry Voeten
307+
NYCPS Computer Science Education team
308308
</Fragment>
309309
<Fragment slot="description">
310-
This is a teacher-facing p5 curriculum. Each unit includes a series of learning activities and ends with a final project where students apply the concepts they have learned in a creative way. Final project prompts include three levels of difficulty. For each of them, a finished project example is provided.
310+
A NYS Computing Standard-Aligned Introductory High School Computer Science Curriculum using p5.js. This curriculum was built as an introductory high school computer science course. While it can be implemented at any point in high school, it is appropriate for 9th grade and up. It assumes no prior knowledge and focuses on creative expression as a means to learn computational thinking and syntactical concepts.
311311
</Fragment>
312312
<Fragment slot="materials">
313-
[Website](https://nycdoe-cs4all.github.io/index.html)
313+
[Website](https://cs4all-icm.gitbook.io/js-intro-to-computational-media-2.0)
314314
</Fragment>
315315
</EducationResource>
316316

src/content/reference/config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ export const referenceSchema = z.object({
6464
submodule: z.string().optional(),
6565
file: z.string(),
6666
description: z.string().optional(),
67-
deprecated: z.string().optional(),
67+
deprecated: z.string().or(
68+
z.boolean().transform(() => 'This will be removed in a future version of p5.js.')
69+
).optional(),
6870
line: z.number().or(z.string().transform((v) => parseInt(v, 10))),
6971
params: z.array(paramSchema).optional(),
7072
overloads: z.array(z.object({ params: z.array(paramSchema) })).optional(),
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
title: "दान करें"
3+
---
4+
import DonorBoxWidget from "../../../components/DonorBoxWidget/index.astro";
5+
import Image from "../../../components/Image/index.astro";
6+
import featuredDonate from "../images/contributor-conf-2019-17.webp";
7+
import donate1 from "../images/ccfest2018.webp";
8+
import donate2 from "../images/workshops-chile.webp";
9+
import donate3 from "../images/contributor-conf-2015.webp";
10+
import donate4 from "../images/p5for50plus.webp";
11+
import donate5 from "../images/tunapanda.webp";
12+
import donate6 from "../images/donate-6.jpeg";
13+
14+
<Image
15+
src={featuredDonate}
16+
alt="प्रतिभागी एक मेज के चारों ओर बैठे हैं, अपने लैपटॉप पर काम कर रहे हैं और स्क्रीन पर कोड देख रहे हैं।"
17+
width="480"
18+
class="max-w-[252px] md:max-w-[312px] lg:max-w-[480px]"
19+
/>
20+
21+
हमें आपकी मदद चाहिए! p5.js मुफ्त, ओपन-सोर्स सॉफ्टवेयर है। आप Processing Foundation को दान करके इस काम का समर्थन कर सकते हैं, यह संस्था p5.js को सहायता देती है। आपका दान p5.js के लिए सॉफ्टवेयर विकास, कोड उदाहरण और ट्यूटोरियल जैसे शैक्षिक संसाधनों, फेलोशिप और सामुदायिक कार्यक्रमों को समर्थन देता है। ये सभी प्रयास हमारे समुदाय को खुला और समावेशी बनाते हैं।
22+
23+
<DonorBoxWidget />
24+
25+
Processing Foundation की स्थापना 2012 में मूल Processing सॉफ्टवेयर के साथ एक दशक से अधिक के काम के बाद हुई थी। फाउंडेशन का मिशन कला में सॉफ्टवेयर सीखने, प्रौद्योगिकी से संबंधित क्षेत्रों में कलात्मक सीखने को बढ़ावा देना और उन विविध समुदायों का जश्न मनाना है जो इन क्षेत्रों को जीवंत, मुक्तिदायक और अभिनव बनाते हैं। हमारा लक्ष्य सभी पृष्ठभूमि के लोगों को प्रोग्रामिंग सीखने और कोड के साथ रचनात्मक काम करने में मदद करना है, खासकर उन लोगों को जिनके पास उपकरणों और संसाधनों तक पहुंच नहीं हो सकती है। हम यह भी मानते हैं कि सबसे ज़्यादा क्रांतिकारी भविष्य और नई तकनीकें उन समुदायों द्वारा बनाई जा रही हैं जिन्हें प्रमुख तकनीक द्वारा हाशिए पर धकेल दिया गया है। हम उन लोगों को लगातार आत्मनिर्भर बनाने में मदद करना चाहते हैं जिन्हें तकनीक द्वारा हाशिए पर रखा गया है, उन्हें समय, स्थान और संसाधन प्रदान करके।
26+
27+
<div class="mt-xl content-grid [&>*]:col-span-3 [&>*:first-child]:col-span-4 [&>*:last-child]:col-span-4 lg:[&>*:first-child]:col-span-6 lg:[&>*:last-child]:col-span-6 lg:w-[calc(100vw-300px)]">
28+
<Image src={donate1} alt="p5.js कार्यशाला के प्रतिभागी स्क्रीन पर अपने प्रोजेक्ट दिखाते हुए कोडिंग कर रहे हैं।"/>
29+
<Image src={donate2} alt="p5.js कार्यशाला Chile में Aarón Montoya-Moraga के नेतृत्व में, प्रतिभागी अपने प्रोजेक्ट दिखा रहे हैं। "/>
30+
<Image src={donate3} alt="प्रतिभागी हरे लॉन पर कूदते, मुस्कुराते और अपने हाथ हवा में लहराते हैं।"/>
31+
<Image src={donate4} alt="Inhwa Yeom 50+ लोगों को p5.js सिखा रही हैं।"/>
32+
<Image src={donate5} alt="छात्र p5.js पुस्तक देखते हुए कोडिंग सीख रहे हैं।"/>
33+
<Image src={donate6} alt="लोग एक डेस्क पर कंप्यूटर के चारों ओर इकट्ठे हुए हैं।"/>
34+
</div >

src/content/tutorials/en/get-started.mdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,3 +513,10 @@ For more information, watch [this video](https://www.youtube.com/watch?v=LuGsp5K
513513
- [p5.js Reference](https://p5js.org/reference/)
514514
- [HTML color name](https://www.w3schools.com/tags/ref_colornames.asp)
515515
- [HEX color values](https://www.w3schools.com/html/html_colors_hex.asp)
516+
517+
518+
## Bibliography
519+
520+
- [Introduction to Computational Media Curriculum](https://cs4all-icm.gitbook.io/js-intro-to-computational-media-2.0), [NYCPS Computer Science Education team](https://sites.google.com/schools.nyc.gov/cs4allnyc/)
521+
- [Creative Web Curriculum](https://blueprint.cs4all.nyc/curriculum/creative-web/), [NYCPS Computer Science Education team](https://sites.google.com/schools.nyc.gov/cs4allnyc/)
522+

src/content/tutorials/en/variables-and-change.mdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -926,3 +926,10 @@ p5.js uses the console to communicate with programmers about lines of code that
926926
* [Template Literals](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals)
927927
* [Remainder (`%`)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Remainder)
928928
* [String Interpolation in JavaScript](https://www.geeksforgeeks.org/string-interpolation-in-javascript/)
929+
930+
931+
## Bibliography
932+
933+
- [Introduction to Computational Media Curriculum](https://cs4all-icm.gitbook.io/js-intro-to-computational-media-2.0), [NYCPS Computer Science Education team](https://sites.google.com/schools.nyc.gov/cs4allnyc/)
934+
- [Creative Web Curriculum](https://blueprint.cs4all.nyc/curriculum/creative-web/), [NYCPS Computer Science Education team](https://sites.google.com/schools.nyc.gov/cs4allnyc/)
935+

0 commit comments

Comments
 (0)