Skip to content

Commit c2430f3

Browse files
amirfeqhiamirfeqhi
authored
Merge branch 'development' into development
2 parents 1cf3ab6 + f5bd687 commit c2430f3

File tree

23 files changed

+477
-2
lines changed

23 files changed

+477
-2
lines changed

‎.all-contributorsrc‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,38 @@
10411041
"contributions": [
10421042
"doc"
10431043
]
1044+
},
1045+
{
1046+
"login": "benbot",
1047+
"name": "Benjamin Botwin",
1048+
"avatar_url": "https://avatars2.githubusercontent.com/u/1340967?v=4",
1049+
"profile": "https://github.com/benbot",
1050+
"contributions": [
1051+
"review",
1052+
"question",
1053+
"ideas"
1054+
]
1055+
},
1056+
{
1057+
"login": "henrmota",
1058+
"name": "Henrique Mota",
1059+
"avatar_url": "https://avatars1.githubusercontent.com/u/896860?v=4",
1060+
"profile": "https://github.com/henrmota",
1061+
"contributions": [
1062+
"review",
1063+
"question",
1064+
"ideas"
1065+
]
1066+
},
1067+
{
1068+
"login": "CaseyPYZ",
1069+
"name": "CaseyPan",
1070+
"avatar_url": "https://avatars3.githubusercontent.com/u/37056925?v=4",
1071+
"profile": "https://github.com/CaseyPYZ",
1072+
"contributions": [
1073+
"code",
1074+
"ideas"
1075+
]
10441076
}
10451077
],
10461078
"contributorsPerLine": 7,

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
232232
<td align="center"><a href="http://wysko.org"><img src="https://avatars0.githubusercontent.com/u/31376393?v=4" width="100px;" alt=""/><br /><sub><b>Jacob Wysko</b></sub></a><br /><a href="#content-wyskoj" title="Content">🖋</a></td>
233233
<td align="center"><a href="http://dilwoarhussain.com"><img src="https://avatars2.githubusercontent.com/u/4599889?v=4" width="100px;" alt=""/><br /><sub><b>Dilwoar Hussain</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=DilwoarH" title="Documentation">📖</a></td>
234234
<td align="center"><a href="https://www.linkedin.com/in/manaswini-das/"><img src="https://avatars0.githubusercontent.com/u/22885912?v=4" width="100px;" alt=""/><br /><sub><b>Manaswini Das</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=manaswinidas" title="Documentation">📖</a></td>
235+
<td align="center"><a href="https://github.com/benbot"><img src="https://avatars2.githubusercontent.com/u/1340967?v=4" width="100px;" alt=""/><br /><sub><b>Benjamin Botwin</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/pulls?q=is%3Apr+reviewed-by%3Abenbot" title="Reviewed Pull Requests">👀</a> <a href="#question-benbot" title="Answering Questions">💬</a> <a href="#ideas-benbot" title="Ideas, Planning, & Feedback">🤔</a></td>
236+
<td align="center"><a href="https://github.com/henrmota"><img src="https://avatars1.githubusercontent.com/u/896860?v=4" width="100px;" alt=""/><br /><sub><b>Henrique Mota</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/pulls?q=is%3Apr+reviewed-by%3Ahenrmota" title="Reviewed Pull Requests">👀</a> <a href="#question-henrmota" title="Answering Questions">💬</a> <a href="#ideas-henrmota" title="Ideas, Planning, & Feedback">🤔</a></td>
237+
<td align="center"><a href="https://github.com/CaseyPYZ"><img src="https://avatars3.githubusercontent.com/u/37056925?v=4" width="100px;" alt=""/><br /><sub><b>CaseyPan</b></sub></a><br /><a href="https://github.com/ml5js/ml5-library/commits?author=CaseyPYZ" title="Code">💻</a> <a href="#ideas-CaseyPYZ" title="Ideas, Planning, & Feedback">🤔</a></td>
235238
</tr>
236239
</table>
237240

‎examples/examples.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎examples/p5js/CartoonGAN/CartoonGan_Basic/MrBubz.jpg‎

13.2 KB
Loading

‎examples/p5js/CartoonGAN/CartoonGan_Basic/index.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<html lang="en">
2+
<head>
3+
<title>CartoonGAN Basic</title>
4+
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
6+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.sound.min.js"></script>
8+
9+
<script src="http://localhost:8080/ml5.js" type="text/javascript"></script>
10+
</head>
11+
12+
<body>
13+
<script src="sketch.js"></script>
14+
</body>
15+
</html>

‎examples/p5js/CartoonGAN/CartoonGan_Basic/sketch.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
let cartoonGan;
2+
let img;
3+
let newImage;
4+
function preload(){
5+
img = loadImage('MrBubz.jpg');
6+
}
7+
8+
function setup(){
9+
createCanvas(160, 160);
10+
11+
cartoonGan = ml5.cartoon(modelLoaded)
12+
image(img, 0,0, width, height)
13+
}
14+
15+
function modelLoaded(){
16+
cartoonGan.generate(img, gotResults)
17+
}
18+
19+
function gotResults(err, result){
20+
if(err){
21+
return;
22+
}
23+
console.log(result)
24+
image(result.image, 0,0, 160, 160);
25+
26+
}
27+

‎examples/p5js/CartoonGAN/CartoonGan_LoadModel/MrBubz.jpg‎

13.2 KB
Loading

‎examples/p5js/CartoonGAN/CartoonGan_LoadModel/index.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<html lang="en">
2+
<head>
3+
<title>CartoonGAN Load model locally</title>
4+
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
6+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.sound.min.js"></script>
8+
9+
<script src="http://localhost:8080/ml5.js" type="text/javascript"></script>
10+
</head>
11+
12+
<body>
13+
<h1>CartoonGAN Local Model Locally</h1>
14+
<p>Trained models via: <a href="https://github.com/leemengtaiwan/tfjs-models" target="_blank">@leemengtaiwan</a></p>
15+
<script src="sketch.js"></script>
16+
</body>
17+
</html>

‎examples/p5js/CartoonGAN/CartoonGan_LoadModel/model/group1-shard1of3‎

4 MB
Binary file not shown.

‎examples/p5js/CartoonGAN/CartoonGan_LoadModel/model/group1-shard2of3‎

Lines changed: 12 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)