Base.h (pymol-v1.8.6.0.tar.bz2) | : | Base.h (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
-* | -* | |||
-* | -* | |||
Z* ------------------------------------------------------------------- | Z* ------------------------------------------------------------------- | |||
*/ | */ | |||
#ifndef _H_Base | #ifndef _H_Base | |||
#define _H_Base | #define _H_Base | |||
#include"os_limits.h" | #include"os_limits.h" | |||
#include"os_types.h" | #include"os_types.h" | |||
#ifndef true | ||||
#define true 1 | ||||
#endif | ||||
#ifndef false | ||||
#define false 0 | ||||
#endif | ||||
#ifndef NULL | #ifndef NULL | |||
#define NULL ((void*)0) | #define NULL ((void*)0) | |||
#endif | #endif | |||
#ifndef PI | #ifndef PI | |||
#define PI 3.14159265358979323846 | #define PI 3.14159265358979323846 | |||
#endif | #endif | |||
#ifndef uchar | typedef unsigned char uchar; | |||
#define uchar unsigned char | ||||
#endif | ||||
#ifndef uint | typedef unsigned int uint; | |||
#define uint unsigned int | ||||
#endif | ||||
#define MAX_VDW 2.5F /* this has to go */ | #define MAX_VDW 2.5F /* this has to go */ | |||
#ifndef MAXFLOAT | #ifndef MAXFLOAT | |||
#define MAXFLOAT FLT_MAX | #define MAXFLOAT FLT_MAX | |||
#endif | #endif | |||
#ifndef R_SMALL4 | #ifndef R_SMALL4 | |||
#define R_SMALL4 0.0001F | #define R_SMALL4 0.0001F | |||
#endif | #endif | |||
#ifndef R_SMALL8 | #ifndef R_SMALL8 | |||
#define R_SMALL8 0.00000001F | #define R_SMALL8 0.00000001F | |||
#endif | #endif | |||
typedef struct { | typedef struct { | |||
int index; /* atom index. | unsigned int index; /* atom index. | |||
NOTE: that first record contains the list cou nt...not pick info */ | NOTE: that first record contains the list cou nt...not pick info */ | |||
int bond; /* bond index, | int bond; /* bond index, | |||
>=0 for bond | >=0 for bond | |||
-1 for atom | -1 for atom | |||
-2 for label | -2 for label | |||
-3 for gadget */ | -3 for gadget */ | |||
} Pickable; | } Pickable; | |||
#define cPickableAtom -1 | #define cPickableAtom -1 | |||
#define cPickableLabel -2 | #define cPickableLabel -2 | |||
skipping to change at line 124 | skipping to change at line 112 | |||
} RefPosType; | } RefPosType; | |||
/* not a global, but CRay widely used and Ray.h definitely isn't a | /* not a global, but CRay widely used and Ray.h definitely isn't a | |||
* lightweight include... */ | * lightweight include... */ | |||
typedef struct _CRay CRay; | typedef struct _CRay CRay; | |||
/* likewise */ | /* likewise */ | |||
#ifndef CGO_DEFINED | #ifndef CGO_DEFINED | |||
typedef struct _CGO CGO; | class CGO; | |||
#define CGO_DEFINED | #define CGO_DEFINED | |||
#endif | #endif | |||
typedef struct { | typedef struct { | |||
int state; | int state; | |||
CRay *ray; | CRay *ray; | |||
CGO *alpha_cgo; | CGO *alpha_cgo; | |||
Picking **pick; | Picking **pick; | |||
int pass; | int pass; | |||
int width_scale_flag; | int width_scale_flag; | |||
End of changes. 5 change blocks. | ||||
16 lines changed or deleted | 4 lines changed or added |