TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

use alpha channel if alpha image has it

Browse Source
This commit is contained in:
David Rose 2003-03-20 14:56:48 +00:00
parent 402b679d1e
commit b6eefd9e23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/gobj/texture.cxx
View File

@ -246,11 +246,19 @@ read(const Filename &fullpath, const Filename &alpha_fullpath) {
// Make the original image a 4-component image
image.add_alpha();
if (alpha_image.has_alpha()) {
for (int x = 0; x < image.get_x_size(); x++) {
for (int y = 0; y < image.get_y_size(); y++) {
image.set_alpha(x, y, alpha_image.get_alpha(x, y));
}
}
} else {
for (int x = 0; x < image.get_x_size(); x++) {
for (int y = 0; y < image.get_y_size(); y++) {
image.set_alpha(x, y, alpha_image.get_gray(x, y));
}
}
}
return load(image);
}

8
pandatool/src/egg-palettize/imageFile.cxx
View File

@ -293,12 +293,20 @@ read(PNMImage &image) const {
}
image.add_alpha();
if (alpha_image.has_alpha()) {
for (int y = 0; y < image.get_y_size(); y++) {
for (int x = 0; x < image.get_x_size(); x++) {
image.set_alpha(x, y, alpha_image.get_alpha(x, y));
}
}
} else {
for (int y = 0; y < image.get_y_size(); y++) {
for (int x = 0; x < image.get_x_size(); x++) {
image.set_alpha(x, y, alpha_image.get_gray(x, y));
}
}
}
}
return true;
}