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

Merge remote-tracking branch 'origin/release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-08-07 21:42:02 +02:00
commit 2f8060bf2b
10 changed files with 105 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
direct/src/p3d/Packager.py
View File

@ -372,6 +372,9 @@ class Packager:
self.requiredFilenames = [] self.requiredFilenames = []
self.requiredModules = [] self.requiredModules = []
# A list of required packages that were missing.
self.missingPackages = []
# This records the current list of modules we have added so # This records the current list of modules we have added so
# far. # far.
self.freezer = FreezeTool.Freezer(platform = self.packager.platform) self.freezer = FreezeTool.Freezer(platform = self.packager.platform)
@ -495,6 +498,12 @@ class Packager:
as a true package. Either is implemented with a as a true package. Either is implemented with a
Multifile. """ Multifile. """
if self.missingPackages:
missing = ', '.join([name for name, version in self.missingPackages])
self.notify.warning("Cannot build package %s due to missing dependencies: %s" % (self.packageName, missing))
self.cleanup()
return False
self.multifile = Multifile() self.multifile = Multifile()
# Write the multifile to a temporary filename until we # Write the multifile to a temporary filename until we
@ -3217,7 +3226,9 @@ class Packager:
requires = self.currentPackage.requires) requires = self.currentPackage.requires)
if not package: if not package:
message = 'Unknown package %s, version "%s"' % (packageName, version) message = 'Unknown package %s, version "%s"' % (packageName, version)
raise PackagerError, message self.notify.warning(message)
self.currentPackage.missingPackages.append((packageName, pversion))
continue
self.requirePackage(package) self.requirePackage(package)

2
panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm
View File

