Skip to content

Commit d1fcb19

Browse files
authored
Merge branch 'main' into posenet-examples
2 parents d171ff4 + 72a95a4 commit d1fcb19

File tree

103 files changed

+910
-1208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+910
-1208
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ I'm making a Pull Request(PR). Please see the details below.
99

1010
**A good PR 🌟**
1111

12-
### → Step 1: Which branch are you submitting to? 🌲
13-
> Development (for new features or updates), Release (for bug fixes), or ___________?
14-
15-
16-
17-
### → Step 2: Describe your Pull Request 📝
12+
### → Step 1: Describe your Pull Request 📝
1813
> Fixing a Bug? Adding an Update? Submitting a New Feature? Does it introduce a breaking change?
1914
2015

@@ -23,15 +18,15 @@ I'm making a Pull Request(PR). Please see the details below.
2318

2419
**A great PR 🌟🌟**
2520

26-
### → Step 3: Share a Relevant Example 🦄
21+
### → Step 2: Share a Relevant Example 🦄
2722
> Here's some example code or a demonstration of my feature as a part of this pull request, a separate pull request, in the https://editor.p5js.org, or codepen/jsfiddle/etc...
2823
2924

3025

3126

3227
**The best PR 🌟🌟🌟**
3328

34-
### → Step 4: Screenshots or Relevant Documentation 🖼
29+
### → Step 3: Screenshots or Relevant Documentation 🖼
3530
> Here's some helpful screenshots and/or documentation of the new feature
3631
3732

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ We like these hashtags: #noCodeSnobs (because we value community over efficiency
4141

4242
Our community is always looking for enthusiasts to help in all different ways.
4343

