Commit b99a1e37fd163bcddbefb29e860739740d31d8f5
2024-02-23T15:22:04
matrix shade
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
diff --git a/img/matrix_shade.png b/img/matrix_shade.png
new file mode 100644
index 0000000..2b984bf
Binary files /dev/null and b/img/matrix_shade.png differ
diff --git a/libc3/window/sdl2/demo/matrix_utf8.c b/libc3/window/sdl2/demo/matrix_utf8.c
index ef4fd33..b38ce5d 100644
--- a/libc3/window/sdl2/demo/matrix_utf8.c
+++ b/libc3/window/sdl2/demo/matrix_utf8.c
@@ -14,14 +14,17 @@
#include <libc3/c3.h>
#include "../gl_font.h"
#include "../gl_ortho.h"
+#include "../gl_sprite.h"
#include "../gl_vtext.h"
#include "../mat4.h"
#include "window_sdl2_demo.h"
#include "matrix_utf8.h"
-#define G_MATRIX_UTF8_FONT_SIZE 20
-static s_gl_font g_matrix_utf8_font = {0};
-static f64 g_matrix_utf8_time;
+#define G_MATRIX_UTF8_FONT_SIZE 20
+
+static s_gl_font g_matrix_utf8_font = {0};
+static s_gl_sprite g_matrix_utf8_shade = {0};
+static f64 g_matrix_utf8_time;
void matrix_utf8_text_clean (s_tag *tag);
bool matrix_utf8_text_init (s_tag *tag, f32 y);
@@ -44,6 +47,10 @@ bool matrix_utf8_load (s_sequence *seq)
assert(glGetError() == GL_NO_ERROR);
if (! matrix_utf8_text_init(&seq->tag, window->h))
return false;
+ if (! gl_sprite_init(&g_matrix_utf8_shade,
+ "img/matrix_shade.png",
+ 1, 1, 1, 1))
+ return false;
g_matrix_utf8_time = seq->t;
return true;
}
@@ -64,6 +71,7 @@ bool matrix_utf8_text_init (s_tag *tag, f32 y)
char a[1024];
s_buf buf;
character c;
+ FT_Face face;
u8 i;
u8 len;
s_map *map;
@@ -75,12 +83,12 @@ bool matrix_utf8_text_init (s_tag *tag, f32 y)
buf_init(&buf, false, sizeof(a), a);
u8_random_uniform(&len, 40);
len += 10;
+ face = g_matrix_utf8_font.ft_face;
i = 0;
while (i < len) {
do {
u32_random(&c);
- } while (! character_is_printable(c) ||
- ! FT_Get_Char_Index(g_matrix_utf8_font.ft_face, c));
+ } while (! FT_Get_Char_Index(face, c));
if (buf_write_character_utf8(&buf, c) < 0) {
err_puts("matrix_utf8_init_text: buffer overflow");
assert(! "matrix_utf8_init_text: buffer overflow");
@@ -117,6 +125,7 @@ bool matrix_utf8_text_render (s_sequence *seq, const s_tag *tag)
s_window_sdl2 *window;
f32 *y;
assert(seq);
+ assert(glGetError() == GL_NO_ERROR);
window = seq->window;
assert(window);
assert(tag);
@@ -147,9 +156,24 @@ bool matrix_utf8_text_render (s_sequence *seq, const s_tag *tag)
mat4_init_identity(&g_ortho.model_matrix);
mat4_translate(&g_ortho.model_matrix, 0, *y, 0);
gl_ortho_update_model_matrix(&g_ortho);
+ assert(glGetError() == GL_NO_ERROR);
gl_ortho_color(&g_ortho, 0, 1, 0, 1);
+ assert(glGetError() == GL_NO_ERROR);
gl_ortho_vtext_render(&g_ortho, text);
assert(glGetError() == GL_NO_ERROR);
+ glDisable(GL_DEPTH_TEST);
+ glEnable(GL_BLEND);
+ glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+ GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+ gl_ortho_color(&g_ortho, 1, 1, 1, 1);
+ gl_ortho_bind_texture(&g_ortho,
+ gl_sprite_texture(&g_matrix_utf8_shade, 0));
+ assert(glGetError() == GL_NO_ERROR);
+ gl_ortho_rect(&g_ortho, 0, G_MATRIX_UTF8_FONT_SIZE - text->pt_h,
+ text->pt_w, text->pt_h - G_MATRIX_UTF8_FONT_SIZE);
+ assert(glGetError() == GL_NO_ERROR);
+ glDisable(GL_BLEND);
+ assert(glGetError() == GL_NO_ERROR);
return true;
}
diff --git a/libc3/window/sdl2/gl_ortho.c b/libc3/window/sdl2/gl_ortho.c
index 70373b6..40546a1 100644
--- a/libc3/window/sdl2/gl_ortho.c
+++ b/libc3/window/sdl2/gl_ortho.c
@@ -209,6 +209,7 @@ void gl_ortho_rect (s_gl_ortho *ortho, f32 x, f32 y, f32 w, f32 h)
gl_square_render(&ortho->square);
assert(glGetError() == GL_NO_ERROR);
ortho->model_matrix = matrix;
+ gl_ortho_update_model_matrix(ortho);
}
void gl_ortho_render (s_gl_ortho *ortho)