Skip to content

Commit f4dce86

Browse files
Merge branch 'main' into how-to-label-your-p5-canvas-tutorial
2 parents be4e706 + 63a8367 commit f4dce86

File tree

20 files changed

+1768
-1586
lines changed

20 files changed

+1768
-1586
lines changed

dist/download/version.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "1.8.0",
3-
"date": "October 25, 2023"
4-
}
2+
"version": "1.9.0",
3+
"date": "November 28, 2023"
4+
}

src/assets/js/p5.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/js/reference.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2451,7 +2451,7 @@ define('text!tpl/item.html',[],function () { return '<h2><%=item.name%><% if (it
24512451
define('text!tpl/class.html',[],function () { return '\n<% if (typeof constructor !== \'undefined\') { %>\n<div class="constructor">\n <%=constructor%>\n</div>\n<% } %>\n\n<% let fields = _.filter(things, function(item) { return item.itemtype === \'property\' && item.access !== \'private\' }); %>\n<% if (fields.length > 0) { %>\n <h3 id=\'reference-fields\'>Fields</h3>\n <ul aria-labelledby=\'reference-fields\'>\n <% _.each(fields, function(item) { %>\n <li>\n <div class=\'paramname\'><a href="<%=item.hash%>" <% if (item.module !== module) { %>class="addon"<% } %>><%=item.name%></a></div>\n <div class=\'paramtype\'><%= item.description %></div>\n </li>\n <% }); %>\n </ul>\n<% } %>\n\n<% let methods = _.filter(things, function(item) { return item.itemtype === \'method\' && item.access !== \'private\' }); %>\n<% if (methods.length > 0) { %>\n <h3 id=\'reference-methods\'>Methods</h3>\n <ul aria-labelledby=\'reference-methods\'>\n <% _.each(methods, function(item) { %>\n <li>\n <div class=\'paramname\'><a href="<%=item.hash%>" <% if (item.module !== module) { %>class="addon"<% } %>><%=item.name%><% if (item.itemtype === \'method\') { %>()<%}%></a></div>\n <div class=\'paramtype\'><%= item.description %></div>\n </li>\n <% }); %>\n </ul>\n<% } %>\n';});
24522452

24532453

2454-
define('text!tpl/itemEnd.html',[],function () { return '\n<br><br>\n\n<div>\n<% if (item.file && item.line) { %>\n<span id="reference-error1">Notice any errors or typos?</span> <a href="https://github.com/processing/p5.js/issues"><span id="reference-contribute2">Please let us know.</span></a> <span id="reference-error3">Please feel free to edit</span> <a href="https://github.com/processing/p5.js/blob/v<%= appVersion %>/<%= item.file %>#L<%= item.line %>" target="_blank" ><%= item.file %></a> <span id="reference-error5">and issue a pull request!</span>\n<% } %>\n</div>\n\n<a style="border-bottom:none !important;" href="http://creativecommons.org/licenses/by-nc-sa/4.0/" target=_blank><img src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" style="width:88px" alt="creative commons logo"/></a>\n<br><br>\n';});
2454+
define('text!tpl/itemEnd.html',[],function () { return '\n<br><br>\n\n<div>\n<% if (item.file && item.line) { %>\n<span id="reference-error1">Notice any errors or typos?</span> <a href="https://github.com/processing/p5.js/issues"><span id="reference-contribute2">Please let us know.</span></a> <span id="reference-error3">Please feel free to edit</span> <a href="https://github.com/processing/p5.js/blob/v<%= appVersion %>/<%= item.file %>#L<%= item.line %>" target="_blank" ><%= item.file %></a> <span id="reference-error5">and issue a pull request!</span>\n<% } %>\n</div>\n\n<a style="border-bottom:none !important;" href="http://creativecommons.org/licenses/by-nc-sa/4.0/" target=_blank><img src="https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png" style="width:88px" alt="creative commons logo"/></a>\n<br><br>\n';});
24552455

24562456
// Copyright (C) 2006 Google Inc.
24572457
//

src/data/data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
title: p5.js
2-
version: 1.8.0
2+
version: 1.9.0

src/data/en.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -739,11 +739,9 @@ learn:
739739
p5.js has a number of basic shapes, like <a class="code">box()</a> or <a class="code">sphere()</a>, but p5.js
740740
is also capable of rendering complex custom geometry, both from 3D model files or from code. This tutorial will walk through how to import 3D models into p5.js, as well as how
741741
to create geometry from scratch.
742-
getting-started-in-webgl-custom-geometry-info1x1: >-
743-
If you are new to 3D check out the
744-
getting-started-in-webgl-custom-geometry-info1x2: >-
745-
tutorial.
746-
getting-started-in-webgl-custom-geometry-toc-title: Table of Contents
742+
getting-started-in-webgl-custom-geometry-info1x1: 'If you are new to 3D check out the '
743+
getting-started-in-webgl-custom-geometry-info1x2: ' tutorial.'
744+
getting-started-in-webgl-custom-geometry-toc-title: Table of Contents
747745
getting-started-in-webgl-custom-geometry-heading1: Loading 3D Models from File
748746
getting-started-in-webgl-custom-geometry-p2x1: >-
749747
Custom geometry can be imported into p5.js using either OBJ or STL files. These files are usually generated in

src/data/es.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -810,11 +810,8 @@ accessible-labels-steps-for-labeling-step-2-animated-2: >-
810810
custom geometry, both from 3D model files or from code. This tutorial will
811811
walk through how to import 3D models into p5.js, as well as how to create
812812
geometry from scratch.
813-
getting-started-in-webgl-custom-geometry-info1x1: >-
814-
If you are new to 3D check out the <a
815-
href="{{root}}/learn/getting-started-in-webgl-coords-and-transform.html">
816-
Coordinates and Transformations</a> tutorial.
817-
getting-started-in-webgl-custom-geometry-info1x2: tutorial.
813+
getting-started-in-webgl-custom-geometry-info1x1: 'If you are new to 3D check out the '
814+
getting-started-in-webgl-custom-geometry-info1x2: ' tutorial.'
818815
getting-started-in-webgl-custom-geometry-toc-title: Table of Contents
819816
getting-started-in-webgl-custom-geometry-heading1: Loading 3D Models from File
820817
getting-started-in-webgl-custom-geometry-p2x1: >-

0 commit comments

Comments
 (0)