Commit 76ce750c0f737ef18a3fde6a218240b386873534
2023-12-08T07:43:27
wip demo_gl
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
diff --git a/libc3/window/sdl2/demo/earth.c b/libc3/window/sdl2/demo/earth.c
index 7e173d3..e396487 100644
--- a/libc3/window/sdl2/demo/earth.c
+++ b/libc3/window/sdl2/demo/earth.c
@@ -100,22 +100,21 @@ bool earth_render (s_sequence *seq, s_window_sdl2 *window,
glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.0f);
glLightf(GL_LIGHT0, GL_QUADRATIC_ATTENUATION, 0.0f);
glEnable(GL_DEPTH_TEST);
- glPushMatrix();
- sphere_radius = 5.0;
- glScalef(sphere_radius, sphere_radius, sphere_radius);
- glEnable(GL_TEXTURE_2D);
- sdl2_sprite_bind(&g_sprite_earth, 0);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
- gl_sphere_render(sphere);
- /*
- glDisable(GL_TEXTURE_2D);
- glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
- gl_sphere_render_wireframe(sphere);
- */
- glPopMatrix();
+ glPushMatrix(); {
+ sphere_radius = 5.0;
+ glScalef(sphere_radius, sphere_radius, sphere_radius);
+ glEnable(GL_TEXTURE_2D);
+ sdl2_sprite_bind(&g_sprite_earth, 0);
+ glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+ gl_sphere_render(sphere);
+ /*
+ glDisable(GL_TEXTURE_2D);
+ glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+ gl_sphere_render_wireframe(sphere);
+ */
+ } glPopMatrix();
glDisable(GL_TEXTURE_2D);
+ glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHT0);
glDisable(GL_LIGHTING);
return true;
diff --git a/libc3/window/sdl2/demo/flies.c b/libc3/window/sdl2/demo/flies.c
index 9057034..d401377 100644
--- a/libc3/window/sdl2/demo/flies.c
+++ b/libc3/window/sdl2/demo/flies.c
@@ -161,52 +161,56 @@ bool flies_render (s_sequence *seq, s_window_sdl2 *window,
glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
/* io_inspect(&seq->tag); */
- if (seq->tag.type == TAG_MAP) {
- map = &seq->tag.data.map;
- if (map->count == 4 &&
- map->value[0].type == TAG_ARRAY &&
- map->value[1].type == TAG_UW &&
- map->value[2].type == TAG_UW &&
- map->value[3].type == TAG_UW) {
- board = &map->value[0].data.array;
- fly_in = &map->value[1].data.uw;
- fly_out = &map->value[2].data.uw;
- fly_time = &map->value[3].data.uw;
- board_item_h = (f64) (window->h - 60) / (BOARD_SIZE + 1);
- board_item_w = board_item_h * g_xy_ratio;
- board_w = board_item_w * BOARD_SIZE;
- board_h = board_item_h * BOARD_SIZE;
- board_x = (window->w - board_w) / 2.0;
- fly_scale = 2.0 * board_item_w / g_fly_sprite.w;
- dead_fly_scale = 2.0 * board_item_w / g_dead_fly_sprite.w;
- glPushMatrix();
- glTranslated(board_x, 60.0, 0.0);
- glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
- sdl2_font_set_size(&g_font_courier_new, board_item_h, window->dpi);
- buf_init(&buf, false, sizeof(a), a);
- buf_write_1(&buf, "In ");
- buf_inspect_uw(&buf, fly_in);
- buf_write_u8(&buf, 0);
- sdl2_font_render_text(&g_font_courier_new, buf.ptr.ps8);
- buf_init(&buf, false, sizeof(a), a);
- buf_write_1(&buf, "Out ");
- buf_inspect_uw(&buf, fly_out);
- buf_write_u8(&buf, 0);
- x = board_item_w * (BOARD_SIZE / 2 + 1);
- glPushMatrix();
+ if (!seq || seq->tag.type != TAG_MAP)
+ return false;
+ map = &seq->tag.data.map;
+ if (map->count != 4 ||
+ map->value[0].type != TAG_ARRAY ||
+ map->value[1].type != TAG_UW ||
+ map->value[2].type != TAG_UW ||
+ map->value[3].type != TAG_UW)
+ return false;
+ board = &map->value[0].data.array;
+ fly_in = &map->value[1].data.uw;
+ fly_out = &map->value[2].data.uw;
+ fly_time = &map->value[3].data.uw;
+ board_item_h = (f64) (window->h - 60) / (BOARD_SIZE + 1);
+ board_item_w = board_item_h * g_xy_ratio;
+ board_w = board_item_w * BOARD_SIZE;
+ board_h = board_item_h * BOARD_SIZE;
+ board_x = (window->w - board_w) / 2.0;
+ fly_scale = 2.0 * board_item_w / g_fly_sprite.w;
+ dead_fly_scale = 2.0 * board_item_w / g_dead_fly_sprite.w;
+ glPushMatrix(); {
+ glTranslated(board_x, 60.0, 0.0);
+ glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+ sdl2_font_set_size(&g_font_courier_new,
+ board_item_h,
+ window->dpi);
+ buf_init(&buf, false, sizeof(a), a);
+ buf_write_1(&buf, "In ");
+ buf_inspect_uw(&buf, fly_in);
+ buf_write_u8(&buf, 0);
+ sdl2_font_render_text(&g_font_courier_new, buf.ptr.ps8);
+ buf_init(&buf, false, sizeof(a), a);
+ buf_write_1(&buf, "Out ");
+ buf_inspect_uw(&buf, fly_out);
+ buf_write_u8(&buf, 0);
+ x = board_item_w * (BOARD_SIZE / 2 + 1);
+ glPushMatrix(); {
glTranslated(x, 0.0, 0.0);
sdl2_font_render_text(&g_font_courier_new, buf.ptr.ps8);
- glPopMatrix();
- glTranslated(0.0, board_item_h, 0.0);
- glColor4f(0.6f, 0.7f, 0.9f, 1.0f);
- glRectd(0, 0, board_w, board_h);
- address[1] = 0;
- while (address[1] < BOARD_SIZE) {
- y = board_item_h * address[1];
- address[0] = 0;
- while (address[0] < BOARD_SIZE) {
- x = board_item_w * address[0];
- glPushMatrix();
+ } glPopMatrix();
+ glTranslated(0.0, board_item_h, 0.0);
+ glColor4f(0.6f, 0.7f, 0.9f, 1.0f);
+ glRectd(0, 0, board_w, board_h);
+ address[1] = 0;
+ while (address[1] < BOARD_SIZE) {
+ y = board_item_h * address[1];
+ address[0] = 0;
+ while (address[0] < BOARD_SIZE) {
+ x = board_item_w * address[0];
+ glPushMatrix(); {
glTranslated(x, board_h - board_item_h - y, 0.0);
board_item = (u8 *) array_data(board, address);
assert(board_item);
@@ -219,11 +223,11 @@ bool flies_render (s_sequence *seq, s_window_sdl2 *window,
glRectd(0, 0, board_item_w + 1.0, board_item_h + 1.0);
break;
case BOARD_ITEM_FLY:
- glPushMatrix();
- glTranslated(-board_item_w / 2.0, -board_item_h / 2.0, 0.0);
- glScaled(fly_scale, fly_scale, 1.0);
- sdl2_sprite_render(&g_fly_sprite, 0);
- glPopMatrix();
+ glPushMatrix(); {
+ glTranslated(-board_item_w / 2.0, -board_item_h / 2.0, 0.0);
+ glScaled(fly_scale, fly_scale, 1.0);
+ sdl2_sprite_render(&g_fly_sprite, 0);
+ } glPopMatrix();
if (address[0] == BOARD_SIZE / 2 &&
address[1] == BOARD_SIZE - 1) {
array_data_set(board, address, &g_board_item_space);
@@ -291,20 +295,19 @@ bool flies_render (s_sequence *seq, s_window_sdl2 *window,
}
break;
case BOARD_ITEM_DEAD_FLY:
- glPushMatrix();
- glTranslated(-board_item_w / 2.0, -board_item_h / 2.0, 0.0);
- glScaled(dead_fly_scale, dead_fly_scale, 1.0);
- sdl2_sprite_render(&g_dead_fly_sprite, 0);
- glPopMatrix();
+ glPushMatrix(); {
+ glTranslated(-board_item_w / 2.0, -board_item_h / 2.0,
+ 0.0);
+ glScaled(dead_fly_scale, dead_fly_scale, 1.0);
+ sdl2_sprite_render(&g_dead_fly_sprite, 0);
+ } glPopMatrix();
break;
}
- glPopMatrix();
- address[0]++;
- }
- address[1]++;
+ } glPopMatrix();
+ address[0]++;
}
- glPopMatrix();
+ address[1]++;
}
- }
+ } glPopMatrix();
return true;
}
diff --git a/libc3/window/sdl2/demo/window_sdl2_demo.c b/libc3/window/sdl2/demo/window_sdl2_demo.c
index f846055..ae65720 100644
--- a/libc3/window/sdl2/demo/window_sdl2_demo.c
+++ b/libc3/window/sdl2/demo/window_sdl2_demo.c
@@ -158,6 +158,8 @@ bool window_sdl2_demo_load (s_window_sdl2 *window)
if (! sdl2_sprite_init(&g_sprite_earth, "img/earth.png",
1, 1, 1))
return false;
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
window_sdl2_sequence_init(window->sequence + 4, 60.0,
"05. Earth",
earth_load, earth_render);