is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.
| PyMOLObject.h (pymol-open-source-2.2.0) | : | PyMOLObject.h (pymol-open-source-2.3.0) |
|---|
| | |
| skipping to change at line 32 | | skipping to change at line 32 |
|---|
| #include"Base.h" | | #include"Base.h" |
| #include"Ray.h" | | #include"Ray.h" |
| #include"Rep.h" | | #include"Rep.h" |
| #include"Setting.h" | | #include"Setting.h" |
| #include"PyMOLGlobals.h" | | #include"PyMOLGlobals.h" |
| #include"View.h" | | #include"View.h" |
| #include"Word.h" | | #include"Word.h" |
| | |
| typedef char ObjectNameType[WordLength]; | | typedef char ObjectNameType[WordLength]; |
| | |
|
| #define cObjectMolecule 1 | | enum cObject_t : int { |
| #define cObjectMap 2 | | cObjectMolecule = 1, |
| #define cObjectMesh 3 | | cObjectMap = 2, |
| | cObjectMesh = 3, |
| /* cObjectDist now cObjectMeasurement */ | | cObjectMeasurement = 4, |
| #define cObjectMeasurement 4 | | cObjectCallback = 5, |
| #define cObjectCallback 5 | | cObjectCGO = 6, |
| #define cObjectCGO 6 | | cObjectSurface = 7, |
| #define cObjectSurface 7 | | cObjectGadget = 8, |
| #define cObjectGadget 8 | | cObjectCalculator = 9, |
| #define cObjectCalculator 9 | | cObjectSlice = 10, |
| #define cObjectSlice 10 | | cObjectAlignment = 11, |
| #define cObjectAlignment 11 | | cObjectGroup = 12, |
| #define cObjectGroup 12 | | cObjectVolume = 13, |
| #define cObjectVolume 13 | | }; |
| | |
| /* | | /* |
| the object base class is in the process of being converted to support | | the object base class is in the process of being converted to support |
| states explicitly (an unfortunate early omission), which will allow | | states explicitly (an unfortunate early omission), which will allow |
| for simplified implementation of future multi-state objects. | | for simplified implementation of future multi-state objects. |
| */ | | */ |
| | |
| typedef struct CObjectState { | | typedef struct CObjectState { |
| PyMOLGlobals *G; | | PyMOLGlobals *G; |
| double *Matrix; | | double *Matrix; |
| | |
| skipping to change at line 76 | | skipping to change at line 76 |
|---|
| PyMOLGlobals *G; | | PyMOLGlobals *G; |
| void (*fUpdate) (CObject * I); /* update representations */ | | void (*fUpdate) (CObject * I); /* update representations */ |
| void (*fRender) (CObject * I, RenderInfo * info); | | void (*fRender) (CObject * I, RenderInfo * info); |
| void (*fFree) (CObject * I); | | void (*fFree) (CObject * I); |
| int (*fGetNFrame) (CObject * I); | | int (*fGetNFrame) (CObject * I); |
| void (*fDescribeElement) (CObject * I, int index, char *buffer); | | void (*fDescribeElement) (CObject * I, int index, char *buffer); |
| void (*fInvalidate) (CObject * I, int rep, int level, int state); | | void (*fInvalidate) (CObject * I, int rep, int level, int state); |
| CSetting **(*fGetSettingHandle) (CObject * I, int state); | | CSetting **(*fGetSettingHandle) (CObject * I, int state); |
| char *(*fGetCaption) (CObject * I, char * ch, int len); | | char *(*fGetCaption) (CObject * I, char * ch, int len); |
| CObjectState *(*fGetObjectState) (CObject * I, int state); | | CObjectState *(*fGetObjectState) (CObject * I, int state); |
|
| int type; | | cObject_t type; |
| ObjectNameType Name; | | ObjectNameType Name; |
| int Color; | | int Color; |
| int visRep; | | int visRep; |
| float ExtentMin[3], ExtentMax[3]; | | float ExtentMin[3], ExtentMax[3]; |
| int ExtentFlag, TTTFlag; | | int ExtentFlag, TTTFlag; |
| float TTT[16]; /* translate, transform, translate matrix (to ap
ply when rendering) */ | | float TTT[16]; /* translate, transform, translate matrix (to ap
ply when rendering) */ |
| CSetting *Setting; | | CSetting *Setting; |
| int Enabled; /* read-only... maintained by Scene */ | | int Enabled; /* read-only... maintained by Scene */ |
| int Context; /* 0 = Camera, 1 = Unit Window, 2 = Scaled Windo
w */ | | int Context; /* 0 = Camera, 1 = Unit Window, 2 = Scaled Windo
w */ |
| CViewElem *ViewElem; /* for animating objects via the TTT */ | | CViewElem *ViewElem; /* for animating objects via the TTT */ |
| | |
| skipping to change at line 146 | | skipping to change at line 146 |
|---|
| PyObject *ObjectAsPyList(CObject * I); | | PyObject *ObjectAsPyList(CObject * I); |
| int ObjectFromPyList(PyMOLGlobals * G, PyObject * list, CObject * I); | | int ObjectFromPyList(PyMOLGlobals * G, PyObject * list, CObject * I); |
| int ObjectGetCurrentState(CObject * I, int ignore_all_states); | | int ObjectGetCurrentState(CObject * I, int ignore_all_states); |
| void ObjectAdjustStateRebuildRange(CObject * I, int *start, int *stop); | | void ObjectAdjustStateRebuildRange(CObject * I, int *start, int *stop); |
| int ObjectMotion(CObject * I, int action, int first, | | int ObjectMotion(CObject * I, int action, int first, |
| int last, float power, float bias, | | int last, float power, float bias, |
| int simple, float linear, int wrap, | | int simple, float linear, int wrap, |
| int hand, int window, int cycles, int state, int quiet); | | int hand, int window, int cycles, int state, int quiet); |
| int ObjectGetSpecLevel(CObject * I, int frame); | | int ObjectGetSpecLevel(CObject * I, int frame); |
| void ObjectMotionTrim(CObject *I, int n_frame); | | void ObjectMotionTrim(CObject *I, int n_frame); |
|
| void ObjectMotionExtend(CObject *I, int n_frame); | | void ObjectDrawViewElem(CObject *I, BlockRect *rect, int frames, CGO *orthoCGO); |
| void ObjectDrawViewElem(CObject *I, BlockRect *rect, int frames ORTHOCGOARG); | | |
| void ObjectStateInit(PyMOLGlobals * G, CObjectState * I); | | void ObjectStateInit(PyMOLGlobals * G, CObjectState * I); |
| void ObjectStateCopy(CObjectState * dst, const CObjectState * src); | | void ObjectStateCopy(CObjectState * dst, const CObjectState * src); |
| void ObjectStatePurge(CObjectState * I); | | void ObjectStatePurge(CObjectState * I); |
| int ObjectStateSetMatrix(CObjectState * I, double *matrix); | | int ObjectStateSetMatrix(CObjectState * I, double *matrix); |
| double *ObjectStateGetMatrix(CObjectState * I); | | double *ObjectStateGetMatrix(CObjectState * I); |
| double *ObjectStateGetInvMatrix(CObjectState * I); | | double *ObjectStateGetInvMatrix(CObjectState * I); |
| void ObjectStateTransformMatrix(CObjectState * I, double *matrix); | | void ObjectStateTransformMatrix(CObjectState * I, double *matrix); |
| void ObjectStateResetMatrix(CObjectState * I); | | void ObjectStateResetMatrix(CObjectState * I); |
| PyObject *ObjectStateAsPyList(CObjectState * I); | | PyObject *ObjectStateAsPyList(CObjectState * I); |
| int ObjectStateFromPyList(PyMOLGlobals * G, PyObject * list, CObjectState * I); | | int ObjectStateFromPyList(PyMOLGlobals * G, PyObject * list, CObjectState * I); |
| | | |
| End of changes. 3 change blocks. |
|---|
| 18 lines changed or deleted | | 17 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 