Basis.h (pymol-v2.1.0.tar.bz2) | : | Basis.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 44 | skipping to change at line 44 | |||
#define cPrimNodePop 9 | #define cPrimNodePop 9 | |||
#define cPrimNodeAdd 10 | #define cPrimNodeAdd 10 | |||
#define cPrimBreak 11 | #define cPrimBreak 11 | |||
*/ | */ | |||
#define cCylCapNone 0 | #define cCylCapNone 0 | |||
#define cCylCapFlat 1 | #define cCylCapFlat 1 | |||
#define cCylCapRound 2 | #define cCylCapRound 2 | |||
#define cCylShaderCap1Flat 0x01 | ||||
#define cCylShaderCap2Flat 0x02 | ||||
#define cCylShaderCap1RoundBit 0x04 | ||||
#define cCylShaderCap2RoundBit 0x08 | ||||
#define cCylShaderCap1Round (cCylShaderCap1Flat | cCylShaderCap1RoundBit) | ||||
#define cCylShaderCap2Round (cCylShaderCap2Flat | cCylShaderCap2RoundBit) | ||||
#define cCylShaderInterpColor 0x10 | ||||
#define cCylShaderBothCapsRound (cCylShaderCap1Round | cCylShaderCap2Round) | ||||
#define cCylShaderBothCapsFlat (cCylShaderCap1Flat | cCylShaderCap2Flat) | ||||
#define cCylShaderMask 0x1F | ||||
typedef struct { | typedef struct { | |||
int vert; | int vert; | |||
float v1[3], v2[3], v3[3]; | float v1[3], v2[3], v3[3]; | |||
float n0[3], n1[3], n2[3], n3[3]; | float n0[3], n1[3], n2[3], n3[3]; | |||
float c1[3], c2[3], c3[3], ic[3], tr[3]; /* ic = interior color, tr = tra nsparency */ | float c1[3], c2[3], c3[3], ic[3], tr[3]; /* ic = interior color, tr = tra nsparency */ | |||
float r1, r2, l1; | float r1, r2, l1; | |||
float trans; | float trans; | |||
int char_id; | int char_id; | |||
char type, cap1, cap2, cull; | char type, cap1, cap2, cull; | |||
char wobble, ramped; | char wobble, ramped, no_lighting; | |||
/* float wobble_param[3] eliminated to save space */ | /* float wobble_param[3] eliminated to save space */ | |||
} CPrimitive; /* currently 172 bytes -> appoximately 6.5 milli on primitives per gigabyte */ | } CPrimitive; /* currently 172 bytes -> appoximately 6.5 milli on primitives per gigabyte */ | |||
typedef struct { | typedef struct { | |||
PyMOLGlobals *G; | PyMOLGlobals *G; | |||
MapType *Map; | MapType *Map; | |||
float *Vertex, *Normal, *Precomp; | float *Vertex, *Normal, *Precomp; | |||
float *Radius, *Radius2, MaxRadius, MinVoxel; | float *Radius, *Radius2, MaxRadius, MinVoxel; | |||
int *Vert2Normal; | int *Vert2Normal; | |||
int NVertex; | int NVertex; | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 14 lines changed or added |