Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Added 4x4 matrix method definition
  • Loading branch information
Gaweph committed Jan 28, 2022
commit 8dc937b6324fff67115929cfea27c1b2d2c151b7
45 changes: 38 additions & 7 deletions src/core/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,45 @@ import p5 from './main';
* alt="The transformation matrix used when applyMatrix is called"/>
*
* @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 {Array} arr an array of numbers
* @chainable
* @example
*
*/

/**
* @method applyMatrix
* @param {Number} a_2x3 numbers which define the 2×3 matrix to be multiplied
* @param {Number} b_2x3 numbers which define the 2×3 matrix to be multiplied
* @param {Number} c_2x3 numbers which define the 2×3 matrix to be multiplied
* @param {Number} d_2x3 numbers which define the 2×3 matrix to be multiplied
* @param {Number} e_2x3 numbers which define the 2×3 matrix to be multiplied
* @param {Number} f_2x3 numbers which define the 2×3 matrix to be multiplied
* @chainable
*
*/

/**
* @method applyMatrix
* @param {Number} a_4x4 numbers which define the 4x4 matrix to be multiplied
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Rationale:

p5.RendererGL.applyMAtrix(arguments) is called from this method which then expects either 6 or 16 values

p5.RendererGL.prototype.applyMatrix = function(a, b, c, d, e, f) {
  if (arguments.length === 16) { // 4x4 matrix
    p5.Matrix.prototype.apply.apply(this.uMVMatrix, arguments);
  } 
};

* @param {Number} b_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} c_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} d_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} e_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} f_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} g_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} h_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} i_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} j_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} k_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} l_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} m_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} n_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} o_4x4 numbers which define the 4x4 matrix to be multiplied
* @param {Number} p_4x4 numbers which define the 4x4 matrix to be multiplied
* @chainable
*
* @example
*
* <div>
* <code>
* function setup() {
Expand Down