Commit 208f675f1fa3b8f799b77e675df09e6af81e1c68
2024-01-07T19:08:50
wip OpenGL
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 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392
diff --git a/libc3/window/sdl2/gl_matrix_3f.h b/libc3/window/sdl2/gl_matrix_3f.h
new file mode 100644
index 0000000..36625c4
--- /dev/null
+++ b/libc3/window/sdl2/gl_matrix_3f.h
@@ -0,0 +1,39 @@
+/* c3
+ * Copyright 2022,2023 kmx.io <contact@kmx.io>
+ *
+ * Permission is hereby granted to use this software granted the above
+ * copyright notice and this permission paragraph are included in all
+ * copies and substantial portions of this software.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+ * PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+ * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+#ifndef GL_MATRIX_3F_H
+#define GL_MATRIX_3F_H
+
+#include "types.h"
+
+/* Stack-allocation compatible functions. */
+s_gl_matrix_3f * gl_matrix_3f_init_copy (s_gl_matrix_3f *m,
+ const s_gl_matrix_3f *src);
+s_gl_matrix_3f * gl_matrix_3f_init_identity (s_gl_matrix_3f *m);
+s_gl_matrix_3f * gl_matrix_3f_init_matrix_mult
+ (s_gl_matrix_3f *m, const s_gl_matrix_3f *a,
+ const s_gl_matrix_3f *b);
+
+/* Heap-allocation functions, call gl_matrix_3f_delete after use. */
+void gl_matrix_3f_delete (s_gl_matrix_3f *m);
+s_gl_matrix_3f * gl_matrix_3f_new_copy (const s_gl_matrix_3f *src);
+s_gl_matrix_3f * gl_matrix_3f_new_identity (void);
+s_gl_matrix_3f * gl_matrix_3f_new_matrix_mult (const s_gl_matrix_3f *a,
+ const s_gl_matrix_3f *b);
+
+/* Operators. */
+s_gl_matrix_3f * gl_matrix_3f_rotate (s_gl_matrix_3f *m, f32 rad);
+s_gl_matrix_3f * gl_matrix_3f_scale (s_gl_matrix_3f *m, f32 x, f32 y);
+s_gl_matrix_3f * gl_matrix_3f_translate (s_gl_matrix_3f *m, f32 x,
+ f32 y);
+
+#endif /* GL_MATRIX_3F_H */
diff --git a/libc3/window/sdl2/gl_matrix_4f.c b/libc3/window/sdl2/gl_matrix_4f.c
new file mode 100644
index 0000000..e202fb2
--- /dev/null
+++ b/libc3/window/sdl2/gl_matrix_4f.c
@@ -0,0 +1,248 @@
+/* c3
+ * Copyright 2022,2023 kmx.io <contact@kmx.io>
+ *
+ * Permission is hereby granted to use this software granted the above
+ * copyright notice and this permission paragraph are included in all
+ * copies and substantial portions of this software.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+ * PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+ * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+#include <math.h>
+#include <libc3/c3.h>
+#include "gl_matrix_4f.h"
+#include "gl_point_3f.h"
+
+sw gl_matrix_4f_buf_inspect (s_buf *buf, const s_gl_matrix_4f *matrix)
+{
+ u8 i;
+ sw r;
+ sw result = 0;
+ assert(buf);
+ assert(matrix);
+ const f32 *m;
+ if ((r = buf_write_1(buf, "(F32) {")) < 0)
+ return r;
+ result += r;
+ m = &matrix->xx;
+ i = 0;
+ while (i < 16) {
+ if ((r = buf_inspect_f32(buf, m)) < 0)
+ return r;
+ result += r;
+ m++;
+ i++;
+ }
+ if ((r = buf_write_1(buf, "}")) < 0)
+ return r;
+ result += r;
+ return result;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_init_copy (s_gl_matrix_4f *m,
+ const s_gl_matrix_4f *src)
+{
+ assert(m);
+ assert(src);
+ *m = *src;
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_init_product (s_gl_matrix_4f *m,
+ const s_gl_matrix_4f *a,
+ const s_gl_matrix_4f *b)
+{
+ assert(m);
+ assert(a);
+ assert(b);
+ m->xx = a->xx * b->xx + a->xy * b->yx + a->xz * b->zx + a->xt * b->tx;
+ m->xy = a->xx * b->xy + a->xy * b->yy + a->xz * b->zy + a->xt * b->ty;
+ m->xz = a->xx * b->xz + a->xy * b->yz + a->xz * b->zz + a->xt * b->tz;
+ m->xt = a->xx * b->xt + a->xy * b->yt + a->xz * b->zt + a->xt * b->tt;
+ m->yx = a->yx * b->xx + a->yy * b->yx + a->yz * b->zx + a->yt * b->tx;
+ m->yy = a->yx * b->xy + a->yy * b->yy + a->yz * b->zy + a->yt * b->ty;
+ m->yz = a->yx * b->xz + a->yy * b->yz + a->yz * b->zz + a->yt * b->tz;
+ m->yt = a->yx * b->xt + a->yy * b->yt + a->yz * b->zt + a->yt * b->tt;
+ m->zx = a->zx * b->xx + a->zy * b->yx + a->zz * b->zx + a->zt * b->tx;
+ m->zy = a->zx * b->xy + a->zy * b->yy + a->zz * b->zy + a->zt * b->ty;
+ m->zz = a->zx * b->xz + a->zy * b->yz + a->zz * b->zz + a->zt * b->tz;
+ m->zt = a->zx * b->xt + a->zy * b->yt + a->zz * b->zt + a->zt * b->tt;
+ m->tx = a->tx * b->xx + a->ty * b->yx + a->tz * b->zx + a->tt * b->tx;
+ m->ty = a->tx * b->xy + a->ty * b->yy + a->tz * b->zy + a->tt * b->ty;
+ m->tz = a->tx * b->xz + a->ty * b->yz + a->tz * b->zz + a->tt * b->tz;
+ m->tt = a->tx * b->xt + a->ty * b->yt + a->tz * b->zt + a->tt * b->tt;
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_init_identity (s_gl_matrix_4f *m)
+{
+ assert(m);
+ m->xx = 1.0; m->xy = 0.0; m->xz = 0.0; m->xt = 0.0;
+ m->yx = 0.0; m->yy = 1.0; m->yz = 0.0; m->yt = 0.0;
+ m->zx = 0.0; m->zy = 0.0; m->zz = 1.0; 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_4f * gl_matrix_4f_init_zero (s_gl_matrix_4f *m)
+{
+ assert(m);
+ m->xx = 0.0; m->xy = 0.0; m->xz = 0.0; m->xt = 0.0;
+ m->yx = 0.0; m->yy = 0.0; m->yz = 0.0; m->yt = 0.0;
+ m->zx = 0.0; m->zy = 0.0; m->zz = 0.0; m->zt = 0.0;
+ m->tx = 0.0; m->ty = 0.0; m->tz = 0.0; m->tt = 0.0;
+ return m;
+}
+
+void gl_matrix_4f_delete (s_gl_matrix_4f *m)
+{
+ free(m);
+}
+
+s_gl_matrix_4f * gl_matrix_4f_new_copy (const s_gl_matrix_4f *src)
+{
+ s_gl_matrix_4f *m;
+ m = calloc(1, sizeof(s_gl_matrix_4f));
+ if (! m) {
+ err_puts("gl_matrix_4f_new: failed to allocate memory");
+ return NULL;
+ }
+ *m = *src;
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_new_product (const s_gl_matrix_4f *a,
+ const s_gl_matrix_4f *b)
+{
+ s_gl_matrix_4f *m;
+ assert(a);
+ assert(b);
+ m = calloc(1, sizeof(s_gl_matrix_4f));
+ if (! m) {
+ err_puts("gl_matrix_4f_new: failed to allocate memory");
+ return NULL;
+ }
+ gl_matrix_4f_init_product(m, a, b);
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_new_zero (void)
+{
+ s_gl_matrix_4f *m;
+ m = calloc(1, sizeof(s_gl_matrix_4f));
+ if (! m) {
+ err_puts("gl_matrix_4f_new: failed to allocate memory");
+ return NULL;
+ }
+ gl_matrix_4f_init_zero(m);
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_ortho (s_gl_matrix_4f *m, f32 x1, f32 x2,
+ f32 y1, f32 y2, f32 clip_z_near,
+ f32 clip_z_far)
+{
+ f32 dx;
+ f32 dy;
+ f32 dz;
+ s_gl_matrix_4f ortho;
+ assert(m);
+ dx = x2 - x1;
+ dy = y2 - y1;
+ dz = clip_z_far - clip_z_near;
+ gl_matrix_4f_init_zero(&ortho);
+ 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.tt = 1.0;
+ gl_matrix_4f_product(m, &ortho);
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_perspective (s_gl_matrix_4f *m, f32 fov_y,
+ f32 aspect_ratio,
+ f32 z_near,
+ f32 z_far)
+{
+ f32 dz;
+ s_gl_matrix_4f perspective;
+ f32 f;
+ f32 fov_y_2;
+ fov_y_2 = fov_y / 2.0;
+ f = cos(fov_y_2) / sin(fov_y_2);
+ dz = z_near - z_far;
+ gl_matrix_4f_init_zero(&perspective);
+ perspective.xx = f / aspect_ratio;
+ perspective.yy = f;
+ perspective.zz = (z_near + z_far) / dz;
+ perspective.zt = -1.0;
+ perspective.tz = 2.0 * z_near * z_far / dz;
+ gl_matrix_4f_product(m, &perspective);
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_product (s_gl_matrix_4f *m,
+ const s_gl_matrix_4f *a)
+{
+ s_gl_matrix_4f tmp;
+ gl_matrix_4f_init_product(&tmp, m, a);
+ *m = tmp;
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_scale (s_gl_matrix_4f *m, f32 x, f32 y,
+ f32 z)
+{
+ s_gl_matrix_4f s;
+ gl_matrix_4f_init_zero(&s);
+ s.xx = x;
+ s.yy = y;
+ s.zz = z;
+ s.tt = 1.0;
+ gl_matrix_4f_product(m, &s);
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_translate (s_gl_matrix_4f *m, f32 x,
+ f32 y, f32 z)
+{
+ m->xt += x;
+ m->yt += y;
+ m->zt += z;
+ return m;
+}
+
+s_gl_matrix_4f * gl_matrix_4f_rotate_axis (s_gl_matrix_4f *m, f32 rad,
+ const s_gl_point_3f *axis)
+{
+ s_gl_point_3f a;
+ f32 angle;
+ f32 one_minus_x;
+ f32 x;
+ f32 y;
+ gl_point_3f_init_normalize(&a, axis);
+ angle = -rad;
+ x = cosf(angle);
+ one_minus_x = 1.0 - x;
+ y = sinf(angle);
+ s_gl_matrix_4f r = { x + a.x * a.x * one_minus_x,
+ a.x * a.y * one_minus_x - a.z * y,
+ a.x * a.z * one_minus_x + a.y * y,
+ 0.0,
+ a.x * a.y * one_minus_x + a.z * y,
+ x + a.y * a.y * one_minus_x,
+ a.y * a.z * one_minus_x - a.x * y,
+ 0.0,
+ a.x * a.z * one_minus_x - a.y * y,
+ a.y * a.z * one_minus_x + a.x * y,
+ x + a.z * a.z * one_minus_x,
+ 0.0,
+ 0.0, 0.0, 0.0, 1.0 };
+ gl_matrix_4f_product(m, &r);
+ return m;
+}
diff --git a/libc3/window/sdl2/gl_matrix_4f.h b/libc3/window/sdl2/gl_matrix_4f.h
new file mode 100644
index 0000000..77b8fba
--- /dev/null
+++ b/libc3/window/sdl2/gl_matrix_4f.h
@@ -0,0 +1,52 @@
+/* c3
+ * Copyright 2022,2023 kmx.io <contact@kmx.io>
+ *
+ * Permission is hereby granted to use this software granted the above
+ * copyright notice and this permission paragraph are included in all
+ * copies and substantial portions of this software.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+ * PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+ * AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+#ifndef GL_MATRIX_4F_H
+#define GL_MATRIX_4F_H
+
+#include "types.h"
+
+/* Stack-allocation compatible functions. */
+s_gl_matrix_4f * gl_matrix_4f_init_copy (s_gl_matrix_4f *m,
+ const s_gl_matrix_4f *src);
+s_gl_matrix_4f * gl_matrix_4f_init_identity (s_gl_matrix_4f *m);
+s_gl_matrix_4f * gl_matrix_4f_init_product (s_gl_matrix_4f *m,
+ const s_gl_matrix_4f *a,
+ const s_gl_matrix_4f *b);
+s_gl_matrix_4f * gl_matrix_4f_init_zero (s_gl_matrix_4f *m);
+
+/* Heap-allocation functions, call gl_matrix_4f_delete after use. */
+void gl_matrix_4f_delete (s_gl_matrix_4f *m);
+s_gl_matrix_4f * gl_matrix_4f_new_copy (const s_gl_matrix_4f *src);
+s_gl_matrix_4f * gl_matrix_4f_new_identity (void);
+s_gl_matrix_4f * gl_matrix_4f_new_matrix_mult (const s_gl_matrix_4f *a,
+ const s_gl_matrix_4f *b);
+s_gl_matrix_4f * gl_matrix_4f_new_zero (void);
+
+/* Operators. */
+s_gl_matrix_4f * gl_matrix_4f_ortho (s_gl_matrix_4f *m, f32 x1, f32 x2,
+ f32 y1, f32 y2, f32 clip_z_near,
+ f32 clip_z_far);
+s_gl_matrix_4f * gl_matrix_4f_perspective (s_gl_matrix_4f *m, f32 fov_y,
+ f32 aspect_ratio,
+ f32 clip_z_near,
+ f32 clip_z_far);
+s_gl_matrix_4f * gl_matrix_4f_product (s_gl_matrix_4f *m,
+ const s_gl_matrix_4f *a);
+s_gl_matrix_4f * gl_matrix_4f_rotate_axis (s_gl_matrix_4f *m, f32 rad,
+ const s_gl_point_3f *axis);
+s_gl_matrix_4f * gl_matrix_4f_scale (s_gl_matrix_4f *m, f32 x, f32 y,
+ f32 z);
+s_gl_matrix_4f * gl_matrix_4f_translate (s_gl_matrix_4f *m, f32 x,
+ f32 y, f32 z);
+
+#endif /* GL_MATRIX_4F_H */
diff --git a/libc3/window/sdl2/gl_ortho.c b/libc3/window/sdl2/gl_ortho.c
index 579e9de..2b02a13 100644
--- a/libc3/window/sdl2/gl_ortho.c
+++ b/libc3/window/sdl2/gl_ortho.c
@@ -28,7 +28,8 @@ static const s8 * g_gl_ortho_vertex_shader_src = "#version 330 core\n"
"void main() {\n"
" gl_Position = vec4(projection_matrix * view_matrix * \n"
" model_matrix * vec4(aPos, 1.0));\n"
- " FragNormal = vec3(mat3(transpose(inverse(model_matrix))) * aNorm);\n"
+ " FragNormal = vec3(mat3(transpose(inverse(model_matrix))) *\n"
+ " aNorm);\n"
" TexCoord = vec2(aTexCoord);\n"
"}\n";
@@ -50,7 +51,7 @@ s_gl_ortho * gl_ortho_init (s_gl_ortho *ortho)
u32 vertex_shader;
assert(ortho);
gl_matrix_4d_init_identity(&ortho->projection_matrix);
- //gl_matrix_4d_ortho(&ortho->projection_matrix, -1, 1, -1, 1, -1, 1);
+ gl_matrix_4d_ortho(&ortho->projection_matrix, -1, 1, -1, 1, -1, 1);
ortho->position.x = 0.0;
ortho->position.y = 0.0;
ortho->position.z = 0.0;
@@ -115,9 +116,9 @@ void gl_ortho_render (s_gl_ortho *ortho)
glUniformMatrix4fv(ortho->gl_projection_matrix_loc, 1, GL_FALSE,
&ortho->projection_matrix.xx);
if ((error = glGetError()) != GL_NO_ERROR) {
- err_write_1("gl_ortho_render: glUniformMatrix4dv: ");
+ err_write_1("gl_ortho_render: glUniformMatrix4fv: ");
err_puts((const s8 *) glewGetErrorString(error));
- assert(! "gl_ortho_render: glUniformMatrix4dv");
+ assert(! "gl_ortho_render: glUniformMatrix4fv");
}
assert(glGetError() == GL_NO_ERROR);
glUniformMatrix4fv(ortho->gl_view_matrix_loc, 1, GL_FALSE,