Commit 64209900c0dc6598f0d5072f65bbdf25c3ecb060
2024-01-16T22:51:03
wip textures
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/demo/earth.c b/libc3/window/sdl2/demo/earth.c
index 6c93c53..e078cae 100644
--- a/libc3/window/sdl2/demo/earth.c
+++ b/libc3/window/sdl2/demo/earth.c
@@ -117,10 +117,10 @@ bool earth_render (s_sequence *seq)
assert(glGetError() == GL_NO_ERROR);
//glEnable(GL_TEXTURE_2D);
assert(glGetError() == GL_NO_ERROR);
- gl_camera_bind_texture(camera,
- gl_sprite_texture(&g_sprite_earth, 0));
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
- GL_LINEAR_MIPMAP_LINEAR);
+ //gl_camera_bind_texture(camera,
+ // gl_sprite_texture(&g_sprite_earth, 0));
+ //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+ // GL_LINEAR_MIPMAP_LINEAR);
assert(glGetError() == GL_NO_ERROR);
glBlendColor(1.0f, 1.0f, 1.0f, 1.0f);
gl_sphere_render(sphere);
diff --git a/libc3/window/sdl2/demo/flies.c b/libc3/window/sdl2/demo/flies.c
index 99ae8d5..866ebd0 100644
--- a/libc3/window/sdl2/demo/flies.c
+++ b/libc3/window/sdl2/demo/flies.c
@@ -201,7 +201,7 @@ bool flies_render (s_sequence *seq)
gl_matrix_4f_init_identity(&g_ortho.model_matrix);
gl_matrix_4f_translate(&g_ortho.model_matrix, board_x, 60.0, 0.0);
gl_ortho_update_model_matrix(&g_ortho);
- glBlendColor(1.0f, 1.0f, 1.0f, 1.0f);
+ gl_ortho_color(&g_ortho, 1.0f, 1.0f, 1.0f, 1.0f);
buf_init(&buf, false, sizeof(a), a);
buf_write_1(&buf, "In ");
buf_inspect_uw(&buf, fly_in);
@@ -213,15 +213,15 @@ bool flies_render (s_sequence *seq)
buf_write_1(&buf, "Out ");
buf_inspect_uw(&buf, fly_out);
buf_write_u8(&buf, 0);
+ gl_text_update_1(&g_text_flies_out, a);
matrix = g_ortho.model_matrix; {
x = board_item_w * (BOARD_SIZE / 2 + 1);
gl_matrix_4f_translate(&g_ortho.model_matrix, x, 0.0, 0.0);
gl_ortho_update_model_matrix(&g_ortho);
- gl_text_update_1(&g_text_flies_out, a);
gl_ortho_text_render(&g_ortho, &g_text_flies_out);
g_ortho.model_matrix = matrix;
gl_matrix_4f_translate(&g_ortho.model_matrix, 0.0, board_item_h, 0.0);
- glBlendColor(0.6f, 0.7f, 0.9f, 1.0f);
+ gl_ortho_color(&g_ortho, 0.6f, 0.7f, 0.9f, 1.0f);
gl_ortho_rect(&g_ortho, 0, 0, board_w, board_h);
address[1] = 0;
while (address[1] < BOARD_SIZE) {
@@ -239,7 +239,7 @@ bool flies_render (s_sequence *seq)
break;
case BOARD_ITEM_BLOCK:
gl_ortho_bind_texture(&g_ortho, 0);
- glBlendColor(0.0f, 0.0f, 1.0f, 1.0f);
+ gl_ortho_color(&g_ortho, 0.0f, 0.0f, 1.0f, 1.0f);
gl_ortho_rect(&g_ortho, 0, 0, board_item_w + 1.0, board_item_h + 1.0);
break;
case BOARD_ITEM_FLY:
@@ -252,6 +252,7 @@ bool flies_render (s_sequence *seq)
gl_ortho_update_model_matrix(&g_ortho);
gl_ortho_bind_texture(&g_ortho,
gl_sprite_texture(&g_sprite_fly, 0));
+ gl_ortho_color(&g_ortho, 1.0f, 1.0f, 1.0f, 1.0f);
gl_ortho_rect(&g_ortho, 0, 0, g_sprite_fly.pt_w,
g_sprite_fly.pt_h);
gl_ortho_bind_texture(&g_ortho, 0);
@@ -332,6 +333,7 @@ bool flies_render (s_sequence *seq)
gl_ortho_update_model_matrix(&g_ortho);
gl_ortho_bind_texture(&g_ortho,
gl_sprite_texture(&g_sprite_dead_fly, 0));
+ gl_ortho_color(&g_ortho, 1.0f, 1.0f, 1.0f, 1.0f);
gl_ortho_rect(&g_ortho, 0, 0, g_sprite_dead_fly.pt_w,
g_sprite_dead_fly.pt_h);
gl_ortho_bind_texture(&g_ortho, 0);
diff --git a/libc3/window/sdl2/demo/window_sdl2_demo.c b/libc3/window/sdl2/demo/window_sdl2_demo.c
index 84107f7..d149790 100644
--- a/libc3/window/sdl2/demo/window_sdl2_demo.c
+++ b/libc3/window/sdl2/demo/window_sdl2_demo.c
@@ -219,7 +219,7 @@ static void render_text (s_gl_text *text, f64 x, f64 y)
matrix = g_ortho.model_matrix;
gl_matrix_4f_translate(&g_ortho.model_matrix, x - 1.0, y - 1.0, 0.0);
gl_ortho_update_model_matrix(&g_ortho);
- glBlendColor(1.0f, 1.0f, 1.0f, 1.0f);
+ gl_ortho_color(&g_ortho, 1.0f, 1.0f, 1.0f, 1.0f);
assert(glGetError() == GL_NO_ERROR);
gl_ortho_text_render(&g_ortho, text);
assert(glGetError() == GL_NO_ERROR);
@@ -249,7 +249,7 @@ static void render_text (s_gl_text *text, f64 x, f64 y)
gl_ortho_update_model_matrix(&g_ortho);
gl_ortho_text_render(&g_ortho, text);
assert(glGetError() == GL_NO_ERROR);
- glBlendColor(0.0f, 0.0f, 0.0f, 1.0f);
+ gl_ortho_color(&g_ortho, 0.0f, 0.0f, 0.0f, 1.0f);
assert(glGetError() == GL_NO_ERROR);
gl_matrix_4f_translate(&g_ortho.model_matrix, -1.0, -1.0, 0.0);
gl_ortho_update_model_matrix(&g_ortho);
@@ -293,11 +293,11 @@ bool window_sdl2_demo_render (s_window_sdl2 *window)
assert(glGetError() == GL_NO_ERROR);
gl_ortho_bind_texture(&g_ortho, 0);
assert(glGetError() == GL_NO_ERROR);
- glBlendColor(1.0f, 1.0f, 1.0f, 1.0f);
+ gl_ortho_color(&g_ortho, 1.0f, 1.0f, 1.0f, 1.0f);
gl_ortho_rect(&g_ortho, 19, 11,
(window->w - 40.0) * seq->t / seq->duration + 2,
4);
- glBlendColor(0.0f, 0.0f, 0.0f, 1.0f);
+ gl_ortho_color(&g_ortho, 0.0f, 0.0f, 0.0f, 1.0f);
gl_ortho_rect(&g_ortho, 20, 12,
(window->w - 40.0) * seq->t / seq->duration,
2);
diff --git a/libc3/window/sdl2/gl_camera.c b/libc3/window/sdl2/gl_camera.c
index 5bb5e71..6189528 100644
--- a/libc3/window/sdl2/gl_camera.c
+++ b/libc3/window/sdl2/gl_camera.c
@@ -40,13 +40,14 @@ static const char * g_gl_camera_fragment_shader_src =
"out vec4 oFragColor;\n"
"uniform bool uEnableTex2D;\n"
"uniform sampler2D uTex2D;\n"
+ "uniform vec4 uColor;\n"
"void main() {\n"
+ " vec4 texColor = texture(uTex2D, iTexCoord);\n"
" if (uEnableTex2D) {\n"
- " vec4 texColor = texture(uTex2D, iTexCoord);\n"
- " oFragColor = texColor;\n"
+ " oFragColor = texColor * uColor;\n"
" }\n"
" else\n"
- " oFragColor = vec4(1, 1, 1, 1);\n"
+ " oFragColor = uColor;\n"
"}\n";
void gl_camera_bind_texture (s_gl_camera *camera, GLuint texture)
@@ -129,6 +130,15 @@ s_gl_camera * gl_camera_init (s_gl_camera *camera, uw w, uw h)
camera->gl_model_matrix_loc =
glGetUniformLocation(camera->gl_shader_program,
"uModelMatrix");
+ camera->gl_enable_tex2d_loc =
+ glGetUniformLocation(camera->gl_shader_program,
+ "uEnableTex2D");
+ camera->gl_tex2d_loc =
+ glGetUniformLocation(camera->gl_shader_program,
+ "uTex2D");
+ camera->gl_color_loc =
+ glGetUniformLocation(camera->gl_shader_program,
+ "uColor");
return camera;
}
@@ -149,7 +159,9 @@ s_gl_camera * gl_camera_new (uw w, uw h)
void gl_camera_render (s_gl_camera *camera)
{
+ const s_rgba color = {1, 1, 1, 1};
assert(camera);
+ assert(glGetError() == GL_NO_ERROR);
gl_matrix_4f_init_identity(&camera->projection_matrix);
gl_matrix_4f_perspective(&camera->projection_matrix, camera->fov_y,
camera->aspect_ratio, camera->clip_z_near,
@@ -165,12 +177,22 @@ void gl_camera_render (s_gl_camera *camera)
&(s_gl_point_3f) { 0.0f, 0.0f, 1.0f });
gl_matrix_4f_init_identity(&camera->model_matrix);
glUseProgram(camera->gl_shader_program);
+ assert(glGetError() == GL_NO_ERROR);
glUniformMatrix4fv(camera->gl_projection_matrix_loc, 1, GL_FALSE,
&camera->projection_matrix.xx);
+ assert(glGetError() == GL_NO_ERROR);
glUniformMatrix4fv(camera->gl_view_matrix_loc, 1, GL_FALSE,
&camera->view_matrix.xx);
+ assert(glGetError() == GL_NO_ERROR);
glUniformMatrix4fv(camera->gl_model_matrix_loc, 1, GL_FALSE,
&camera->model_matrix.xx);
+ assert(glGetError() == GL_NO_ERROR);
+ glUniform1i(camera->gl_enable_tex2d_loc, 0);
+ assert(glGetError() == GL_NO_ERROR);
+ glUniform1i(camera->gl_tex2d_loc, 0);
+ assert(glGetError() == GL_NO_ERROR);
+ glUniform4fv(camera->gl_color_loc, 1, &color.r);
+ assert(glGetError() == GL_NO_ERROR);
}
void gl_camera_render_end (s_gl_camera *camera)
diff --git a/libc3/window/sdl2/gl_ortho.c b/libc3/window/sdl2/gl_ortho.c
index 7214c5e..623f30c 100644
--- a/libc3/window/sdl2/gl_ortho.c
+++ b/libc3/window/sdl2/gl_ortho.c
@@ -42,13 +42,14 @@ static const char * g_gl_ortho_fragment_shader_src =
"out vec4 oFragColor;\n"
"uniform bool uEnableTex2D;\n"
"uniform sampler2D uTex2D;\n"
+ "uniform vec4 uColor;\n"
"void main() {\n"
+ " vec4 texColor = texture(uTex2D, iTexCoord);\n"
" if (uEnableTex2D) {\n"
- " vec4 texColor = texture(uTex2D, iTexCoord);\n"
" oFragColor = texColor;\n"
" }\n"
" else\n"
- " oFragColor = vec4(1, 1, 1, 1);\n"
+ " oFragColor = uColor;\n"
"}\n";
void gl_ortho_bind_texture (s_gl_ortho *ortho, GLuint texture)
@@ -56,21 +57,43 @@ void gl_ortho_bind_texture (s_gl_ortho *ortho, GLuint texture)
assert(ortho);
assert(glGetError() == GL_NO_ERROR);
if (! texture) {
+ glActiveTexture(GL_TEXTURE0);
+ assert(glGetError() == GL_NO_ERROR);
+ glBindTexture(GL_TEXTURE_2D, 0);
+ assert(glGetError() == GL_NO_ERROR);
glUniform1i(ortho->gl_enable_tex2d_loc, 0);
assert(glGetError() == GL_NO_ERROR);
+ glUniform1i(ortho->gl_tex2d_loc, 0);
+ assert(glGetError() == GL_NO_ERROR);
return;
}
+ glActiveTexture(GL_TEXTURE0);
+ assert(glGetError() == GL_NO_ERROR);
+ glBindTexture(GL_TEXTURE_2D, texture);
+ assert(glGetError() == GL_NO_ERROR);
glUniform1i(ortho->gl_enable_tex2d_loc, 1);
assert(glGetError() == GL_NO_ERROR);
- glUniform1i(ortho->gl_tex2d_loc, texture);
+ glUniform1i(ortho->gl_tex2d_loc, 0);
assert(glGetError() == GL_NO_ERROR);
}
void gl_ortho_clean (s_gl_ortho *ortho)
{
assert(ortho);
+ assert(glGetError() == GL_NO_ERROR);
glDeleteProgram(ortho->gl_shader_program);
+ assert(glGetError() == GL_NO_ERROR);
gl_square_clean(&ortho->square);
+ assert(glGetError() == GL_NO_ERROR);
+}
+
+void gl_ortho_color (s_gl_ortho *ortho, f32 r, f32 g, f32 b, f32 a)
+{
+ s_rgba color = {r, g, b, a};
+ assert(ortho);
+ assert(glGetError() == GL_NO_ERROR);
+ glUniform4fv(ortho->gl_color_loc, 1, &color.r);
+ assert(glGetError() == GL_NO_ERROR);
}
void gl_ortho_delete (s_gl_ortho *ortho)
@@ -149,6 +172,9 @@ s_gl_ortho * gl_ortho_init (s_gl_ortho *ortho)
ortho->gl_tex2d_loc =
glGetUniformLocation(ortho->gl_shader_program, "uTex2D");
assert(glGetError() == GL_NO_ERROR);
+ ortho->gl_color_loc =
+ glGetUniformLocation(ortho->gl_shader_program, "uColor");
+ assert(glGetError() == GL_NO_ERROR);
return ortho;
}
@@ -173,8 +199,8 @@ void gl_ortho_rect (s_gl_ortho *ortho, f32 x, f32 y, f32 w, f32 h)
assert(ortho);
assert(glGetError() == GL_NO_ERROR);
matrix = ortho->model_matrix;
- gl_matrix_4f_translate(&ortho->model_matrix, x - 0.5, y - 0.5, 0.0f);
- gl_matrix_4f_scale(&ortho->model_matrix, w + 1.0f, h + 1.0f, 1.0f);
+ gl_matrix_4f_translate(&ortho->model_matrix, x, y, 0.0f);
+ gl_matrix_4f_scale(&ortho->model_matrix, w, h, 1.0f);
gl_ortho_update_model_matrix(ortho);
assert(glGetError() == GL_NO_ERROR);
gl_square_render(&ortho->square);
@@ -184,6 +210,7 @@ void gl_ortho_rect (s_gl_ortho *ortho, f32 x, f32 y, f32 w, f32 h)
void gl_ortho_render (s_gl_ortho *ortho)
{
+ const s_rgba color = {1, 1, 1, 1};
GLenum error;
assert(ortho);
assert(glGetError() == GL_NO_ERROR);
@@ -207,6 +234,8 @@ void gl_ortho_render (s_gl_ortho *ortho)
assert(glGetError() == GL_NO_ERROR);
glUniform1i(ortho->gl_tex2d_loc, 0);
assert(glGetError() == GL_NO_ERROR);
+ glUniform4fv(ortho->gl_color_loc, 1, &color.r);
+ assert(glGetError() == GL_NO_ERROR);
glDepthRange(ortho->clip_z_near, ortho->clip_z_far);
assert(glGetError() == GL_NO_ERROR);
/*
diff --git a/libc3/window/sdl2/gl_ortho.h b/libc3/window/sdl2/gl_ortho.h
index 8e06d15..c31264a 100644
--- a/libc3/window/sdl2/gl_ortho.h
+++ b/libc3/window/sdl2/gl_ortho.h
@@ -26,6 +26,8 @@ s_gl_ortho * gl_ortho_new (void);
/* Operators. */
void gl_ortho_bind_texture (s_gl_ortho *ortho, GLuint texture);
+void gl_ortho_color (s_gl_ortho *ortho, f32 r, f32 g, f32 b,
+ f32 a);
void gl_ortho_rect (s_gl_ortho *ortho, f32 x1, f32 x2, f32 y1,
f32 y2);
void gl_ortho_render (s_gl_ortho *ortho);
diff --git a/libc3/window/sdl2/gl_text.c b/libc3/window/sdl2/gl_text.c
index a04617b..e42c7d1 100644
--- a/libc3/window/sdl2/gl_text.c
+++ b/libc3/window/sdl2/gl_text.c
@@ -118,7 +118,7 @@ bool gl_text_render_to_texture (s_gl_text *text)
FT_Vector delta;
FT_Get_Kerning(font->ft_face, prev_glyph_index, glyph_index,
FT_KERNING_DEFAULT, &delta);
- x += (f32) delta.x / (1 << 6);
+ x += delta.x >> 6;
}
if (FT_Load_Glyph(font->ft_face, glyph_index, FT_LOAD_RENDER)) {
continue;
@@ -128,13 +128,13 @@ bool gl_text_render_to_texture (s_gl_text *text)
while (i < glyph->bitmap.width) {
j = 0;
while (j < glyph->bitmap.rows) {
- data_x = round(x) + i;
+ data_x = x + i;
data_y = j + glyph->bitmap_top;
data_pixel = data + (data_y * data_w + data_x) * 4;
u8 value = glyph->bitmap.buffer[j * glyph->bitmap.width + i];
- data_pixel[0] = value;
- data_pixel[1] = value;
- data_pixel[2] = value;
+ data_pixel[0] = 255;
+ data_pixel[1] = 255;
+ data_pixel[2] = 255;
data_pixel[3] = value;
j++;
}
diff --git a/libc3/window/sdl2/types.h b/libc3/window/sdl2/types.h
index fef23ea..95bf885 100644
--- a/libc3/window/sdl2/types.h
+++ b/libc3/window/sdl2/types.h
@@ -274,14 +274,15 @@ struct gl_camera {
s_gl_point_3f rotation;
s_gl_point_3f scale;
s_gl_matrix_4f projection_matrix;
- u32 gl_projection_matrix_loc;
s_gl_matrix_4f view_matrix;
- u32 gl_view_matrix_loc;
s_gl_matrix_4f model_matrix;
- u32 gl_model_matrix_loc;
- u32 gl_enable_tex2d_loc;
- u32 gl_tex2d_loc;
- u32 gl_shader_program;
+ GLuint gl_projection_matrix_loc;
+ GLuint gl_view_matrix_loc;
+ GLuint gl_model_matrix_loc;
+ GLuint gl_enable_tex2d_loc;
+ GLuint gl_tex2d_loc;
+ GLuint gl_color_loc;
+ GLuint gl_shader_program;
};
struct gl_cylinder {
@@ -302,13 +303,11 @@ struct gl_square {
uw segments_v;
};
-#pragma pack(push, 1)
struct gl_vertex {
s_gl_point_3f position;
s_gl_point_3f normal;
s_gl_point_2f tex_coord;
};
-#pragma pack(pop)
struct sdl2_sprite {
s_gl_object object;
@@ -339,14 +338,15 @@ struct gl_ortho {
s_gl_point_3f rotation;
s_gl_point_3f scale;
s_gl_matrix_4f projection_matrix;
- u32 gl_projection_matrix_loc;
+ GLuint gl_projection_matrix_loc;
s_gl_matrix_4f view_matrix;
- u32 gl_view_matrix_loc;
+ GLuint gl_view_matrix_loc;
s_gl_matrix_4f model_matrix;
- u32 gl_model_matrix_loc;
- u32 gl_enable_tex2d_loc;
- u32 gl_tex2d_loc;
- u32 gl_shader_program;
+ GLuint gl_model_matrix_loc;
+ GLuint gl_enable_tex2d_loc;
+ GLuint gl_tex2d_loc;
+ GLuint gl_color_loc;
+ GLuint gl_shader_program;
s_gl_square square;
};