44-
- **Develop**. [GitHub](https://github.com/ml5js/ml5-library) is the main place where code is collected, issues are documented, and discussions about code are had. Check out the [contributing documentation to get started](https://github.com/ml5js/ml5-library/blob/development/CONTRIBUTING.md) with developing the library.
44+
- **Develop**. [GitHub](https://github.com/ml5js/ml5-library) is the main place where code is collected, issues are documented, and discussions about code are had. Check out the [contributing documentation to get started](https://github.com/ml5js/ml5-library/blob/main/CONTRIBUTING.md) with developing the library.
4545
- **Document**. Everyone loves documentation. Help is needed porting examples, and adding documentation, and creating tutorials.
4646
- **Teach**. Teach a workshop, a class, a friend, a collaborator! Tag [@ml5js on Twitter](https://twitter.com/ml5js?lang=en) and we will do our best to share what you're doing.
4747
- **Create**. ml5.js is looking for designers, artists, coders, programmers to bring your creative and amazing work to show and inspire other people. Submit your work to [email protected].

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Preamble: If you're interested in to contribute to the ml5 project, just know yo
3737
3. you make a comment on an existing issue or post your issue and indicate that you're curious to do your best to solve it 🔬
3838
4. you create a new branch on your `forked` copy of the ml5-library and call it something meaningful like `fix-detection-results`
3939
5. you jam on fixing the bug, commit your changes with meaningful commit messages, and push your changes to your bug fix branch (e.g. `fix-detection-results`)
40-
6. when ready, make a pull request to the `release` branch or `development` branch of ml5-library. Submit to the `release` branch if the bug you found was in the current ml5 release - the version of ml5 which is on npm. Submit to the `development` branch if the bug you found was in `development` branch of ml5-library.
41-
7. the ml5 dev team will review your changes and quite likely correspond with you on your changes. When all looks good, your changes will be merged in. 🎉
40+
6. when ready, make a pull request to the `main` branch of ml5-library. Prepend "[NEEDS RELEASE]" to the title if the bug you found was in the current ml5 release - the version of ml5 which is on npm.
41+
7. the ml5 dev team will review your changes and quite likely correspond with you on your changes. When all looks good, a `ready for release` label will be added to your PR and your changes will be merged in and release with the next public update to the library. 🎉
4242
8. hi-fives 👏 and hugs 🤗
4343

4444
### For new features or feature additions/updates
@@ -48,7 +48,7 @@ Preamble: If you're interested in to contribute to the ml5 project, just know yo
4848
4. you create a new branch on your `forked` copy of the ml5-library and call it something meaningful like `new-generative-model-x`
4949
5. you jam on your new feature, commit your changes with meaningful commit messages, and push your changes to your new feature branch (e.g. `new-generative-model-x`)
5050
6. you should also add an example of your new feature to the `examples/` directory so that other people can learn how to use your new feature.
51-
7. when ready, make a pull request to the `development` branch of ml5-library. Submit to the `development` since your feature is part of the new frontier of the ml5-library.
51+
7. when ready, make a pull request to the `main` branch of ml5-library.
5252
8. the ml5 dev team will review your changes and quite likely correspond with you on your changes. When all looks good, your changes will be merged in. 🎉
5353
9. hi-fives 👏 and hugs 🤗
5454

@@ -168,21 +168,19 @@ NVM_HOMEBREW="/usr/local/opt/nvm/nvm.sh"
168168
npm run manual-test
169169
```
170170
171-
This creates a new folder called `/manual-test` in the project's root folder. Create an `index.html` file inside `/manual-test` and add the following:
171+
This creates a new folder called `/manual-test` in the project's root folder. The `/manual-test` folder contains an `index.html` file with the following content:
172172

173173
```html
174174
<!DOCTYPE html>
175175
<html>
176176
<head>
177-
<title>Test</title>
177+
<title>ml5.js manual test</title>
178178
<script src="http://localhost:8080/ml5.js"></script>
179179
</head>
180180
<body>
181-
182181
<script>
183-
182+
// Your scripts would be written here
184183
</script>
185-
186184
</body>
187185
</html>
188186
```
@@ -254,6 +252,8 @@ This last one is case sensitive!
254252

255253
## Making Releases (For the ml5 core team)
256254

255+
**NOTE: This section needs to be updated to align with the new `main` branch structure.**
256+
257257
Work in progress - we are working on making a few scripts to make it easier to make releases and deployments. For now, to address the long-winded process noted in https://github.com/ml5js/ml5-library/issues/387, we are experimenting with some devOps scripts.
258258

259259
In the instance you're ready to make a new release from `development` to `release`:

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# ![ml5](https://user-images.githubusercontent.com/10605821/41332516-2ee26714-6eac-11e8-83e4-a40b8761e764.png)
2-
[![All Contributors](https://img.shields.io/badge/all_contributors-86-orange.svg?style=flat-square)](#contributors)
3-
4-
5-
[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=QVNDdlkvMzNYSmhRRWlweXlIOTBENkd0MDBCOUJlbmFVZFRneFIzNlh4az0tLXA4S0loSGNlVUc2V2I3cVdLdXBKdGc9PQ==--8a5e5bfd3eafbba0702c02ec57ffec9d627a78ef)](https://www.browserstack.com/automate/public-build/QVNDdlkvMzNYSmhRRWlweXlIOTBENkd0MDBCOUJlbmFVZFRneFIzNlh4az0tLXA4S0loSGNlVUc2V2I3cVdLdXBKdGc9PQ==--8a5e5bfd3eafbba0702c02ec57ffec9d627a78ef)[![Version](https://img.shields.io/npm/v/ml5.svg?style=flat-square)](https://www.npmjs.com/package/ml5)
2+
[![All Contributors](https://img.shields.io/badge/all_contributors-86-orange.svg?style=flat-square)](#contributors) [![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=eEtiK0lGeGpGZ2svSGd0WWJnclo3SGtxdEZ5anFmOE4zaFRyOUJkTFhHbz0tLWo1eUNzd0hpQUZjR2Rya0hIQjhIUHc9PQ==--45955c1082b17348f534b62689f945967b4e459e)](https://automate.browserstack.com/public-build/eEtiK0lGeGpGZ2svSGd0WWJnclo3SGtxdEZ5anFmOE4zaFRyOUJkTFhHbz0tLWo1eUNzd0hpQUZjR2Rya0hIQjhIUHc9PQ==--45955c1082b17348f534b62689f945967b4e459e) [![Version](https://img.shields.io/npm/v/ml5.svg?style=flat-square)](https://www.npmjs.com/package/ml5)
63
[![Twitter Follow](https://img.shields.io/twitter/follow/espadrine.svg?style=social&label=Follow)](https://twitter.com/ml5js)
74

85

@@ -32,11 +29,11 @@ There are several ways you can use the ml5.js library:
3229

3330
<p id="latest-version">
3431

35-
* You can use the latest version (0.5.0) by adding it to the head section of your HTML document:
32+
* You can use the latest version (0.6.0) by adding it to the head section of your HTML document:
3633

37-
**v0.5.0**
34+
**v0.6.0**
3835

39-
<script src="https://unpkg.com/ml5@0.5.0/dist/ml5.min.js" type="text/javascript"></script>
36+
<script src="https://unpkg.com/ml5@0.6.0/dist/ml5.min.js" type="text/javascript"></script>
4037

4138
</p data-id="latest-version">
4239

@@ -57,7 +54,7 @@ There are several ways you can use the ml5.js library:
5754

5855
For example:
5956
```html
60-
<script src="https://unpkg.com/ml5@0.5.0/dist/ml5.min.js" type="text/javascript"></script>
57+
<script src="https://unpkg.com/ml5@0.6.0/dist/ml5.min.js" type="text/javascript"></script>
6158
```
6259

6360
* You can also reference "latest", but we do not recommend this as your code may break as we update ml5.
@@ -70,13 +67,13 @@ For example:
7067

7168
- [Getting Started](https://ml5js.org/getting-started/)
7269
- [API Reference](https://ml5js.org/reference/)
73-
- [Examples](https://github.com/ml5js/ml5-library/tree/development/examples)
70+
- [Examples](https://github.com/ml5js/ml5-library/tree/main/examples)
7471
- [Community](https://ml5js.org/community)
7572
- [FAQ](https://ml5js.org/getting-started/faq/)
7673

7774
## Standalone Examples
7875

79-
You can find a collection of standalone examples in this repository within the `examples/` directory. You can also test working hosted of the examples online on the ml5.js examples index website (TODO: Add a link).
76+
You can find a collection of standalone examples in this repository within the `examples/` directory. You can also test working hosted of the examples online on the [ml5.js examples index website](https://examples.ml5js.org/).
8077

8178
These examples are meant to serve as an introduction to the library and machine learning concepts.
8279

7.79 MB
Loading

docs/_sidebar.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
* [PoseNet](/reference/posenet.md)
3939
* [BodyPix](/reference/bodypix.md)
4040
* [UNET](/reference/unet.md)
41+
* [Handpose](/reference/handpose.md)
4142
* [Facemesh](/reference/facemesh.md)
4243
* [FaceApi](/reference/face-api.md)
4344
* [StyleTransfer](/reference/style-transfer.md)

docs/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mostly.
66

77
A number of the ml5 sketches don't currently work in the p5 web editor due to some of the ways that the editor handles data files and some of the network communication regarding making requests to external data (e.g. the big model files that allow ml5.js to run things like image detection, etc).
88

9-
There are lots of developments in the p5 web editor as well as in ml5 to make sure these environments all play nicely together. If something doesn't work in the web editor, the best thing to do is to try and run things locally if possible. See [running a local web server tutorial](/docs/tutorials/local-web-server.md).
9+
There are lots of developments in the p5 web editor as well as in ml5 to make sure these environments all play nicely together. If something doesn't work in the web editor, the best thing to do is to try and run things locally if possible. See [running a local web server tutorial](/tutorials/local-web-server.md).
1010

1111
Thanks!
1212

@@ -28,4 +28,4 @@ Please contact us at [@ml5js on twitter](https://twitter.com/ml5js), <a href="ma
2828

2929
### How can I contribute?
3030

31-
Please refer to the contributor documentation [on Github](https://github.com/ml5js/ml5-library/blob/development/CONTRIBUTING.md).
31+
Please refer to the contributor documentation [on Github](https://github.com/ml5js/ml5-library/blob/main/CONTRIBUTING.md).

docs/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
</a>
8585

8686
<div class="Menu__Top__Menu">
87-
<a class="Menu__Top__Menu__Item" href="https://ml5js.github.io/ml5-library/docs/#/"
87+
<a class="Menu__Top__Menu__Item" href="https://learn.ml5js.org/#/"
8888
>Getting Started</a
8989
>
90-
<a class="Menu__Top__Menu__Item" href="https://ml5js.github.io/ml5-library/docs/#/reference/index"
90+
<a class="Menu__Top__Menu__Item" href="https://learn.ml5js.org/#/reference/index"
9191
>Reference</a
9292
>
9393
<a class="Menu__Top__Menu__Item" href="https://ml5js.org/community/">Community</a>

docs/reference/bodypix.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ bodyPix.segmentWithParts(?input, ?options, callback);
262262
## Examples
263263
264264
**p5.js**
265-
* [BodyPix_Image](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/BodyPix/BodyPix_Image)
266-
* [BodyPix_Webcam](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/BodyPix/BodyPix_Webcam)
267-
* [BodyPix_Webcam_Parts](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/BodyPix/BodyPix_Webcam_Parts)
268-
* [BodyPix_p5Instance](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/BodyPix/BodyPix_p5Instance)
265+
* [BodyPix_Image](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/BodyPix/BodyPix_Image)
266+
* [BodyPix_Webcam](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/BodyPix/BodyPix_Webcam)
267+
* [BodyPix_Webcam_Parts](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/BodyPix/BodyPix_Webcam_Parts)
268+
* [BodyPix_p5Instance](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/BodyPix/BodyPix_p5Instance)
269269
270270
**p5 web editor**
271271
* [BodyPix_Image](https://editor.p5js.org/ml5/sketches/BodyPix_Image)
@@ -274,9 +274,9 @@ bodyPix.segmentWithParts(?input, ?options, callback);
274274
* [BodyPix_p5Instance](https://editor.p5js.org/ml5/sketches/BodyPix_p5Instance)
275275
276276
**plain javascript**
277-
* [BodyPix_Image](https://github.com/ml5js/ml5-library/tree/development/examples/javascript/BodyPix/BodyPix_Image)
278-
* [BodyPix_Webcam](https://github.com/ml5js/ml5-library/tree/development/examples/javascript/BodyPix/BodyPix_Webcam)
279-
* [BodyPix_Webcam_Parts](https://github.com/ml5js/ml5-library/tree/development/examples/javascript/BodyPix/BodyPix_Webcam_Parts)
277+
* [BodyPix_Image](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/BodyPix/BodyPix_Image)
278+
* [BodyPix_Webcam](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/BodyPix/BodyPix_Webcam)
279+
* [BodyPix_Webcam_Parts](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/BodyPix/BodyPix_Webcam_Parts)
280280
281281
## Demo
282282
@@ -347,4 +347,4 @@ TBD
347347
348348
## Source Code
349349
350-
* [/src/BodyPix](https://github.com/ml5js/ml5-library/tree/development/src/BodyPix)
350+
* [/src/BodyPix](https://github.com/ml5js/ml5-library/tree/main/src/BodyPix)

docs/reference/charrnn.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
RNN and LSTMs (Long Short Term Memory networks) are a type of Neural Network architecture useful for working with sequential data (like characters in text or the musical notes of a song) where the order of the that sequence matters. This class allows you run a model pre-trained on a body of text to generate new text.
1212

13-
You can train your own models using this tutorial or use this set of pre trained models.
13+
You can train your own models [following the instructions in the training-charRNN repo](https://github.com/ml5js/training-charRNN). There is also a selection of [pre-trained model examples available](https://github.com/ml5js/ml5-data-and-models/tree/main/models/charRNN).
1414

1515
## Quickstart
1616

@@ -153,9 +153,9 @@ charrnn.reset();
153153
## Examples
154154
155155
**p5.js**
156-
* [CharRNN_Interactive](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/CharRNN/CharRNN_Interactive)
157-
* [CharRNN_Text](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/CharRNN/CharRNN_Text)
158-
* [CharRNN_Text_Stateful](https://github.com/ml5js/ml5-library/tree/development/examples/p5js/CharRNN/CharRNN_Text_Stateful)
156+
* [CharRNN_Interactive](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/CharRNN/CharRNN_Interactive)
157+
* [CharRNN_Text](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/CharRNN/CharRNN_Text)
158+
* [CharRNN_Text_Stateful](https://github.com/ml5js/ml5-library/tree/main/examples/p5js/CharRNN/CharRNN_Text_Stateful)
159159
160160
**p5 web editor**
161161
@@ -164,9 +164,9 @@ charrnn.reset();
164164
* [CharRNN_Text_Stateful](https://editor.p5js.org/ml5/sketches/CharRNN_Text_Stateful)
165165
166166
**plain javascript**
167-
* [CharRNN_Interactive](https://github.com/ml5js/ml5-library/tree/development/examples/javascript/CharRNN/CharRNN_Interactive)
168-
* [CharRNN_Text](https://github.com/ml5js/ml5-library/tree/development/examples/javascript/CharRNN/CharRNN_Text)
169-
* [CharRNN_Text_Stateful](https://github.com/ml5js/ml5-library/tree/development/examples/javascript/CharRNN/CharRNN_Text_Stateful)
167+
* [CharRNN_Interactive](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/CharRNN/CharRNN_Interactive)
168+
* [CharRNN_Text](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/CharRNN/CharRNN_Text)
169+
* [CharRNN_Text_Stateful](https://github.com/ml5js/ml5-library/tree/main/examples/javascript/CharRNN/CharRNN_Text_Stateful)
170170
171171
## Demo
172172

0 commit comments

Comments
 (0)