Base.h (pymol-v2.1.0.tar.bz2) | : | Base.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 56 | skipping to change at line 56 | |||
#define R_SMALL8 0.00000001F | #define R_SMALL8 0.00000001F | |||
#endif | #endif | |||
typedef struct { | typedef struct { | |||
unsigned 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 | |||
bond - first index in pickVLA defines what pi | ||||
ck | ||||
0 - first pass | ||||
1 - second pass | ||||
2 - first pass, reload VBOs with pick colors | ||||
3 - second pass, reload VBOs with pick colors | ||||
*/ | ||||
} Pickable; | } Pickable; | |||
#define cPickableAtom -1 | #define cPickableAtom -1 | |||
#define cPickableLabel -2 | #define cPickableLabel -2 | |||
#define cPickableGadget -3 | #define cPickableGadget -3 | |||
#define cPickableNoPick -4 | #define cPickableNoPick -4 | |||
#define cPuttyTransformNormalizedNonlinear 0 | #define cPuttyTransformNormalizedNonlinear 0 | |||
#define cPuttyTransformRelativeNonlinear 1 | #define cPuttyTransformRelativeNonlinear 1 | |||
#define cPuttyTransformScaledNonlinear 2 | #define cPuttyTransformScaledNonlinear 2 | |||
skipping to change at line 128 | skipping to change at line 133 | |||
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; | |||
float front, back, stereo_front; | float front, back, stereo_front; | |||
float fog_start, fog_end; | float fog_start, fog_end; | |||
float view_normal[3]; | float view_normal[3]; | |||
float width_scale; | float width_scale; | |||
float vertex_scale; /* how large is a screen pixel in model space at the origin */ | float vertex_scale; /* how large is a screen pixel in model space at the origin */ | |||
float *pmv_matrix; | ||||
int sampling; /* are we supersampling? */ | int sampling; /* are we supersampling? */ | |||
int ortho; /* orthoscopic projection? */ | int ortho; /* orthoscopic projection? */ | |||
int line_lighting; /* line lighting */ | int line_lighting; /* line lighting */ | |||
int dynamic_width; | int dynamic_width; | |||
float dynamic_width_factor, dynamic_width_min, dynamic_width_max; | float dynamic_width_factor, dynamic_width_min, dynamic_width_max; | |||
int texture_font_size; | ||||
int use_shaders; | ||||
bool picking_32bit; | ||||
void (*setUCColorFromIndex)(uchar *color, unsigned int idx); | ||||
void (*setUCColorToZero)(uchar *color); | ||||
} RenderInfo; | } RenderInfo; | |||
#define MAXLINELEN 1024 | #define MAXLINELEN 1024 | |||
#define PYMOL_MAX_THREADS 125 | #define PYMOL_MAX_THREADS 125 | |||
#ifndef _PYMOL_NO_XRAY | #ifndef _PYMOL_NO_XRAY | |||
#define _PYMOL_XRAY | #define _PYMOL_XRAY | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 13 lines changed or added |