Commit dd7681cc9ec8f6de9309ddc801c9e830a0bce6d6
2023-12-05T18:55:38
sdl2_sprite
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
diff --git a/libc3/window/sdl2/sdl2_sprite.c b/libc3/window/sdl2/sdl2_sprite.c
index 8e9e602..2431f5b 100644
--- a/libc3/window/sdl2/sdl2_sprite.c
+++ b/libc3/window/sdl2/sdl2_sprite.c
@@ -252,18 +252,23 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
while (i < sprite->frame_count && y < dim_y) {
x = 0;
while (i < sprite->frame_count && x < dim_x) {
- sprite_data = data;
+ sprite_data = data + sprite_stride * sprite->h;
v = 0;
while (v < sprite->h) {
+ sprite_data -= sprite_stride;
memcpy(sprite_data,
png_row[y * sprite->h + v] + x * sprite_stride,
sprite_stride);
- sprite_data += sprite_stride;
v++;
}
glBindTexture(GL_TEXTURE_2D, sprite->texture[i]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, gl_format, sprite->w, sprite->h,
0, gl_format, gl_type, data);
+ glGenerateMipmap(GL_TEXTURE_2D);
gl_error = glGetError();
if (gl_error != GL_NO_ERROR) {
warnx("sdl2_sprite_init: %s: glTexImage2D: %s\n",
@@ -287,18 +292,19 @@ void sdl2_sprite_render (const s_sdl2_sprite *sprite,
assert(sprite);
assert(frame < sprite->frame_count);
frame %= sprite->frame_count;
- (void) frame;
glColor4f(1, 1, 1, 1);
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, 0); //sprite->texture[frame]);
- glBegin(GL_QUADS);
- glTexCoord2f(0, 0);
- glVertex2i(0, 0);
- glTexCoord2f(0, 1);
- glVertex2d(0, sprite->h);
- glTexCoord2f(1, 1);
- glVertex2d(sprite->w, sprite->h);
- glTexCoord2f(1, 0);
- glVertex2i(sprite->w, 0);
- glEnd();
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glBindTexture(GL_TEXTURE_2D, sprite->texture[frame]);
+ glBegin(GL_QUADS); {
+ glTexCoord2f(0, 0);
+ glVertex2i(0, 0);
+ glTexCoord2f(0, 1);
+ glVertex2d(0, sprite->h);
+ glTexCoord2f(1, 1);
+ glVertex2d(sprite->w, sprite->h);
+ glTexCoord2f(1, 0);
+ glVertex2i(sprite->w, 0);
+ } glEnd();
}