Skip to content

Commit b885d19

Browse files
authored
Merge branch 'main' into PR/improve-content-tests
2 parents 1daa759 + 2697282 commit b885d19

File tree

14 files changed

+63
-16
lines changed

14 files changed

+63
-16
lines changed

content/pages/challenges/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"title": "Challenges",
33
"description": "Ready to apply what you’ve learned in the Tracks? Try a Challenge! These one-off project videos build off concepts introduced in Tracks and may have prerequisites (listed on the challenge page itself).",
44
"featuredText": "Featured Challenge:",
5-
"featuredChallenge": "c5-marching-squares"
5+
"featuredChallenge": "163-bezier-curves"
66
}

content/pages/homepage/index.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
"title": "Challenges",
3232
"description": "Watch Dan take on Coding Challenges in p5.js and Processing. The challenge topics include algorithmic art, machine learning, simulation, generative poetry, and more.",
3333
"featured": [
34-
"8-solar-system-3d",
35-
"76-10Print",
36-
"32-agario",
37-
"c2-collatz-conjecture",
38-
"c5-marching-squares",
39-
"171-wave-function-collapse"
34+
"13-reaction-diffusion",
35+
"63-texturing-cloth-simulation",
36+
"114-bubble-sort-visualization",
37+
"56-attraction-and-repulsion-forces",
38+
"163-bezier-curves",
39+
"132-fluid-simulation"
4040
],
4141
"challengesCta": {
4242
"text": "ready to explore? try a challenge!",
@@ -47,14 +47,14 @@
4747
"passengerShowcase": {
4848
"title": "Passenger showcase highlights",
4949
"featured": [
50-
"challenges/78-simple-particle-system/showcase/contribution-1696242955.json",
51-
"challenges/173-snake-applesoft-basic/showcase/contribution-1696743428.json",
52-
"challenges/132-fluid-simulation/showcase/contribution-1695519134.json",
53-
"challenges/76-10Print/showcase/contribution-1672212742.json",
54-
"challenges/8-solar-system-3d/showcase/contribution2.json",
55-
"challenges/c2-collatz-conjecture/showcase/contribution-1687717743.json",
56-
"data/1-client-side/1-fetch/showcase/contribution2.json",
57-
"challenges/171-wave-function-collapse/showcase/contribution-1695477746.json"
50+
"noc/3-angles/7-additive-waves/showcase/contribution-1698291255.json",
51+
"challenges/164-slitscan/showcase/contribution2.json",
52+
"ml5/5-knn-classification/2-train-the-model/showcase/contribution-1697896465.json",
53+
"webgl/2-3d-geometries/showcase/contribution1.json",
54+
"challenges/159-simple-pendulum/showcase/contribution-1698149682.json",
55+
"challenges/163-bezier-curves/showcase/contribution9.json",
56+
"challenges/163-bezier-curves/showcase/contribution8.json",
57+
"challenges/56-attraction-and-repulsion-forces/showcase/contribution4.json"
5858
],
5959
"showcaseCta": {
6060
"text": "Want to see more?",

content/tracks/side-tracks/pixels/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"title": "pixels",
2+
"title": "Pixels",
33
"description": "Take a ride along the Pixels track and explore pixels with p5.js and Processing. In this track, I demonstrate how to work with real-time live video, using tint() to change colors and copy() to takes snapshots. I also explore how the pixel array works. I create examples of \"software\" mirrors that draw pixels as shapes or use DOM elements. I demonstrate how to create a \"painting\" with particles smearing colors from pixels, and build a slitscan effect.",
44
"videos": [
55
"pixels/createCapture",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "Pi In The Sky - With Unity Engine",
3+
"author": {
4+
"name": "efei",
5+
"url": "https://efei.itch.io/",
6+
"instagram": "https://www.instagram.com/fauzanalfaruqi/"
7+
},
8+
"url": "https://efei.itch.io/pi-in-the-sky",
9+
"submittedOn": "2023-10-27T09:37:06.176Z"
10+
}
235 KB
Loading
201 KB
Loading
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "Sin-Stroke Flow Field with Textures and Noise!",
3+
"author": {
4+
"name": "adorescoding / Ethan",
5+
"url": "https://www.instagram.com/adorescoding/",
6+
"instagram": "@adorescoding"
7+
},
8+
"url": "https://github.com/adorescoding/art_and_simulations/tree/main/Flow_Field_Sin_Stroke",
9+
"submittedOn": "2023-10-30T01:15:56.759Z"
10+
}
161 KB
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Steering Pixels from Image",
3+
"author": {
4+
"name": "Developer Harshit",
5+
"url": "https://youtube.com/@devHarshit?si=N-0ig221jLH5bCKX"
6+
},
7+
"url": "https://github.com/Developer-Harshit/Image-Particle",
8+
"submittedOn": "2023-10-30T10:02:44.399Z"
9+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"title": "ocean & eclipse",
3+
"author": {
4+
"name": "Panna"
5+
},
6+
"url": "https://editor.p5js.org/tamaki.komatsuzaki/sketches/k9lEZJHi7",
7+
"submittedOn": "2023-10-28T00:13:01.625Z"
8+
}

0 commit comments

Comments
 (0)