@ -210,7 +210,7 @@ choose_pixel_format(const FrameBufferProperties &properties,
attribs.push_back(CGDisplayIDToOpenGLDisplayMask(display)); attribs.push_back(CGDisplayIDToOpenGLDisplayMask(display));
// End of the array // End of the array
attribs.push_back((NSOpenGLPixelFormatAttribute) nil); attribs.push_back((NSOpenGLPixelFormatAttribute)0);
// Create the format. // Create the format.
NSOpenGLPixelFormat* format = [[NSOpenGLPixelFormat alloc] initWithAttributes:&attribs[0]]; NSOpenGLPixelFormat* format = [[NSOpenGLPixelFormat alloc] initWithAttributes:&attribs[0]];

20
panda/src/pnmimagetypes/colrops.c
View File

@ -47,7 +47,7 @@ int setcolrcor(double (*f)(double, double), double a2)
/* set brightness correction */ /* set brightness correction */
{ {
double mult; double mult;
register int i, j; int i, j;
/* allocate tables */ /* allocate tables */
if (g_bval == NULL && (g_bval = if (g_bval == NULL && (g_bval =
(BYTE (*)[256])bmalloc((MAXGSHIFT+1)*256)) == NULL) (BYTE (*)[256])bmalloc((MAXGSHIFT+1)*256)) == NULL)
@ -67,7 +67,7 @@ int setcolrinv(double (*f)(double, double), double a2)
/* set inverse brightness correction */ /* set inverse brightness correction */
{ {
double mult; double mult;
register int i, j; int i, j;
/* allocate tables */ /* allocate tables */
if (g_mant == NULL && (g_mant = (BYTE *)bmalloc(256)) == NULL) if (g_mant == NULL && (g_mant = (BYTE *)bmalloc(256)) == NULL)
return(-1); return(-1);
@ -97,10 +97,10 @@ int setcolrgam(double g) /* set gamma conversion */
} }
int colrs_gambs(register COLR *scan, int len) int colrs_gambs(COLR *scan, int len)
/* convert scanline of colrs to gamma bytes */ /* convert scanline of colrs to gamma bytes */
{ {
register int i, expo; int i, expo;
if (g_bval == NULL) if (g_bval == NULL)
return(-1); return(-1);
@ -145,10 +145,10 @@ int colrs_gambs(register COLR *scan, int len)
} }
int gambs_colrs(register COLR *scan, int len) int gambs_colrs(COLR *scan, int len)
/* convert gamma bytes to colr scanline */ /* convert gamma bytes to colr scanline */
{ {
register int nexpo; int nexpo;
if (g_mant == NULL || g_nexp == NULL) if (g_mant == NULL || g_nexp == NULL)
return(-1); return(-1);
@ -181,7 +181,7 @@ int gambs_colrs(register COLR *scan, int len)
void void
shiftcolrs(register COLR *scan, register int len, register int adjust) shiftcolrs(COLR *scan, int len, int adjust)
/* shift a scanline of colors by 2^adjust */ /* shift a scanline of colors by 2^adjust */
{ {
int minexp; int minexp;
@ -201,11 +201,11 @@ shiftcolrs(register COLR *scan, register int len, register int adjust)
void void
normcolrs(register COLR *scan, int len, int adjust) normcolrs(COLR *scan, int len, int adjust)
/* normalize a scanline of colrs */ /* normalize a scanline of colrs */
{ {
register int c; int c;
register int shift; int shift;
while (len-- > 0) { while (len-- > 0) {
shift = scan[0][EXP] + adjust - COLXS; shift = scan[0][EXP] + adjust - COLXS;

24
panda/src/pnmimagetypes/pnmFileTypePNM.cxx
View File

@ -317,8 +317,8 @@ getbit (istream * const file) {
static void static void
pbm_readpbmrow( istream *file, bit *bitrow, int cols, int format ) { pbm_readpbmrow( istream *file, bit *bitrow, int cols, int format ) {
register int col, bitshift; int col, bitshift;
register bit* bP; bit* bP;
switch ( format ) switch ( format )
{ {
@ -328,7 +328,7 @@ pbm_readpbmrow( istream *file, bit *bitrow, int cols, int format ) {
break; break;
case RPBM_FORMAT: { case RPBM_FORMAT: {
register unsigned char item; unsigned char item;
bitshift = -1; item = 0; /* item's value is meaningless here */ bitshift = -1; item = 0; /* item's value is meaningless here */
for ( col = 0, bP = bitrow; col < cols; ++col, ++bP ) for ( col = 0, bP = bitrow; col < cols; ++col, ++bP )
{ {
@ -486,12 +486,12 @@ ppm_readppmrow(istream* const fileP,
static void static void
pnm_readpnmrow( istream* file, xel* xelrow, int cols, xelval maxval, int format ) { pnm_readpnmrow( istream* file, xel* xelrow, int cols, xelval maxval, int format ) {
register int col; int col;
register xel* xP; xel* xP;
gray* grayrow; gray* grayrow;
register gray* gP; gray* gP;
bit* bitrow; bit* bitrow;
register bit* bP; bit* bP;
switch ( PNM_FORMAT_TYPE(format) ) switch ( PNM_FORMAT_TYPE(format) )
{ {
@ -815,8 +815,8 @@ pgm_writepgmrow(ostream* const fileP,
static void static void
ppm_writeppmrowraw(ostream *file, pixel *pixelrow, int cols, pixval maxval ) { ppm_writeppmrowraw(ostream *file, pixel *pixelrow, int cols, pixval maxval ) {
register int col; int col;
register pixval val; pixval val;
for ( col = 0; col < cols; ++col ) for ( col = 0; col < cols; ++col )
{ {
@ -843,9 +843,9 @@ ppm_writeppmrowraw(ostream *file, pixel *pixelrow, int cols, pixval maxval ) {
static void static void
ppm_writeppmrowplain(ostream *file, pixel *pixelrow, int cols, pixval maxval ) { ppm_writeppmrowplain(ostream *file, pixel *pixelrow, int cols, pixval maxval ) {
register int col, charcount; int col, charcount;
register pixel* pP; pixel* pP;
register pixval val; pixval val;
charcount = 0; charcount = 0;
for ( col = 0, pP = pixelrow; col < cols; ++col, ++pP ) for ( col = 0, pP = pixelrow; col < cols; ++col, ++pP )

14
panda/src/pnmimagetypes/pnmFileTypeTIFF.cxx
View File

@ -1033,7 +1033,7 @@ write_data(xel *array, xelval *alpha) {
grn[TIFF_COLORMAP_MAXCOLORS], grn[TIFF_COLORMAP_MAXCOLORS],
blu[TIFF_COLORMAP_MAXCOLORS]; blu[TIFF_COLORMAP_MAXCOLORS];
int row, colors, i; int row, colors, i;
register int col; int col;
int grayscale = false; int grayscale = false;
struct tiff * tif; struct tiff * tif;
short photometric = 0; short photometric = 0;
@ -1064,7 +1064,7 @@ write_data(xel *array, xelval *alpha) {
<< colors << " colors found; writing an 8-bit palette file.\n"; << colors << " colors found; writing an 8-bit palette file.\n";
grayscale = true; grayscale = true;
for ( i = 0; i < colors; ++i ) { for ( i = 0; i < colors; ++i ) {
register xelval r, g, b; xelval r, g, b;
r = PPM_GETR( chv[i].color ); r = PPM_GETR( chv[i].color );
g = PPM_GETG( chv[i].color ); g = PPM_GETG( chv[i].color );
@ -1203,7 +1203,7 @@ write_data(xel *array, xelval *alpha) {
} else { } else {
tP = buf; tP = buf;
for ( col = 0; col < _x_size; ++col ) { for ( col = 0; col < _x_size; ++col ) {
register int s; int s;
s = ppm_lookupcolor( cht, (pixel *)(&row_data[col]) ); s = ppm_lookupcolor( cht, (pixel *)(&row_data[col]) );
if ( s == -1 ) { if ( s == -1 ) {
@ -1219,10 +1219,10 @@ write_data(xel *array, xelval *alpha) {
} }
} }
} else { } else {
register xelval bigger_maxval; xelval bigger_maxval;
register int bitshift; int bitshift;
register unsigned char byte; unsigned char byte;
register xelval s; xelval s;
bigger_maxval = pm_bitstomaxval( bitspersample ); bigger_maxval = pm_bitstomaxval( bitspersample );
bitshift = 8 - bitspersample; bitshift = 8 - bitspersample;

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

@ -358,7 +358,7 @@ memset_l(void *adr, int val, int count) {
void void
memset_RGB24(void *adr,int r, int v, int b,long count) { memset_RGB24(void *adr,int r, int v, int b,long count) {
long i, n; long i, n;
register long v1,v2,v3,*pt=(long *)(adr); long v1,v2,v3,*pt=(long *)(adr);
unsigned char *p,R=(unsigned char)r,V=(unsigned char)v,B=(unsigned char)b; unsigned char *p,R=(unsigned char)r,V=(unsigned char)v,B=(unsigned char)b;
p=(unsigned char *)adr; p=(unsigned char *)adr;

6
panda/src/tinydisplay/zdither.cxx
View File

@ -89,7 +89,7 @@ ZDither_lookupColor(int r,int g,int b) {
#define DITHER_PIXEL2(a) \ #define DITHER_PIXEL2(a) \
{ \ { \
register int v,t,r,g,c; \ int v,t,r,g,c; \
v=*(unsigned int *)(pp+(a)); \ v=*(unsigned int *)(pp+(a)); \
g=(v & 0x07DF07DF) + g_d; \ g=(v & 0x07DF07DF) + g_d; \
r=(((v & 0xF800F800) >> 2) + r_d) & 0x70007000; \ r=(((v & 0xF800F800) >> 2) + r_d) & 0x70007000; \
@ -110,8 +110,8 @@ ZB_ditherFrameBuffer(ZBuffer *zb,unsigned char *buf,
unsigned short *pp1; unsigned short *pp1;
int r_d,g_d,b_d; int r_d,g_d,b_d;
unsigned char *ctable=zb->dctable; unsigned char *ctable=zb->dctable;
register unsigned char *dest; unsigned char *dest;
register unsigned short *pp; unsigned short *pp;
assert( ((long)buf & 1) == 0 && (linesize & 1) == 0); assert( ((long)buf & 1) == 0 && (linesize & 1) == 0);

12
panda/src/tinydisplay/zline.h
View File

@ -1,17 +1,17 @@
{ {
int n, dx, dy, sx, pp_inc_1, pp_inc_2; int n, dx, dy, sx, pp_inc_1, pp_inc_2;
register int a; int a;
register PIXEL *pp; PIXEL *pp;
#if defined(INTERP_RGB) #if defined(INTERP_RGB)
register unsigned int r, g, b; unsigned int r, g, b;
#endif #endif
#ifdef INTERP_RGB #ifdef INTERP_RGB
register unsigned int rinc, ginc, binc; unsigned int rinc, ginc, binc;
#endif #endif
#ifdef INTERP_Z #ifdef INTERP_Z
register ZPOINT *pz; ZPOINT *pz;
int zinc; int zinc;
register int z, zz; int z, zz;
#endif #endif
if (p1->y > p2->y || (p1->y == p2->y && p1->x > p2->x)) { if (p1->y > p2->y || (p1->y == p2->y && p1->x > p2->x)) {

12
panda/src/tinydisplay/ztriangle.h
View File

@ -344,17 +344,17 @@
#ifndef DRAW_LINE #ifndef DRAW_LINE
/* generic draw line */ /* generic draw line */
{ {
register PIXEL *pp; PIXEL *pp;
register int n; int n;
#ifdef INTERP_Z #ifdef INTERP_Z
register ZPOINT *pz; ZPOINT *pz;
register unsigned int z,zz; unsigned int z,zz;
#endif #endif
#ifdef INTERP_RGB #ifdef INTERP_RGB
register unsigned int or1,og1,ob1,oa1; unsigned int or1,og1,ob1,oa1;
#endif #endif
#ifdef INTERP_ST #ifdef INTERP_ST
register unsigned int s,t; unsigned int s,t;
#endif #endif
#ifdef INTERP_STZ #ifdef INTERP_STZ
PN_stdfloat sz,tz; PN_stdfloat sz,tz;

49
panda/src/tinydisplay/ztriangle_two.h
View File

@ -326,10 +326,10 @@ FNAME(white_perspective) (ZBuffer *zb,
#define DRAW_LINE() \ #define DRAW_LINE() \
{ \ { \
register ZPOINT *pz; \ ZPOINT *pz; \
register PIXEL *pp; \ PIXEL *pp; \
register int s,t,z,zz; \ int s,t,z,zz; \
register int n,dsdx,dtdx; \ int n,dsdx,dtdx; \
PN_stdfloat sz,tz,fz,zinv; \ PN_stdfloat sz,tz,fz,zinv; \
n=(x2>>16)-x1; \ n=(x2>>16)-x1; \
fz=(PN_stdfloat)z1; \ fz=(PN_stdfloat)z1; \
@ -452,11 +452,11 @@ FNAME(flat_perspective) (ZBuffer *zb,
#define DRAW_LINE() \ #define DRAW_LINE() \
{ \ { \
register ZPOINT *pz; \ ZPOINT *pz; \
register PIXEL *pp; \ PIXEL *pp; \
register int s,t,z,zz; \ int s,t,z,zz; \
register int n,dsdx,dtdx; \ int n,dsdx,dtdx; \
register int or1,og1,ob1,oa1; \ int or1,og1,ob1,oa1; \
PN_stdfloat sz,tz,fz,zinv; \ PN_stdfloat sz,tz,fz,zinv; \
n=(x2>>16)-x1; \ n=(x2>>16)-x1; \
fz=(PN_stdfloat)z1; \ fz=(PN_stdfloat)z1; \
@ -592,11 +592,11 @@ FNAME(smooth_perspective) (ZBuffer *zb,
#define DRAW_LINE() \ #define DRAW_LINE() \
{ \ { \
register ZPOINT *pz; \ ZPOINT *pz; \
register PIXEL *pp; \ PIXEL *pp; \
register int s,t,z,zz; \ int s,t,z,zz; \
register int n,dsdx,dtdx; \ int n,dsdx,dtdx; \
register int or1,og1,ob1,oa1; \ int or1,og1,ob1,oa1; \
PN_stdfloat sz,tz,fz,zinv; \ PN_stdfloat sz,tz,fz,zinv; \
n=(x2>>16)-x1; \ n=(x2>>16)-x1; \
fz=(PN_stdfloat)z1; \ fz=(PN_stdfloat)z1; \
@ -723,11 +723,11 @@ FNAME(smooth_multitex2) (ZBuffer *zb,
#define DRAW_LINE() \ #define DRAW_LINE() \
{ \ { \
register ZPOINT *pz; \ ZPOINT *pz; \
register PIXEL *pp; \ PIXEL *pp; \
register int s,t,sa,ta,z,zz; \ int s,t,sa,ta,z,zz; \
register int n,dsdx,dtdx,dsadx,dtadx; \ int n,dsdx,dtdx,dsadx,dtadx; \
register int or1,og1,ob1,oa1; \ int or1,og1,ob1,oa1; \
PN_stdfloat sz,tz,sza,tza,fz,zinv; \ PN_stdfloat sz,tz,sza,tza,fz,zinv; \
n=(x2>>16)-x1; \ n=(x2>>16)-x1; \
fz=(PN_stdfloat)z1; \ fz=(PN_stdfloat)z1; \
@ -884,11 +884,11 @@ FNAME(smooth_multitex3) (ZBuffer *zb,
#define DRAW_LINE() \ #define DRAW_LINE() \
{ \ { \
register ZPOINT *pz; \ ZPOINT *pz; \
register PIXEL *pp; \ PIXEL *pp; \
register int s,t,sa,ta,sb,tb,z,zz; \ int s,t,sa,ta,sb,tb,z,zz; \
register int n,dsdx,dtdx,dsadx,dtadx,dsbdx,dtbdx; \ int n,dsdx,dtdx,dsadx,dtadx,dsbdx,dtbdx; \
register int or1,og1,ob1,oa1; \ int or1,og1,ob1,oa1; \
PN_stdfloat sz,tz,sza,tza,szb,tzb,fz,zinv; \ PN_stdfloat sz,tz,sza,tza,szb,tzb,fz,zinv; \
n=(x2>>16)-x1; \ n=(x2>>16)-x1; \
fz=(PN_stdfloat)z1; \ fz=(PN_stdfloat)z1; \
@ -1008,4 +1008,3 @@ FNAME(smooth_multitex3) (ZBuffer *zb,
#undef INTERP_MIPMAP #undef INTERP_MIPMAP
#undef CALC_MIPMAP_LEVEL #undef CALC_MIPMAP_LEVEL
#undef ZB_LOOKUP_TEXTURE #undef ZB_LOOKUP_TEXTURE