Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/yuidoc-p5-theme/assets/transformation-matrix.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/addons/p5.sound.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function getAudioContext() {
* example below. This method utilizes
* <a href="https://github.com/tambien/StartAudioContext">StartAudioContext
* </a>, a library by Yotam Mann (MIT Licence, 2016).</p>
* @param {Element|Array} [element(s)] This argument can be an Element,
* @param {Element|Array} [elements] This argument can be an Element,
* Selector String, NodeList, p5.Element,
* jQuery Element, or an Array of any of those.
* @param {Function} [callback] Callback to invoke when the AudioContext
Expand Down
6 changes: 3 additions & 3 deletions src/core/shape/vertex.js
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ p5.prototype.quadraticVertex = function(...args) {
* @method vertex
* @param {Number} x
* @param {Number} y
* @param {Number} z z-coordinate of the vertex.
* @param {Number} [z] z-coordinate of the vertex.
* Defaults to 0 if not specified.
* @chainable
*/
Expand All @@ -967,8 +967,8 @@ p5.prototype.quadraticVertex = function(...args) {
* @param {Number} x
* @param {Number} y
* @param {Number} [z]
* @param {Number} u the vertex's texture u-coordinate
* @param {Number} v the vertex's texture v-coordinate
* @param {Number} [u] the vertex's texture u-coordinate
* @param {Number} [v] the vertex's texture v-coordinate
* @chainable
*/
p5.prototype.vertex = function(x, y, moveTo, u, v) {
Expand Down
40 changes: 34 additions & 6 deletions src/core/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,41 @@ import p5 from './main';
* > <img style="max-width: 150px" src="assets/transformation-matrix.png"
* alt="The transformation matrix used when applyMatrix is called"/>
*
* <img style="max-width: 150px" src="assets/transformation-matrix-4-4.png"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

150px width is a bit too small for this matrix. You can preview this using grunt yui:dev.

* alt="The transformation matrix used when applyMatrix is called with 4x4 matrix"/>
*
* @method applyMatrix
* @param {Array} arr an array of numbers - should be 6 or 16 length (2*3 or 4*4 matrix values)
* @chainable
*/
/**
* @method applyMatrix
* @param {Number} a1 numbers which define the 2×3 matrix to be multiplied
* @param {Number} a2 numbers which define the 2×3 matrix to be multiplied
* @param {Number} a3 numbers which define the 2×3 matrix to be multiplied
* @param {Number} a4 numbers which define the 2×3 matrix to be multiplied
* @param {Number} a5 numbers which define the 2×3 matrix to be multiplied
* @param {Number} a6 numbers which define the 2×3 matrix to be multiplied
* @chainable
*/
/**
* @method applyMatrix
* @param {Number|Array} a numbers which define the 2×3 matrix to be multiplied, or an array of numbers
* @param {Number} b numbers which define the 2×3 matrix to be multiplied
* @param {Number} c numbers which define the 2×3 matrix to be multiplied
* @param {Number} d numbers which define the 2×3 matrix to be multiplied
* @param {Number} e numbers which define the 2×3 matrix to be multiplied
* @param {Number} f numbers which define the 2×3 matrix to be multiplied
* @param {Number} b1 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b2 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b3 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b5 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b6 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b7 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b8 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b9 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b10 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b11 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b12 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b13 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b14 numbers which define the 4x4 matrix to be multiplied
* @param {Number} b15 numbers which define the 4x4 matrix to be multipliedo
* @param {Number} b16 numbers which define the 4x4 matrix to be multiplied
* @chainable
* @example
* <div>
Expand Down