author | rubidium |
Tue, 25 Dec 2007 13:28:09 +0000 | |
changeset 8132 | f4c7a8e4f25a |
parent 8130 | d2eb7d04f6e1 |
child 8142 | 837f47089a7c |
permissions | -rw-r--r-- |
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
1 |
/* $Id$ */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
2 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
3 |
/** @file grf.cpp */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
4 |
|
7098
02887279c5fe
(svn r10365) -Fix: compiling without png and networking support under MSVC.
rubidium
parents:
6907
diff
changeset
|
5 |
#ifdef WITH_PNG |
02887279c5fe
(svn r10365) -Fix: compiling without png and networking support under MSVC.
rubidium
parents:
6907
diff
changeset
|
6 |
|
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
7 |
#include "../stdafx.h" |
8123
ce31d2843a95
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8037
diff
changeset
|
8 |
#include "../gfx_func.h" |
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
9 |
#include "../fileio.h" |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
10 |
#include "../variables.h" |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
11 |
#include "../debug.h" |
8130
d2eb7d04f6e1
(svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.
rubidium
parents:
8123
diff
changeset
|
12 |
#include "../core/alloc_func.hpp" |
8132
f4c7a8e4f25a
(svn r11694) -Codechange: move more endianness related stuff to endian_func.hpp.
rubidium
parents:
8130
diff
changeset
|
13 |
#include "../core/endian_func.hpp" |
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
14 |
#include "png.hpp" |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
15 |
#include <png.h> |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
16 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
17 |
#define PNG_SLOT 62 |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
18 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
19 |
static void PNGAPI png_my_read(png_structp png_ptr, png_bytep data, png_size_t length) |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
20 |
{ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
21 |
FioReadBlock(data, length); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
22 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
23 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
24 |
static void PNGAPI png_my_error(png_structp png_ptr, png_const_charp message) |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
25 |
{ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
26 |
DEBUG(sprite, 0, "ERROR (libpng): %s - %s", message, (char *)png_get_error_ptr(png_ptr)); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
27 |
longjmp(png_ptr->jmpbuf, 1); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
28 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
29 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
30 |
static void PNGAPI png_my_warning(png_structp png_ptr, png_const_charp message) |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
31 |
{ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
32 |
DEBUG(sprite, 0, "WARNING (libpng): %s - %s", message, (char *)png_get_error_ptr(png_ptr)); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
33 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
34 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
35 |
static bool OpenPNGFile(const char *filename, uint32 id, bool mask) |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
36 |
{ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
37 |
char png_file[MAX_PATH]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
38 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
39 |
snprintf(png_file, sizeof(png_file), "sprites" PATHSEP "%s" PATHSEP "%d%s.png", filename, id, mask ? "m" : ""); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
40 |
if (FioCheckFileExists(png_file)) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
41 |
FioOpenFile(PNG_SLOT, png_file); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
42 |
return true; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
43 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
44 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
45 |
/* TODO -- Add TAR support */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
46 |
return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
47 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
48 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
49 |
static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 id, bool mask) |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
50 |
{ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
51 |
png_byte header[8]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
52 |
png_structp png_ptr; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
53 |
png_infop info_ptr, end_info; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
54 |
uint bit_depth, color_type; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
55 |
uint i, pixelsize; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
56 |
png_bytep row_pointer; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
57 |
SpriteLoader::CommonPixel *dst; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
58 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
59 |
if (!OpenPNGFile(filename, id, mask)) return mask; // If mask is true, and file not found, continue true anyway, as it isn't a show-stopper |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
60 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
61 |
/* Check the header */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
62 |
FioReadBlock(header, 8); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
63 |
if (png_sig_cmp(header, 0, 8) != 0) return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
64 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
65 |
/* Create the reader */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
66 |
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, png_my_error, png_my_warning); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
67 |
if (png_ptr == NULL) return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
68 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
69 |
/* Create initial stuff */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
70 |
info_ptr = png_create_info_struct(png_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
71 |
if (info_ptr == NULL) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
72 |
png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
73 |
return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
74 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
75 |
end_info = png_create_info_struct(png_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
76 |
if (end_info == NULL) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
77 |
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
78 |
return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
79 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
80 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
81 |
/* Make sure that upon error, we can clean up graceful */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
82 |
if (setjmp(png_jmpbuf(png_ptr))) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
83 |
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
84 |
return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
85 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
86 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
87 |
/* Read the file */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
88 |
png_set_read_fn(png_ptr, NULL, png_my_read); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
89 |
png_set_sig_bytes(png_ptr, 8); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
90 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
91 |
png_read_info(png_ptr, info_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
92 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
93 |
if (!mask) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
94 |
/* Read the text chunks */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
95 |
png_textp text_ptr; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
96 |
int num_text = 0; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
97 |
png_get_text(png_ptr, info_ptr, &text_ptr, &num_text); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
98 |
if (num_text == 0) DEBUG(misc, 0, "Warning: PNG Sprite '%s/%d.png' doesn't have x_offs and y_offs; expect graphical problems", filename, id); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
99 |
for (int i = 0; i < num_text; i++) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
100 |
/* x_offs and y_offs are in the text-chunk of PNG */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
101 |
if (strcmp("x_offs", text_ptr[i].key) == 0) sprite->x_offs = strtol(text_ptr[i].text, NULL, 0); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
102 |
if (strcmp("y_offs", text_ptr[i].key) == 0) sprite->y_offs = strtol(text_ptr[i].text, NULL, 0); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
103 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
104 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
105 |
sprite->height = info_ptr->height; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
106 |
sprite->width = info_ptr->width; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
107 |
sprite->data = CallocT<SpriteLoader::CommonPixel>(sprite->width * sprite->height); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
108 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
109 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
110 |
bit_depth = png_get_bit_depth(png_ptr, info_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
111 |
color_type = png_get_color_type(png_ptr, info_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
112 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
113 |
if (mask && (bit_depth != 8 || color_type != PNG_COLOR_TYPE_PALETTE)) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
114 |
DEBUG(misc, 0, "Ignoring mask for SpriteID %d as it isn't a 8 bit palette image", id); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
115 |
return true; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
116 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
117 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
118 |
if (!mask) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
119 |
if (bit_depth == 16) png_set_strip_16(png_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
120 |
|
6907
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
121 |
if (color_type == PNG_COLOR_TYPE_PALETTE) { |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
122 |
png_set_palette_to_rgb(png_ptr); |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
123 |
color_type = PNG_COLOR_TYPE_RGB; |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
124 |
} |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
125 |
if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
126 |
png_set_gray_to_rgb(png_ptr); |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
127 |
color_type = PNG_COLOR_TYPE_RGB; |
f4409419df57
(svn r10156) -Fix: PNG loader can now load 8bpp palette images and greyscale images
truelight
parents:
6896
diff
changeset
|
128 |
} |
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
129 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
130 |
#ifdef TTD_LITTLE_ENDIAN |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
131 |
png_set_bgr(png_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
132 |
#else |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
133 |
if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) png_set_swap_alpha(png_ptr); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
134 |
#endif |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
135 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
136 |
if (color_type == PNG_COLOR_TYPE_RGB) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
137 |
#ifdef TTD_LITTLE_ENDIAN |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
138 |
png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
139 |
#else |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
140 |
png_set_filler(png_ptr, 0xff, PNG_FILLER_BEFORE); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
141 |
#endif |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
142 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
143 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
144 |
pixelsize = sizeof(uint32); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
145 |
} else { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
146 |
pixelsize = sizeof(uint8); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
147 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
148 |
|
8037
8aa4ace04383
(svn r11597) -Change: replace all remaining instances of (re|m|c)alloc with (Re|M|C)allocT and add a check for out-of-memory situations to the *allocT functions.
rubidium
parents:
7570
diff
changeset
|
149 |
row_pointer = (png_byte *)MallocT<byte>(info_ptr->width * pixelsize); |
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
150 |
if (row_pointer == NULL) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
151 |
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
152 |
return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
153 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
154 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
155 |
for (i = 0; i < info_ptr->height; i++) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
156 |
png_read_row(png_ptr, row_pointer, NULL); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
157 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
158 |
dst = sprite->data + i * info_ptr->width; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
159 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
160 |
for (uint x = 0; x < info_ptr->width; x++) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
161 |
if (mask) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
162 |
if (row_pointer[x * sizeof(uint8)] != 0) { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
163 |
dst[x].b = 0; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
164 |
dst[x].g = 0; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
165 |
dst[x].r = 0; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
166 |
/* Alpha channel is used from the original image (to allow transparency in remap colors) */ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
167 |
dst[x].m = row_pointer[x * sizeof(uint8)]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
168 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
169 |
} else { |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
170 |
dst[x].b = row_pointer[x * sizeof(uint32) + 0]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
171 |
dst[x].g = row_pointer[x * sizeof(uint32) + 1]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
172 |
dst[x].r = row_pointer[x * sizeof(uint32) + 2]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
173 |
dst[x].a = row_pointer[x * sizeof(uint32) + 3]; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
174 |
dst[x].m = 0; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
175 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
176 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
177 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
178 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
179 |
free(row_pointer); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
180 |
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
181 |
|
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
182 |
return true; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
183 |
} |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
184 |
|
7570
5d5d9b6af0ef
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7098
diff
changeset
|
185 |
bool SpriteLoaderPNG::LoadSprite(SpriteLoader::Sprite *sprite, const char *filename, uint8 file_slot, uint32 file_pos) |
6896
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
186 |
{ |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
187 |
if (!LoadPNG(sprite, filename, file_pos, false)) return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
188 |
if (!LoadPNG(sprite, filename, file_pos, true)) return false; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
189 |
return true; |
b96972ff7d4d
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
diff
changeset
|
190 |
} |
7098
02887279c5fe
(svn r10365) -Fix: compiling without png and networking support under MSVC.
rubidium
parents:
6907
diff
changeset
|
191 |
|
02887279c5fe
(svn r10365) -Fix: compiling without png and networking support under MSVC.
rubidium
parents:
6907
diff
changeset
|
192 |
#endif /* WITH_PNG */ |