Skip to content

Commit

Permalink
feat: uniformise matX common methods
Browse files Browse the repository at this point in the history
- reorder
- add mat3.copy and remove mat3._set9
- add mat3x3.copy and mat3x3.equals
  • Loading branch information
dmnsgn committed Feb 8, 2022
1 parent 5b114bd commit aac7090
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 55 deletions.
24 changes: 19 additions & 5 deletions mat2x3.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,35 @@ export function create() {
]
}

export function identity(a) {
a[0] = a[3] = 1;
a[1] = a[2] = a[4] = a[5] = 0;
return a;
}

export function copy(a) {
return a.slice();
}

export function set(a, b) {
a[0] = b[0];
a[1] = b[1];
a[2] = b[2];
a[3] = b[3];
a[4] = b[4];
a[5] = b[5];

return a;
}

export function identity(a) {
a[0] = a[3] = 1;
a[1] = a[2] = a[4] = a[5] = 0;
return a;
export function equals(a, b) {
return (
a[0] === b[0] &&
a[1] === b[1] &&
a[2] === b[2] &&
a[3] === b[3] &&
a[4] === b[4] &&
a[5] === b[5]
);
}

export function mult(a, b) {
Expand Down
47 changes: 19 additions & 28 deletions mat3.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,14 @@ export function create() {
]
}

export function equals(a, b) {
return (
a[0] === b[0] &&
a[1] === b[1] &&
a[2] === b[2] &&
a[3] === b[3] &&
a[4] === b[4] &&
a[5] === b[5] &&
a[6] === b[6] &&
a[7] === b[7] &&
a[8] === b[8] &&
a[9] === b[9]
);
export function identity(a) {
a[0] = a[4] = a[8] = 1;
a[1] = a[2] = a[3] = a[5] = a[6] = a[7] = 0;
return a;
}

export function _set9(a, b00, b01, b02, b10, b11, b12, b20, b21, b22) {
a[0] = b00;
a[1] = b01;
a[2] = b02;
a[3] = b10;
a[4] = b11;
a[5] = b12;
a[6] = b20;
a[7] = b21;
a[8] = b22;
return a;
export function copy(a) {
return a.slice();
}

export function set(a, b) {
Expand All @@ -48,10 +30,19 @@ export function set(a, b) {
return a;
}

export function identity(a) {
a[0] = a[4] = a[8] = 1;
a[1] = a[2] = a[3] = a[5] = a[6] = a[7] = 0;
return a;
export function equals(a, b) {
return (
a[0] === b[0] &&
a[1] === b[1] &&
a[2] === b[2] &&
a[3] === b[3] &&
a[4] === b[4] &&
a[5] === b[5] &&
a[6] === b[6] &&
a[7] === b[7] &&
a[8] === b[8] &&
a[9] === b[9]
);
}

export function mult(a, b) {
Expand Down
44 changes: 22 additions & 22 deletions mat4.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,28 @@ export function create() {
]
}

export function identity(a) {
a[0] = a[5] = a[10] = a[15] = 1;
a[1] =
a[2] =
a[3] =
a[4] =
a[6] =
a[7] =
a[8] =
a[9] =
a[11] =
a[12] =
a[13] =
a[14] =
0;
return a;
}

export function copy(a) {
return a.slice();
}

export function set(a, b) {
a[0] = b[0];
a[1] = b[1];
Expand Down Expand Up @@ -51,10 +73,6 @@ export function equals(a, b) {
);
}

export function copy(a) {
return a.slice();
}

export function _mult16(
a,
b00,
Expand Down Expand Up @@ -369,24 +387,6 @@ export function transpose(a) {
return a;
}

export function identity(a) {
a[0] = a[5] = a[10] = a[15] = 1;
a[1] =
a[2] =
a[3] =
a[4] =
a[6] =
a[7] =
a[8] =
a[9] =
a[11] =
a[12] =
a[13] =
a[14] =
0;
return a;
}

export function _scale3(a, x, y, z) {
a[0] *= x;
a[1] *= x;
Expand Down

0 comments on commit aac7090

Please sign in to comment.