Commit 3e46f97b6c3ca72f0504b123bf706791e0f41d14
2024-02-02T18:34:57
gl_matrix_4d
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
diff --git a/libc3/window/sdl2/gl_matrix_4d.c b/libc3/window/sdl2/gl_matrix_4d.c
index b72a9b1..1c9d90d 100644
--- a/libc3/window/sdl2/gl_matrix_4d.c
+++ b/libc3/window/sdl2/gl_matrix_4d.c
@@ -18,6 +18,7 @@
sw gl_matrix_4d_buf_inspect (s_buf *buf, const s_gl_matrix_4d *matrix)
{
u8 i;
+ u8 j;
sw r;
sw result = 0;
assert(buf);
@@ -28,14 +29,32 @@ sw gl_matrix_4d_buf_inspect (s_buf *buf, const s_gl_matrix_4d *matrix)
result += r;
m = &matrix->xx;
i = 0;
- while (i < 16) {
- if ((r = buf_inspect_f64(buf, m)) < 0)
- return r;
- result += r;
- m++;
+ while (i < 4) {
+ j = 0;
+ while (j < 4) {
+ if ((r = buf_inspect_f64(buf, m + j * 4 + i)) < 0)
+ return r;
+ result += r;
+ if (i < 3 || j < 3) {
+ if ((r = buf_write_1(buf, ",")) < 0)
+ return r;
+ result += r;
+ if (j < 3) {
+ if ((r = buf_write_1(buf, " ")) < 0)
+ return r;
+ result += r;
+ }
+ }
+ j++;
+ }
+ if (i < 3) {
+ if ((r = buf_write_1(buf, "\n ")) < 0)
+ return r;
+ result += r;
+ }
i++;
}
- if ((r = buf_write_1(buf, "}")) < 0)
+ if ((r = buf_write_1(buf, "}\n")) < 0)
return r;
result += r;
return result;
@@ -86,6 +105,17 @@ s_gl_matrix_4d * gl_matrix_4d_init_identity (s_gl_matrix_4d *m)
return m;
}
+s_gl_matrix_4d * gl_matrix_4d_init_scale (s_gl_matrix_4d *m, f64 x,
+ f64 y, f64 z)
+{
+ assert(m);
+ m->xx = x; m->xy = 0.0; m->xz = 0.0; m->xt = 0.0;
+ m->yx = 0.0; m->yy = y; m->yz = 0.0; m->yt = 0.0;
+ m->zx = 0.0; m->zy = 0.0; m->zz = z; m->zt = 0.0;
+ m->tx = 0.0; m->ty = 0.0; m->tz = 0.0; m->tt = 1.0;
+ return m;
+}
+
s_gl_matrix_4d * gl_matrix_4d_init_zero (s_gl_matrix_4d *m)
{
assert(m);
@@ -156,11 +186,12 @@ s_gl_matrix_4d * gl_matrix_4d_ortho (s_gl_matrix_4d *m, f64 x1, f64 x2,
ortho.xx = 2.0 / dx;
ortho.yy = 2.0 / dy;
ortho.zz = -2.0 / dz;
- ortho.xt = (x1 + x2) / dx;
- ortho.yt = (y1 + y2) / dy;
- ortho.zt = (clip_z_near + clip_z_far) / dz;
+ ortho.tx = - (x1 + x2) / dx;
+ ortho.ty = - (y1 + y2) / dy;
+ ortho.tz = - (clip_z_near + clip_z_far) / dz;
ortho.tt = 1.0;
- gl_matrix_4d_product(m, &ortho);
+ gl_matrix_4d_product(&ortho, m);
+ *m = ortho;
return m;
}
@@ -182,7 +213,8 @@ s_gl_matrix_4d * gl_matrix_4d_perspective (s_gl_matrix_4d *m, f64 fov_y,
perspective.zz = (z_near + z_far) / dz;
perspective.zt = -1.0;
perspective.tz = 2.0 * z_near * z_far / dz;
- gl_matrix_4d_product(m, &perspective);
+ gl_matrix_4d_product(&perspective, m);
+ *m = perspective;
return m;
}
@@ -198,21 +230,27 @@ s_gl_matrix_4d * gl_matrix_4d_product (s_gl_matrix_4d *m,
s_gl_matrix_4d * gl_matrix_4d_scale (s_gl_matrix_4d *m, f64 x, f64 y,
f64 z)
{
- s_gl_matrix_4d s = {0};
+ s_gl_matrix_4d s;
+ gl_matrix_4d_init_zero(&s);
s.xx = x;
s.yy = y;
s.zz = z;
s.tt = 1.0;
- gl_matrix_4d_product(m, &s);
+ gl_matrix_4d_product(&s, m);
+ *m = s;
return m;
}
s_gl_matrix_4d * gl_matrix_4d_translate (s_gl_matrix_4d *m, f64 x,
f64 y, f64 z)
{
- m->xt += x;
- m->yt += y;
- m->zt += z;
+ s_gl_matrix_4d s;
+ gl_matrix_4d_init_identity(&s);
+ s.tx = x;
+ s.ty = y;
+ s.tz = z;
+ gl_matrix_4d_product(&s, m);
+ *m = s;
return m;
}
@@ -242,6 +280,7 @@ s_gl_matrix_4d * gl_matrix_4d_rotate_axis (s_gl_matrix_4d *m, f64 rad,
x + a.z * a.z * one_minus_x,
0.0,
0.0, 0.0, 0.0, 1.0 };
- gl_matrix_4d_product(m, &r);
+ gl_matrix_4d_product(&r, m);
+ *m = r;
return m;
}