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

add lummask pixfmt

Browse Source
This commit is contained in:
georges 2000-12-19 06:55:03 +00:00
parent f3f4f877e8
commit 09be56009d
4 changed files with 230 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/egg/eggTexture.cxx
View File

@ -389,10 +389,6 @@ string_format(const string &string) {
return F_rgba5;
} else if (cmp_nocase_uh(string, "rgb332") == 0) {
return F_rgb332;
} else if (cmp_nocase_uh(string, "luminance_alpha") == 0) {
return F_luminance_alpha;
} else if (cmp_nocase_uh(string, "red") == 0) {
return F_red;
} else if (cmp_nocase_uh(string, "green") == 0) {
@ -403,6 +399,10 @@ string_format(const string &string) {
return F_alpha;
} else if (cmp_nocase_uh(string, "luminance") == 0) {
return F_luminance;
} else if (cmp_nocase_uh(string, "luminance_alpha") == 0) {
return F_luminance_alpha;
} else if (cmp_nocase_uh(string, "luminance_alphamask") == 0) {
return F_luminance_alphamask;
} else {
return F_unspecified;
}
@ -523,9 +523,6 @@ ostream &operator << (ostream &out, EggTexture::Format format) {
case EggTexture::F_rgb332:
return out << "rgb332";
case EggTexture::F_luminance_alpha:
return out << "luminance-alpha";
case EggTexture::F_red:
return out << "red";
case EggTexture::F_green:
@ -536,6 +533,10 @@ ostream &operator << (ostream &out, EggTexture::Format format) {
return out << "alpha";
case EggTexture::F_luminance:
return out << "luminance";
case EggTexture::F_luminance_alpha:
return out << "luminance_alpha";
case EggTexture::F_luminance_alphamask:
return out << "luminance_alphamask";
}
nassertr(false, out);

2
panda/src/egg/eggTexture.h
View File

@ -46,8 +46,8 @@ public:
F_unspecified,
F_rgba, F_rgbm, F_rgba12, F_rgba8, F_rgba4, F_rgba5,
F_rgb, F_rgb12, F_rgb8, F_rgb5, F_rgb332,
F_luminance_alpha,
F_red, F_green, F_blue, F_alpha, F_luminance,
F_luminance_alpha, F_luminance_alphamask
};
enum WrapMode {
WM_unspecified, WM_repeat, WM_clamp

7
panda/src/glgsg/glGraphicsStateGuardian.cxx
View File

@ -3573,6 +3573,7 @@ get_external_image_format(PixelBuffer::Format format) {
return GL_RGBA;
case PixelBuffer::F_luminance:
return GL_LUMINANCE;
case PixelBuffer::F_luminance_alphamask:
case PixelBuffer::F_luminance_alpha:
return GL_LUMINANCE_ALPHA;
}
@ -3614,9 +3615,6 @@ get_internal_image_format(PixelBuffer::Format format) {
case PixelBuffer::F_rgb332:
return GL_R3_G3_B2;
case PixelBuffer::F_luminance_alpha:
return GL_LUMINANCE_ALPHA;
case PixelBuffer::F_alpha:
return GL_ALPHA;
@ -3625,6 +3623,9 @@ get_internal_image_format(PixelBuffer::Format format) {
case PixelBuffer::F_blue:
case PixelBuffer::F_luminance:
return GL_LUMINANCE;
case PixelBuffer::F_luminance_alpha:
case PixelBuffer::F_luminance_alphamask:
return GL_LUMINANCE_ALPHA;
default:
glgsg_cat.error()

3
panda/src/gobj/pixelBuffer.h
View File

@ -56,7 +56,8 @@ public:
F_rgba8, // 8 bits per R,G,B,A channel
F_rgba12, // 12 bits per R,G,B,A channel
F_luminance,
F_luminance_alpha
F_luminance_alpha, // 8 bits luminance, 8 bits alpha
F_luminance_alphamask // 8 bits luminance, only needs 1 bit of alpha
};
INLINE PixelBuffer(void);