Skip to content

Commit 6d4ffb0

Browse files
limzykennethlimzykenneth
committed
Merge pull request #2 from processing/master
Upstream merge
2 parents 0948ca6 + 928b6eb commit 6d4ffb0

Some content is hidden

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

55 files changed

+1131
-469
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ lib/p5.*
77
docs/reference/*
88
docs/yuidoc-p5-theme/assets/js/reference.js*
99
!*.gitkeep
10+
examples/3d/tutorial
11+
.idea

‎Gruntfile.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
* grunt update_json - This automates updating the bower file
3434
* to match the package.json
3535
*/
36-
3736
module.exports = function(grunt) {
3837

3938
// Specify what reporter we'd like to use for Mocha
@@ -129,7 +128,7 @@ module.exports = function(grunt) {
129128
},
130129
// Watch the codebase for doc updates
131130
yui:{
132-
files:['src/**/*.js'],
131+
files:['src/**/*.js', 'lib/addons/*.js'],
133132
task:['yuidoc']
134133
}
135134
},

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Check out [p5js.org](http://p5js.org) for lots more! Here are some quicklinks:
2424
* [p5.js overview](https://github.com/processing/p5.js/wiki/p5.js-overview) — An overview of the main features and functionality of p5.js.
2525
* [Reference](http://p5js.org/reference) — The functionality supported by p5.js.
2626
* [Learn](http://p5js.org/learn) — Tutorials and short, prototypical examples exploring the basics of p5.js.
27-
* [Forum](http://forum.processing.org/two/) — Ask and answers questions about how to make things with p5.js here.
27+
* [Forum](http://forum.processing.org/two/categories/p5-js) — Ask and answers questions about how to make things with p5.js here.
2828
* [Libraries](http://p5js.org/libraries) — Extend p5 functionality to interact with HTML, manipulate sound, and more!
2929
* [FAQ](https://github.com/processing/p5.js/wiki/Frequently-Asked-Questions)
3030

‎docs/yuidoc-p5-theme-src/scripts/tpl/library.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h3><%= module.name %> library</h3>
1717
<a href="<%=item.hash%>" <% if (item.module !== module.name) { %>class="core"<% } %>><%=item.name%><% if (item.itemtype === 'method') { %>()<%}%></a><br>
1818
<% t++; %>
1919
<% }); %>
20-
<% if (t >= totalItems/4) { col++; t = 0; %>
20+
<% if (t >= Math.floor(totalItems/4)) { col++; t = 0; %>
2121
</div>
2222
<% } %>
2323
<% }); %>

‎docs/yuidoc-p5-theme-src/scripts/tpl/menu.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<% var i=0; %>
33
<% var max=Math.floor(groups.length/4); %>
4-
<% var rem=groups.length%max; %>
4+
<% var rem=groups.length%4; %>
55

66
<% _.each(groups, function(group){ %>
77
<% var m = rem > 0 ? 1 : 0 %>

‎examples/loadingscreen/AvenirNextLTPro-Demi.otf‎

68.3 KB
Binary file not shown.

‎examples/loadingscreen/invalid.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
'a':"foo"
4+
},
5+
{
6+
'a':"bar"
7+
}
8+
]

‎examples/loadingscreen/invalid_json.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>P5.js - Invalid JSON test</title>
6+
<script language="javascript" type="text/javascript" src="../../lib/p5.js"></script>
7+
<script language="javascript" type="text/javascript" src="invalid_json.js"></script>
8+
</head>
9+
<body>
10+
</body>
11+
</html>

‎examples/loadingscreen/invalid_json.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
var myJson;
2+
3+
function preload() {
4+
myJson = loadJSON('invalid.json');
5+
}
6+
7+
function setup(){
8+
createCanvas(300, 300);
9+
}
10+
11+
function draw() {
12+
text(myJson[0].a, 10, 10);
13+
}

‎examples/loadingscreen/mammals.csv‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
id,species,name
2+
0,Capra hircus,Goat
3+
1,Panthera pardus,Leopard
4+
2,Equus zebra,Zebra

0 commit comments

Comments
 (0)