Extrude.h (pymol-v2.1.0.tar.bz2) | : | Extrude.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
#include"ObjectMolecule.h" | #include"ObjectMolecule.h" | |||
#include"CoordSet.h" | #include"CoordSet.h" | |||
typedef struct { | typedef struct { | |||
PyMOLGlobals *G; | PyMOLGlobals *G; | |||
int N; /* number of points in the extrusion segment */ | int N; /* number of points in the extrusion segment */ | |||
float *p; /* points */ | float *p; /* points */ | |||
float *n; /* normals (3x3f) at each point */ | float *n; /* normals (3x3f) at each point */ | |||
float *c; /* colors */ | float *c; /* colors */ | |||
int *i; /* atom indices */ | unsigned int *i; /* atom indices */ | |||
float r; | float r; | |||
float *sf; /* scale factors for variable-width extrusions ( single point) */ | float *sf; /* scale factors for variable-width extrusions ( single point) */ | |||
float *sv, *tv; | float *sv, *tv; | |||
float *sn, *tn; | float *sn, *tn; | |||
int Ns; | int Ns; | |||
} CExtrude; | } CExtrude; | |||
skipping to change at line 68 | skipping to change at line 68 | |||
int ExtrudeComputePuttyScaleFactors(CExtrude * I, ObjectMolecule * obj, | int ExtrudeComputePuttyScaleFactors(CExtrude * I, ObjectMolecule * obj, | |||
int transform, | int transform, | |||
float mean, float stdev, float min, float max , | float mean, float stdev, float min, float max , | |||
float power, float range, | float power, float range, | |||
float min_scale, float max_scale, int smooth_ window); | float min_scale, float max_scale, int smooth_ window); | |||
void ExtrudeBuildNormals1f(CExtrude * I); | void ExtrudeBuildNormals1f(CExtrude * I); | |||
void ExtrudeBuildNormals2f(CExtrude * I); | void ExtrudeBuildNormals2f(CExtrude * I); | |||
int ExtrudeComputeTangents(CExtrude * I); | int ExtrudeComputeTangents(CExtrude * I); | |||
int ExtrudeCylindersToCGO(CExtrude * I, CGO *cgo, float tube_radius, short is_pi | int ExtrudeCylindersToCGO(CExtrude * I, CGO *cgo, float tube_radius); | |||
cking); | int ExtrudeCGOSurfaceTube(CExtrude * I, CGO * cgo, int cap, const float *color_o | |||
int ExtrudeCGOSurfaceTube(CExtrude * I, CGO * cgo, int cap, float *color_overrid | verride, bool use_spheres, int dash=0); | |||
e, bool use_spheres, int dash=0); | void ExtrudeCGOSurfaceTubeToCylinders(CExtrude * I, CGO * cgo, int cap, const fl | |||
void ExtrudeCGOSurfaceTubeToCylinders(CExtrude * I, CGO * cgo, int cap, float *c | oat *color_override); | |||
olor_override); | ||||
int ExtrudeCGOSurfaceVariableTube(CExtrude * I, CGO * cgo, int cap); | int ExtrudeCGOSurfaceVariableTube(CExtrude * I, CGO * cgo, int cap); | |||
int ExtrudeCGOSurfacePolygon(CExtrude * I, CGO * cgo, int cap, float *color_over ride); | int ExtrudeCGOSurfacePolygon(CExtrude * I, CGO * cgo, int cap, const float *colo r_override); | |||
int ExtrudeCGOSurfacePolygonTaper(CExtrude * I, CGO * cgo, | int ExtrudeCGOSurfacePolygonTaper(CExtrude * I, CGO * cgo, | |||
int sampling, float *color_override); | int sampling, const float *color_override); | |||
int ExtrudeCGOSurfaceStrand(CExtrude * I, CGO * cgo, int sampling, | int ExtrudeCGOSurfaceStrand(CExtrude * I, CGO * cgo, int sampling, | |||
float *color_override); | const float *color_override); | |||
void ExtrudeCGOTraceFrame(CExtrude * I, CGO * cgo); | void ExtrudeCGOTraceFrame(CExtrude * I, CGO * cgo); | |||
void ExtrudeCGOTrace(CExtrude * I, CGO * cgo); | void ExtrudeCGOTrace(CExtrude * I, CGO * cgo); | |||
void ExtrudeCGOTraceAxes(CExtrude * I, CGO * cgo); | void ExtrudeCGOTraceAxes(CExtrude * I, CGO * cgo); | |||
int ExtrudeDumbbell1(CExtrude * I, float width, float length, int mode); | int ExtrudeDumbbell1(CExtrude * I, float width, float length, int mode); | |||
int ExtrudeDumbbell2(CExtrude * I, int n, int sign, float length, float size); | int ExtrudeDumbbell2(CExtrude * I, int n, int sign, float length, float size); | |||
void ExtrudeDumbbellEdge(CExtrude * I, int samp, int sign, float length); | void ExtrudeDumbbellEdge(CExtrude * I, int samp, int sign, float length); | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
10 lines changed or deleted | 9 lines changed or added |