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

fix for big-endian machines

Browse Source
This commit is contained in:
David Rose 2009-02-13 19:21:00 +00:00
parent 1145a3cf99
commit 6ded005ea4
2 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx
View File

@ -2732,17 +2732,13 @@ copy_lum_image(ZTextureLevel *dest, int xsize, int ysize, Texture *tex, int leve
int co = cw - 1;
#endif
unsigned char *dpix = (unsigned char *)dest->pixmap;
unsigned int *dpix = (unsigned int *)dest->pixmap;
nassertv(dpix != NULL);
const unsigned char *spix = src;
int pixel_count = xsize * ysize;
while (pixel_count-- > 0) {
dpix[0] = spix[co];
dpix[1] = spix[co];
dpix[2] = spix[co];
dpix[3] = 0xff;
dpix += 4;
*dpix = RGBA8_TO_PIXEL(spix[co], spix[co], spix[co], 0xff);
++dpix;
spix += cw;
}
}
@ -2771,17 +2767,13 @@ copy_alpha_image(ZTextureLevel *dest, int xsize, int ysize, Texture *tex, int le
int co = cw - 1;
#endif
unsigned char *dpix = (unsigned char *)dest->pixmap;
unsigned int *dpix = (unsigned int *)dest->pixmap;
nassertv(dpix != NULL);
const unsigned char *spix = src;
int pixel_count = xsize * ysize;
while (pixel_count-- > 0) {
dpix[0] = 0xff;
dpix[1] = 0xff;
dpix[2] = 0xff;
dpix[3] = spix[co];
dpix += 4;
*dpix = RGBA8_TO_PIXEL(0xff, 0xff, 0xff, spix[co]);
++dpix;
spix += cw;
}
}
@ -2811,19 +2803,43 @@ copy_one_channel_image(ZTextureLevel *dest, int xsize, int ysize, Texture *tex,
int co = cw - 1;
#endif
unsigned char *dpix = (unsigned char *)dest->pixmap;
unsigned int *dpix = (unsigned int *)dest->pixmap;
nassertv(dpix != NULL);
const unsigned char *spix = src;
int pixel_count = xsize * ysize;
while (pixel_count-- > 0) {
dpix[0] = 0;
dpix[1] = 0;
dpix[2] = 0;
dpix[3] = 0xff;
dpix[channel] = spix[co];
dpix += 4;
spix += cw;
switch (channel) {
case 0:
while (pixel_count-- > 0) {
*dpix = RGBA8_TO_PIXEL(spix[co], 0, 0, 0xff);
++dpix;
spix += cw;
}
break;
case 1:
while (pixel_count-- > 0) {
*dpix = RGBA8_TO_PIXEL(0, spix[co], 0, 0xff);
++dpix;
spix += cw;
}
break;
case 2:
while (pixel_count-- > 0) {
*dpix = RGBA8_TO_PIXEL(0, 0, spix[co], 0xff);
++dpix;
spix += cw;
}
break;
case 3:
while (pixel_count-- > 0) {
*dpix = RGBA8_TO_PIXEL(0, 0, 0, spix[co]);
++dpix;
spix += cw;
}
break;
}
}
@ -2852,18 +2868,15 @@ copy_la_image(ZTextureLevel *dest, int xsize, int ysize, Texture *tex, int level
int co = cw - 1;
#endif
unsigned char *dpix = (unsigned char *)dest->pixmap;
unsigned int *dpix = (unsigned int *)dest->pixmap;
nassertv(dpix != NULL);
const unsigned char *spix = src;
int pixel_count = xsize * ysize;
int inc = 2 * cw;
while (pixel_count-- > 0) {
dpix[0] = spix[co];
dpix[1] = spix[co];
dpix[2] = spix[co];
dpix[3] = spix[cw + co];
dpix += 4;
spix += 2 * cw;
*dpix = RGBA8_TO_PIXEL(spix[co], spix[co], spix[co], spix[cw + co]);
++dpix;
spix += inc;
}
}
@ -2891,18 +2904,15 @@ copy_rgb_image(ZTextureLevel *dest, int xsize, int ysize, Texture *tex, int leve
int co = cw - 1;
#endif
unsigned char *dpix = (unsigned char *)dest->pixmap;
unsigned int *dpix = (unsigned int *)dest->pixmap;
nassertv(dpix != NULL);
const unsigned char *spix = src;
int pixel_count = xsize * ysize;
int inc = 3 * cw;
while (pixel_count-- > 0) {
dpix[0] = spix[co];
dpix[1] = spix[cw + co];
dpix[2] = spix[cw + cw + co];
dpix[3] = 0xff;
dpix += 4;
spix += 3 * cw;
*dpix = RGBA8_TO_PIXEL(spix[cw + cw + co], spix[cw + co], spix[co], 0xff);
++dpix;
spix += inc;
}
}
@ -2930,18 +2940,15 @@ copy_rgba_image(ZTextureLevel *dest, int xsize, int ysize, Texture *tex, int lev
int co = cw - 1;
#endif
unsigned char *dpix = (unsigned char *)dest->pixmap;
unsigned int *dpix = (unsigned int *)dest->pixmap;
nassertv(dpix != NULL);
const unsigned char *spix = src;
int pixel_count = xsize * ysize;
int inc = 4 * cw;
while (pixel_count-- > 0) {
dpix[0] = spix[co];
dpix[1] = spix[cw + co];
dpix[2] = spix[cw + cw + co];
dpix[3] = spix[cw + cw + cw + co];
dpix += 4;
spix += 4 * cw;
*dpix = RGBA8_TO_PIXEL(spix[cw + cw + co], spix[cw + co], spix[co], spix[cw + cw + cw + co]);
++dpix;
spix += inc;
}
}

2
panda/src/tinydisplay/zbuffer.h
View File

@ -70,6 +70,8 @@ typedef unsigned int ZPOINT;
((((unsigned int)(r) << 8) & 0xff0000) | ((unsigned int)(g) & 0xff00) | ((unsigned int)(b) >> 8))
#define RGBA_TO_PIXEL(r,g,b,a) \
((((unsigned int)(a) << 16) & 0xff000000) | (((unsigned int)(r) << 8) & 0xff0000) | ((unsigned int)(g) & 0xff00) | ((unsigned int)(b) >> 8))
#define RGBA8_TO_PIXEL(r,g,b,a) \
((((unsigned int)(a) << 24) & 0xff000000) | (((unsigned int)(r) << 16) & 0xff0000) | (((unsigned int)(g) << 8) & 0xff00) | (unsigned int)(b))
#define PIXEL_R(p) (((unsigned int)(p) & 0xff0000) >> 8)
#define PIXEL_G(p) ((unsigned int)(p) & 0xff00)
#define PIXEL_B(p) (((unsigned int)(p) & 0x00ff) << 8)