GadgetSet.h (pymol-v2.1.0.tar.bz2) | : | GadgetSet.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
-* | -* | |||
-* | -* | |||
-* | -* | |||
Z* ------------------------------------------------------------------- | Z* ------------------------------------------------------------------- | |||
*/ | */ | |||
#ifndef _H_GadgetSet | #ifndef _H_GadgetSet | |||
#define _H_GadgetSet | #define _H_GadgetSet | |||
#include"Rep.h" | #include"Rep.h" | |||
#include"Setting.h" | #include"Setting.h" | |||
#include"Base.h" | ||||
typedef struct GadgetSet { | typedef struct GadgetSet { | |||
// methods (not fully refactored yet) | // methods (not fully refactored yet) | |||
void fFree(); | void fFree(); | |||
// methods | // methods | |||
void update(); | void update(); | |||
void render(RenderInfo * info); | void render(RenderInfo * info); | |||
void invalidateRep(int type, int level); | void invalidateRep(int type, int level); | |||
skipping to change at line 49 | skipping to change at line 48 | |||
int NCoord; | int NCoord; | |||
int NNormal; | int NNormal; | |||
int NColor; | int NColor; | |||
Pickable *P; | Pickable *P; | |||
CGO *PickShapeCGO; | CGO *PickShapeCGO; | |||
CGO *PickCGO; | CGO *PickCGO; | |||
CGO *StdCGO; | CGO *StdCGO; | |||
CGO *ShapeCGO; | CGO *ShapeCGO; | |||
CSetting *Setting; | CSetting *Setting; | |||
int offsetPtOP, offsetPtOPick; | ||||
} GadgetSet; | } GadgetSet; | |||
#include"ObjectGadget.h" | #include"ObjectGadget.h" | |||
GadgetSet *GadgetSetNew(PyMOLGlobals * G); | GadgetSet *GadgetSetNew(PyMOLGlobals * G); | |||
PyObject *GadgetSetAsPyList(GadgetSet * I, bool incl_cgos); | PyObject *GadgetSetAsPyList(GadgetSet * I, bool incl_cgos); | |||
int GadgetSetFromPyList(PyMOLGlobals * G, PyObject * list, GadgetSet ** cs, int version); | int GadgetSetFromPyList(PyMOLGlobals * G, PyObject * list, GadgetSet ** cs, int version); | |||
int GadgetSetGetExtent(GadgetSet * I, float *mn, float *mx); | int GadgetSetGetExtent(GadgetSet * I, float *mn, float *mx); | |||
int GadgetSetGetVertex(GadgetSet * I, int index, int base, float *v); | int GadgetSetGetVertex(GadgetSet * I, int index, int base, float *v); | |||
int GadgetSetSetVertex(GadgetSet * I, int index, int base, float *v); | int GadgetSetSetVertex(GadgetSet * I, int index, int base, float *v); | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |