Skip to content

Commit 294ffce

Browse files
BretHudsonBretHudson
committed
Update comments, move lines of code around to reflect M[row][col] convention
1 parent a9e31f9 commit 294ffce

6 files changed

Lines changed: 191 additions & 172 deletions

File tree

‎src/linear-algebra/mat2.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ const INDICES = [
1818
1, 3,
1919
] as const;
2020

21-
/** Column 0, Row 0 index */
21+
/** Row 0, Column 0 index */
2222
const M00 = INDICES[0];
23-
/** Column 1, Row 0 index */
23+
/** Row 0, Column 1 index */
2424
const M01 = INDICES[1];
2525

26-
/** Column 0, Row 1 index */
26+
/** Row 1, Column 0 index */
2727
const M10 = INDICES[2];
28-
/** Column 1, Row 1 index */
28+
/** Row 1, Column 1 index */
2929
const M11 = INDICES[3];
3030

3131
/**
@@ -38,10 +38,10 @@ export class Mat2 extends Array<number> {
3838

3939
/**
4040
* Uninitialized values defaults to the 2x2 identity matrix.
41-
* @param m00 - Element at column 0, row 0
42-
* @param m01 - Element at column 1, row 0
43-
* @param m10 - Element at column 0, row 1
44-
* @param m11 - Element at column 1, row 1
41+
* @param m00 - Element at row 0, column 0
42+
* @param m01 - Element at row 0, column 1
43+
* @param m10 - Element at row 1, column 0
44+
* @param m11 - Element at row 1, column 1
4545
*/
4646
constructor(m00 = 1, m01 = 0, m10 = 0, m11 = 1) {
4747
// prettier-ignore
@@ -58,31 +58,31 @@ export class Mat2 extends Array<number> {
5858
return new Mat2(1, 0, 0, 1);
5959
}
6060

61-
/** Element at column 0, row 0 */
61+
/** Element at row 0, column 0 */
6262
get m00(): number {
6363
return this[M00];
6464
}
6565
set m00(value: number) {
6666
this[M00] = value;
6767
}
6868

69-
/** Element at column 1, row 0 */
69+
/** Element at row 0, column 1 */
7070
get m01(): number {
7171
return this[M01];
7272
}
7373
set m01(value: number) {
7474
this[M01] = value;
7575
}
7676

77-
/** Element at column 0, row 1 */
77+
/** Element at row 1, column 0 */
7878
get m10(): number {
7979
return this[M10];
8080
}
8181
set m10(value: number) {
8282
this[M10] = value;
8383
}
8484

85-
/** Element at column 1, row 1 */
85+
/** Element at row 1, column 1 */
8686
get m11(): number {
8787
return this[M11];
8888
}
@@ -194,16 +194,16 @@ export class Mat2 extends Array<number> {
194194

195195
/**
196196
* Sets the matrix to new values
197-
* @param m00 - Element at column 0, row 0
198-
* @param m01 - Element at column 1, row 0
199-
* @param m10 - Element at column 0, row 1
200-
* @param m11 - Element at column 1, row 1
197+
* @param m00 - Element at row 0, column 0
198+
* @param m01 - Element at row 0, column 1
199+
* @param m10 - Element at row 1, column 0
200+
* @param m11 - Element at row 1, column 1
201201
* @returns this
202202
*/
203-
set(m00: number, m10: number, m01: number, m11: number): this {
203+
set(m00: number, m01: number, m10: number, m11: number): this {
204204
this[M00] = m00;
205-
this[M10] = m01;
206-
this[M01] = m10;
205+
this[M01] = m01;
206+
this[M10] = m10;
207207
this[M11] = m11;
208208
return this;
209209
}
@@ -215,8 +215,8 @@ export class Mat2 extends Array<number> {
215215
*/
216216
setMat2(m: Mat2Like): this {
217217
this[M00] = m[M00];
218-
this[M10] = m[M10];
219218
this[M01] = m[M01];
219+
this[M10] = m[M10];
220220
this[M11] = m[M11];
221221
return this;
222222
}

‎src/linear-algebra/mat3.ts‎

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ const INDICES = [
2020
2, 5, 8,
2121
] as const;
2222

23-
/** Column 0, Row 0 index */
23+
/** Row 0, Column 0 index */
2424
const M00 = INDICES[0];
25-
/** Column 1, Row 0 index */
25+
/** Row 0, Column 1 index */
2626
const M01 = INDICES[1];
27-
/** Column 2, Row 0 index */
27+
/** Row 0, Column 2 index */
2828
const M02 = INDICES[2];
2929

30-
/** Column 0, Row 1 index */
30+
/** Row 1, Column 0 index */
3131
const M10 = INDICES[3];
32-
/** Column 1, Row 1 index */
32+
/** Row 1, Column 1 index */
3333
const M11 = INDICES[4];
34-
/** Column 2, Row 1 index */
34+
/** Row 1, Column 2 index */
3535
const M12 = INDICES[5];
3636

37-
/** Column 0, Row 2 index */
37+
/** Row 2, Column 0 index */
3838
const M20 = INDICES[6];
39-
/** Column 1, Row 2 index */
39+
/** Row 2, Column 1 index */
4040
const M21 = INDICES[7];
41-
/** Column 2, Row 2 index */
41+
/** Row 2, Column 2 index */
4242
const M22 = INDICES[8];
4343

4444
/**
@@ -51,15 +51,15 @@ export class Mat3 extends Array<number> {
5151

5252
/**
5353
* Uninitialized values defaults to the 3x3 identity matrix.
54-
* @param m00 - Element at column 0, row 0
55-
* @param m01 - Element at column 1, row 0
56-
* @param m02 - Element at column 2, row 0
57-
* @param m10 - Element at column 0, row 1
58-
* @param m11 - Element at column 1, row 1
59-
* @param m12 - Element at column 2, row 1
60-
* @param m20 - Element at column 0, row 2
61-
* @param m21 - Element at column 1, row 2
62-
* @param m22 - Element at column 2, row 2
54+
* @param m00 - Element at row 0, column 0
55+
* @param m01 - Element at row 0, column 1
56+
* @param m02 - Element at row 0, column 2
57+
* @param m10 - Element at row 1, column 0
58+
* @param m11 - Element at row 1, column 1
59+
* @param m12 - Element at row 1, column 2
60+
* @param m20 - Element at row 2, column 0
61+
* @param m21 - Element at row 2, column 1
62+
* @param m22 - Element at row 2, column 2
6363
*/
6464
// prettier-ignore
6565
constructor(
@@ -87,71 +87,71 @@ export class Mat3 extends Array<number> {
8787
);
8888
}
8989

90-
/** Element at column 0, row 0 */
90+
/** Element at row 0, column 0 */
9191
get m00(): number {
9292
return this[M00];
9393
}
9494
set m00(value: number) {
9595
this[M00] = value;
9696
}
9797

98-
/** Element at column 1, row 0 */
98+
/** Element at row 0, column 1 */
9999
get m01(): number {
100100
return this[M01];
101101
}
102102
set m01(value: number) {
103103
this[M01] = value;
104104
}
105105

106-
/** Element at column 2, row 0 */
106+
/** Element at row 0, column 2 */
107107
get m02(): number {
108108
return this[M02];
109109
}
110110
set m02(value: number) {
111111
this[M02] = value;
112112
}
113113

114-
/** Element at column 0, row 1 */
114+
/** Element at row 1, column 0 */
115115
get m10(): number {
116116
return this[M10];
117117
}
118118
set m10(value: number) {
119119
this[M10] = value;
120120
}
121121

122-
/** Element at column 1, row 1 */
122+
/** Element at row 1, column 1 */
123123
get m11(): number {
124124
return this[M11];
125125
}
126126
set m11(value: number) {
127127
this[M11] = value;
128128
}
129129

130-
/** Element at column 2, row 1 */
130+
/** Element at row 1, column 2 */
131131
get m12(): number {
132132
return this[M12];
133133
}
134134
set m12(value: number) {
135135
this[M12] = value;
136136
}
137137

138-
/** Element at column 0, row 2 */
138+
/** Element at row 2, column 0 */
139139
get m20(): number {
140140
return this[M20];
141141
}
142142
set m20(value: number) {
143143
this[M20] = value;
144144
}
145145

146-
/** Element at column 1, row 2 */
146+
/** Element at row 2, column 1 */
147147
get m21(): number {
148148
return this[M21];
149149
}
150150
set m21(value: number) {
151151
this[M21] = value;
152152
}
153153

154-
/** Element at column 2, row 2 */
154+
/** Element at row 2, column 2 */
155155
get m22(): number {
156156
return this[M22];
157157
}
@@ -305,34 +305,35 @@ export class Mat3 extends Array<number> {
305305

306306
/**
307307
* Sets the matrix to new values
308-
* @param m00 - Element at column 0, row 0
309-
* @param m01 - Element at column 1, row 0
310-
* @param m02 - Element at column 2, row 0
311-
* @param m10 - Element at column 0, row 1
312-
* @param m11 - Element at column 1, row 1
313-
* @param m12 - Element at column 2, row 1
314-
* @param m20 - Element at column 0, row 2
315-
* @param m21 - Element at column 1, row 2
316-
* @param m22 - Element at column 2, row 2
308+
* @param m00 - Element at row 0, column 0
309+
* @param m01 - Element at row 0, column 1
310+
* @param m02 - Element at row 0, column 2
311+
* @param m10 - Element at row 1, column 0
312+
* @param m11 - Element at row 1, column 1
313+
* @param m20 - Element at row 1, column 2
314+
* @param m20 - Element at row 2, column 0
315+
* @param m21 - Element at row 2, column 1
316+
* @param m22 - Element at row 2, column 2
317317
* @returns this
318318
*/
319319
// prettier-ignore
320320
set(
321-
m00: number, m10: number, m20: number,
322-
m01: number, m11: number, m21: number,
323-
m02: number, m12: number, m22: number,
321+
m00: number, m01: number, m02: number,
322+
m10: number, m11: number, m12: number,
323+
m20: number, m21: number, m22: number,
324324
): this {
325325
this[M00] = m00;
326-
this[M10] = m10;
327-
this[M20] = m20;
328-
329326
this[M01] = m01;
330-
this[M11] = m11;
331-
this[M21] = m21;
332-
333327
this[M02] = m02;
328+
329+
this[M10] = m10;
330+
this[M11] = m11;
334331
this[M12] = m12;
332+
333+
this[M20] = m20;
334+
this[M21] = m21;
335335
this[M22] = m22;
336+
336337
return this;
337338
}
338339

@@ -343,15 +344,15 @@ export class Mat3 extends Array<number> {
343344
*/
344345
setMat3(m: Mat3Like): this {
345346
this[M00] = m[M00];
346-
this[M10] = m[M10];
347-
this[M20] = m[M20];
348-
349347
this[M01] = m[M01];
350-
this[M11] = m[M11];
351-
this[M21] = m[M21];
352-
353348
this[M02] = m[M02];
349+
350+
this[M10] = m[M10];
351+
this[M11] = m[M11];
354352
this[M12] = m[M12];
353+
354+
this[M20] = m[M20];
355+
this[M21] = m[M21];
355356
this[M22] = m[M22];
356357

357358
return this;

0 commit comments

Comments
 (0)