Skip to content

Commit 49989bf

Browse files
authored
Merge branch 'main' into feature-Dark-mode
2 parents 21b87b1 + eb0535a commit 49989bf

File tree

22 files changed

+224
-4
lines changed

22 files changed

+224
-4
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,24 @@
209209
"contributions": [
210210
"code"
211211
]
212+
},
213+
{
214+
"login": "Yashasewi",
215+
"name": "Yashasewi singh",
216+
"avatar_url": "https://avatars.githubusercontent.com/u/32950332?v=4",
217+
"profile": "https://www.yashasewi.me/",
218+
"contributions": [
219+
"code"
220+
]
221+
},
222+
{
223+
"login": "lcgraves",
224+
"name": "Lara Graves",
225+
"avatar_url": "https://avatars.githubusercontent.com/u/144481646?v=4",
226+
"profile": "https://github.com/lcgraves",
227+
"contributions": [
228+
"content"
229+
]
212230
}
213231
],
214232
"contributorsPerLine": 7,

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Coding Train Website
22

33
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
4-
[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
4+
[![All Contributors](https://img.shields.io/badge/all_contributors-24-orange.svg?style=flat-square)](#contributors-)
55
<!-- ALL-CONTRIBUTORS-BADGE:END -->
66

77
This repo holds the website for [thecodingtrain.com](https://thecodingtrain.com/). The website is built with:
@@ -72,6 +72,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
7272
</tr>
7373
<tr>
7474
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aryanpingle"><img src="https://avatars.githubusercontent.com/u/49340972?v=4?s=100" width="100px;" alt="Aryan Pingle"/><br /><sub><b>Aryan Pingle</b></sub></a><br /><a href="https://github.com/CodingTrain/thecodingtrain.com/commits?author=aryanpingle" title="Code">💻</a></td>
75+
<td align="center" valign="top" width="14.28%"><a href="https://www.yashasewi.me/"><img src="https://avatars.githubusercontent.com/u/32950332?v=4?s=100" width="100px;" alt="Yashasewi singh"/><br /><sub><b>Yashasewi singh</b></sub></a><br /><a href="https://github.com/CodingTrain/thecodingtrain.com/commits?author=Yashasewi" title="Code">💻</a></td>
76+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lcgraves"><img src="https://avatars.githubusercontent.com/u/144481646?v=4?s=100" width="100px;" alt="Lara Graves"/><br /><sub><b>Lara Graves</b></sub></a><br /><a href="#content-lcgraves" title="Content">🖋</a></td>
7577
</tr>
7678
</tbody>
7779
</table>

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": "182-apollonian-gasket"
5+
"featuredChallenge": "183-mathematical-marbling"
66
}

content/pages/homepage/index.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
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-
"182-apollonian-gasket",
34+
"183-mathematical-marbling",
3535
"17-fractal-trees-space-colonization",
3636
"173-snake-applesoft-basic",
3737
"83-p5-sketch-chrome-extension",

content/videos/challenges/112-3d-rendering-with-rotation-and-projection/showcase/contribution-1713752638.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "Luiz Bills",
55
"url": "https://github.com/luizbills"
66
},
7-
"url": "https://litecanvas.js.org/?c=eJyNVUtz2jAQvvMrtodO5KLwKqe2tJekhVtnmpk28fggg5IIjMzIohAy%2FPeuHsYWsZPOMFje%2Fb7Vp33ImdB8zuRfVpCo07nfyrkWuQQhhSYRPHcACnHgMIHfs6ubKXyF6fXsx%2FQGvpWLPozhk%2FfiGgkblS%2B5CzOBGA0A8ZDCAH8Jda%2B4HoavxmJfExMhF1IXFfvSaKBQfyQU%2Bn2I9xSeKBwSh2uC1T0Njsu3PDVAGKzV8dJ%2B2ehIqlzxhTmsMTD5kJl0D3CdCckL%2FZRxMo46x1p1tpsF05wstKuQ43SR1BsMO2i4zxWQjGsQJtJnfHzxOe1lXD7oRzR1u44MMM9lodFvEm5RozXTSuxJr9dzrFgkkYWamCrXzAlG2HqbEWtAWX%2BIFRJRE8vhW7G3J6yHvIG%2Fa8Z76WUSR1cVs%2BrCM84JjacyJ67I6D4GeV4otvNTMM8KMohsxTAjxHXs95%2B%2FKGBtjHlbPBLj14rJAguwJuVMjGg1K6OopTzj85JIFEUEBSKgC8MI3sOYVmKjEIYQ9JIaNnKmNgIF0QA42tnbkLDbShKjkFLfR06oaVDiW4Ql8cD8SoQxDANDeo5IT4iP4Y6%2BhGZDn31bZzbPM9OkDDm%2BkSufynfWd%2B5IPSltIKWelJYO9Ih7IG6jd5OJQ0SgH%2FEJku%2FgWqlckYsZ3piZWICbFF5c2CZwURUvymluqrRVGlQbCa4XY3ePnVhLx1oiyx4DlxXLTWOxXfvbImCuHHNl9nPMVZ0Jltc1qRRJvErgA%2BZnlcTLxAOO%2FumkoR3jIaVT%2Bo7muIrrrZIGE1Svug8UWwicBrevR7d%2BEOZ5cSLY21XWXuvA0BPSBv5mbdJz%2B5qeszDhLi2frXONoZhXlNz9v5K2PLydhBff1bqS4J73H9FQTLzHuYyfzN8hMeR%2FryFjCQ%3D%3D",
7+
"url": "https://litecanvas.js.org?c=eJyNVU1z2jAQvfMrtodO5KIQoJza0l6SNrl1pplpE48PMnaCwJEZWTRfw3%2FvriRji9hJZxhs73tPetpdSYU0%2BUKov6Ji0WBws1ULI0sFUknDIngeAFTyKYc5%2FL44vTyHr3B%2BdvHj%2FBK%2B1S8nMINPHsV3FGx0ucrdMHOIMQAQTziM8Zdw94nvk%2FCTIvYzoRFKqUzVqI%2FJA4f2I%2BFwcgLxA4dHDk%2BJ43XR2kgHcPwW0iKEg%2FUCL%2BPHnUDS5CrPaLEUEOq2oHSPB7tWObabTJicZcaVxJGGyBqNJwMM3JQaWJEbkCT9jI8vPomjIle3Zomh4dCJARalqgzilGHLmt4Jo%2BUDG41GThXLJLJUGlOXRjiHSLvbFswG0NYfZo1EnMZy%2FF7u1Z7rKW%2Fwr7v53nqdtelpo2za7kCzZ%2BOqaMWNGOFdkOdMi3vf9ouiYuPIlggzwlyLfv%2F5i8MsopRvttWSEW60UFVB5ak3wZQ3m2NKlEKq%2FF5mZslmUU%2B1ZocVUuiRSQ5MwhAmEbyHGW%2B8RyENKYiyFjdyoT4BB9lB2Nm9t8FltZNSiwSHlPu2ckZpXcx3jEjiMf1qBgUmQSA9ZKR7xsdwRl9RmtAXw5ZdLMqCelagxvd1g%2Bny3mKHQOpFaYco9aK0BhCRN8DcRO%2Fmc8eIwCzxCVhEONO61OzoAk%2FMQmbgNk5eHdmecKPqvKp3c1elrdOg2ihwrRm7c2yvWjnVClV2GfjaqNzmrLZ39rRwkb1y7ZRrms8p120lWN2QUimTeJ3AB8zPOolXiSfs%2FNNZwziOh5JBje1ouTo3W62IE1SvOR60yCRuDjevZ%2FdeCIuy2gvs6apan21iiISysT9Zu%2FxcvebnYJhwlp5r69BjaOYVJ9f%2F76QvD28n4cW92nYSHPv%2BEg3NxA%2B4L%2BNH%2BntKSPwPGm9i6g%3D%3D",
88
"submittedOn": "2024-04-22T02:23:58.468Z",
99
"socialPermission": true
1010
}
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
{
2+
"title": "Mathematical Marbling",
3+
"videoNumber": "183",
4+
"description": "All aboard as I attempt to simulate the artistic process of paper marbling. The algorithm is based on the paper 'Mathematical Marbling' by S. Lu, A. Jaffer, X. Jin, H. Zhao, and X. Mao. The code is written in JavaScript using the p5.js library.",
5+
"videoId": "p7IGZTjC008",
6+
"nebulaSlug": "codingtrain-coding-challenge-183-paper-marbling-simulation",
7+
"date": "2024-05-02",
8+
"languages": ["p5.js", "JavaScript"],
9+
"topics": ["mathematical marbling", "fluid simulation"],
10+
"canContribute": true,
11+
"relatedChallenges": ["56-attraction-and-repulsion-forces", "102-2d-water-ripple", "132-fluid-simulation", "177-soft-body-character"],
12+
"timestamps": [
13+
{ "time": "0:00", "title": "Introduction" },
14+
{ "time": "1:47", "title": "Mathematical Marbling" },
15+
{ "time": "2:16", "title": "Explain approach" },
16+
{ "time": "3:20", "title": "Start Coding" },
17+
{ "time": "4:20", "title": "Dropping paint" },
18+
{ "time": "7:03", "title": "Add the circle vertices using polar coordinates" },
19+
{ "time": "10:57", "title": "Add a marble function" },
20+
{ "time": "13:24", "title": "Refine the algorithm" },
21+
{ "time": "16:45", "title": "Add a tine function" },
22+
{ "time": "19:46", "title": "Circle detail" },
23+
{ "time": "24:50", "title": "Generalize the tine function" },
24+
{ "time": "29:43", "title": "Possible variations" },
25+
{ "time": "31:45", "title": "Outro" }
26+
],
27+
"codeExamples": [
28+
{
29+
"title": "Mathematical Marbling",
30+
"description": "Implementation of mathematical marbling",
31+
"image": "marble.jpg",
32+
"urls": {
33+
"p5": "https://editor.p5js.org/codingtrain/sketches/fsw-rJrpr"
34+
}
35+
},
36+
{
37+
"title": "Dodecahedron",
38+
"description": "Code example for rendering a dodecahedron.",
39+
"image": "dodecahedron.jpg",
40+
"urls": {
41+
"p5": "https://editor.p5js.org/codingtrain/sketches/frIcGeI8l"
42+
}
43+
},
44+
{
45+
"title": "Marbling Phyllotaxis",
46+
"description": "Adding ink drops using phyllotaxis.",
47+
"image": "phyllotaxis.jpg",
48+
"urls": {
49+
"p5": "https://editor.p5js.org/codingtrain/sketches/xoK1M7K3-"
50+
}
51+
},
52+
{
53+
"title": "Marbling Mouse",
54+
"description": "This example demonstrates interactivity adding the ink.",
55+
"image": "mouse.jpg",
56+
"urls": {
57+
"p5": "https://editor.p5js.org/codingtrain/sketches/GlQ8BqbZ2"
58+
}
59+
},
60+
{
61+
"title": "Marbling Color",
62+
"description": "This example demonstrates adding a color palette.",
63+
"image": "palette.jpg",
64+
"urls": {
65+
"p5": "https://editor.p5js.org/codingtrain/sketches/ONPlawNRq"
66+
}
67+
},
68+
{
69+
"title": "Marbling Combs",
70+
"description": "This example demonstrates adding tine lines.",
71+
"image": "tines.jpg",
72+
"urls": {
73+
"p5": "https://editor.p5js.org/codingtrain/sketches/kUPncgjvO"
74+
}
75+
},
76+
{
77+
"title": "Marbling Raster Pixels",
78+
"description": "This example demonstrates marbling by raster-rendering the pixels.",
79+
"image": "raster.jpg",
80+
"urls": {
81+
"p5": "https://editor.p5js.org/codingtrain/sketches/5b29Taght"
82+
}
83+
},
84+
{
85+
"title": "Marbling Raster Pixels - Image",
86+
"description": "This example demonstrates marbling the pixels of an image.",
87+
"image": "image.jpg",
88+
"urls": {
89+
"p5": "https://editor.p5js.org/codingtrain/sketches/nb5hSYsgX"
90+
}
91+
},
92+
{
93+
"title": "Marbling Raster Pixels - Video",
94+
"description": "This example demonstrates marbling the pixels of a video.",
95+
"image": "video.jpg",
96+
"urls": {
97+
"p5": "https://editor.p5js.org/codingtrain/sketches/kVyT302xf"
98+
}
99+
},
100+
{
101+
"title": "Marbling Color - animate ink",
102+
"description": "This example demonstrates animating the addition of ink drops",
103+
"image": "animate.jpg",
104+
"urls": {
105+
"p5": "https://editor.p5js.org/codingtrain/sketches/HtEtm1vii"
106+
}
107+
},
108+
{
109+
"title": "handPose Marbling",
110+
"description": "This example demonstrates adding ink drops using ml5.handPose.",
111+
"image": "handPose.jpg",
112+
"urls": {
113+
"p5": "https://editor.p5js.org/codingtrain/sketches/EwQhSqGK5"
114+
}
115+
}
116+
],
117+
"groupLinks": [
118+
{
119+
"title": "References",
120+
"links": [
121+
{
122+
"icon": "🔗",
123+
"title": "Paper Marbling",
124+
"url": "https://en.wikipedia.org/wiki/Paper_marbling",
125+
"description": "Wikipedia article discussing the history and process of paper marbling."
126+
},
127+
{
128+
"icon": "🔗",
129+
"title": "Tokutaro Yagi",
130+
"url": "https://suminagashi.com/meet-the-artisan-tokutaro-yagi/",
131+
"description": "Article about Suminagashi master Tokutaro Yagi."
132+
},
133+
{
134+
"icon": "🔗",
135+
"title": "Digital Marbling",
136+
"url": "https://blog.amandaghassaei.com/2022/10/25/digital-marbling/",
137+
"description": "Blog post about digital marbling by Amanda Ghassaei."
138+
},
139+
{
140+
"icon": "📄",
141+
"title": "Mathematical Marbling",
142+
"url": "https://doi.org/10.1109/MCG.2011.51",
143+
"description": "S. Lu, A. Jaffer, X. Jin, H. Zhao and X. Mao, in IEEE Computer Graphics and Applications, vol. 32, no. 6, pp. 26-35, Nov.-Dec. 2012"
144+
},
145+
{
146+
"icon": "🔗",
147+
"title": "Mathematical Marbling",
148+
"url": "https://people.csail.mit.edu/jaffer/Marbling/",
149+
"description": "Posts that cover algorithms and mathematics of simulating paper marbling."
150+
}
151+
]
152+
},
153+
{
154+
"title": "Videos",
155+
"links": [
156+
{
157+
"icon": "🎥",
158+
"title": "The Hydrodynamics of Marbling Art",
159+
"url": "https://gfm.aps.org/meetings/dfd-2023/649b3ad8199e4c137897831b",
160+
"description": "Y. Sun, J. W. M. Bush, S. E. Spagnolie, and C. H. Rycroft, APS Division of Fluid Dynamics Gallery of Fluid Motion, V0002 (2023). (doi:10.1103/APS.DFD.2023.GFM.V0002)"
161+
},
162+
{
163+
"icon": "🎥",
164+
"title": "Polar Coordinates - p5.js Tutorial",
165+
"url": "/tracks/the-nature-of-code-2/noc/3-angles/4-polar-coordinates",
166+
"description": "A dive into the trigonometric functions—sine, cosine, and tangent."
167+
}
168+
]
169+
}
170+
],
171+
"credits": [
172+
{
173+
"title": "Editing",
174+
"name": "Mathieu Blanchette"
175+
},
176+
{
177+
"title": "Animations",
178+
"name": "Jason Heglund"
179+
}
180+
]
181+
}
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Perlin Noise, Interactive",
3+
"author": {
4+
"name": "Mohamed"
5+
},
6+
"url": "https://mmedoo.github.io/work/phyllotaxis/",
7+
"submittedOn": "2024-04-27T17:10:29.328Z",
8+
"socialPermission": true
9+
}
Loading
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"title": "Neon Lights",
3+
"author": {
4+
"name": "Panna",
5+
"instagram": "https://www.instagram.com/white_pomeranian_panna/"
6+
},
7+
"url": "https://editor.p5js.org/tamaki.komatsuzaki/sketches/9_Y2gNkAK",
8+
"submittedOn": "2024-05-02T04:43:32.731Z",
9+
"socialPermission": true
10+
}
Loading

0 commit comments

Comments
 (0)