Commit 5845e53d785ac6d87b87749ae5f429002b2f675f
2023-12-05T08:53:18
wip sdl2 libpng
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
diff --git a/libc3/window/sdl2/sdl2_sprite.c b/libc3/window/sdl2/sdl2_sprite.c
index 5912c12..cce8940 100644
--- a/libc3/window/sdl2/sdl2_sprite.c
+++ b/libc3/window/sdl2/sdl2_sprite.c
@@ -16,28 +16,6 @@
#include <libc3/c3.h>
#include "sdl2_sprite.h"
-bool g_il_is_loaded = false;
-
-static void ilEnsureInit (void)
-{
- if (! g_il_is_loaded) {
- ilInit();
- iluInit();
- g_il_is_loaded = true;
- }
-}
-
-void ilClean (void)
-{
- /*
- if (g_il_is_loaded) {
- iluDestroy();
- ilDestroy();
- g_il_is_loaded = false;
- }
- */
-}
-
void sdl2_sprite_clean (s_sdl2_sprite *sprite)
{
assert(sprite);
@@ -52,10 +30,10 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
uw dim_x, uw dim_y,
uw frame_count)
{
- //ILint bpp;
- ILubyte *data[3];
+ FILE *fp;
uw i;
- ILuint il_image[3];
+ png_infop png_info;
+ png_structp png_read;
uw x;
uw y;
assert(sprite);
@@ -64,21 +42,37 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
assert(dim_y);
str_init_copy_1(&sprite->path, path);
if (! file_search(&sprite->path, sym_1("r"), &sprite->real_path)) {
- warnx("sdl2_sprite_init:"
- " file not found: %s", path);
+ warnx("sdl2_sprite_init: file not found: %s", path);
str_clean(&sprite->path);
return NULL;
}
- ilEnsureInit();
- ilGenImages(3, il_image);
- ilBindImage(il_image[0]);
- if (! ilLoadImage(sprite->path.ptr.ps8)) {
- warnx("sdl2_sprite_init: error loading image: %s",
- iluErrorString(ilGetError()));
+ fp = fopen(sprite->real_path.ptr.ps8, "rb");
+ if (! fp) {
+ warn("sdl2_sprite_init: %s", sprite->real_path.ptr.ps8);
str_clean(&sprite->path);
str_clean(&sprite->real_path);
return NULL;
}
+ if (fread(png_header, 1, sizeof(png_header), fp) !=
+ sizeof(png_header)) {
+ warn("sdl2_sprite_init: %s", sprite->real_path.ptr.ps8);
+ fclose(fp);
+ str_clean(&sprite->path);
+ str_clean(&sprite->real_path);
+ return NULL;
+ }
+ if (png_sig_cmp(png_header, 0, sizeof(png_header))) {
+ warn("sdl2_sprite_init: %s: not a png", sprite->real_path.ptr.ps8);
+ fclose(fp);
+ str_clean(&sprite->path);
+ str_clean(&sprite->real_path);
+ return NULL;
+ }
+ png_read = png_create_read_struct
+ (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+ if (!png_ptr)
+ return ERROR;
sprite->total_w = ilGetInteger(IL_IMAGE_WIDTH);
sprite->total_h = ilGetInteger(IL_IMAGE_HEIGHT);
//bpp = ilGetInteger(IL_IMAGE_BPP);
diff --git a/libc3/window/sdl2/types.h b/libc3/window/sdl2/types.h
index 9e973a5..a6bc0d3 100644
--- a/libc3/window/sdl2/types.h
+++ b/libc3/window/sdl2/types.h
@@ -22,8 +22,7 @@
#include <GL/gl.h>
#include <GL/glu.h>
#include <FTGL/ftgl.h>
-#include <IL/il.h>
-#include <IL/ilu.h>
+#include <png.h>
#include <libc3/types.h>
#include "../types.h"