Color.h (pymol-v2.1.0.tar.bz2) | : | Color.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 73 | skipping to change at line 73 | |||
int NColor; | int NColor; | |||
ExtRec *Ext; | ExtRec *Ext; | |||
int NExt; | int NExt; | |||
int LUTActive; | int LUTActive; | |||
unsigned int *ColorTable; | unsigned int *ColorTable; | |||
float Gamma; | float Gamma; | |||
int BigEndian; | int BigEndian; | |||
OVLexicon *Lex; | OVLexicon *Lex; | |||
OVOneToOne *Idx; | OVOneToOne *Idx; | |||
float RGBColor[3]; /* save global float for returning (float*) */ | float RGBColor[3]; /* save global float for returning (float*) */ | |||
char RGBName[10]; | char RGBName[11]; // "0xTTRRGGBB" | |||
/* not stored */ | /* not stored */ | |||
int HaveOldSessionColors; | int HaveOldSessionColors; | |||
int HaveOldSessionExtColors; | int HaveOldSessionExtColors; | |||
float Front[3], Back[3]; | float Front[3], Back[3]; | |||
}; | }; | |||
int ColorInit(PyMOLGlobals * G); | int ColorInit(PyMOLGlobals * G); | |||
void ColorFree(PyMOLGlobals * G); | void ColorFree(PyMOLGlobals * G); | |||
int ColorGetNext(PyMOLGlobals * G); | int ColorGetNext(PyMOLGlobals * G); | |||
int ColorGetCurrent(PyMOLGlobals * G); | int ColorGetCurrent(PyMOLGlobals * G); | |||
int ColorGetIndex(PyMOLGlobals * G, const char *name); | int ColorGetIndex(PyMOLGlobals * G, const char *name); | |||
int ColorConvertOldSessionIndex(PyMOLGlobals * G, int index); | int ColorConvertOldSessionIndex(PyMOLGlobals * G, int index); | |||
void ColorUpdateFront(PyMOLGlobals * G, const float *back); | void ColorUpdateFront(PyMOLGlobals * G, const float *back); | |||
void ColorUpdateFrontFromSettings(PyMOLGlobals * G); | void ColorUpdateFrontFromSettings(PyMOLGlobals * G); | |||
float *ColorGet(PyMOLGlobals * G, int index); /* pointer maybe invalid after c | const float *ColorGet(PyMOLGlobals * G, int index); /* pointer maybe invalid a | |||
reating a new color */ | fter creating a new color */ | |||
float *ColorGetRaw(PyMOLGlobals * G, int index); /* pointer maybe invalid | const float *ColorGetRaw(PyMOLGlobals * G, int index); /* pointer maybe i | |||
after creating a new color */ | nvalid after creating a new color */ | |||
float *ColorGetSpecial(PyMOLGlobals * G, int index); | const float *ColorGetSpecial(PyMOLGlobals * G, int index); | |||
float *ColorGetNamed(PyMOLGlobals * G, const char *name); | const float *ColorGetNamed(PyMOLGlobals * G, const char *name); | |||
void ColorDef(PyMOLGlobals * G, const char *name, const float *v, int mode, int quiet); | void ColorDef(PyMOLGlobals * G, const char *name, const float *v, int mode, int quiet); | |||
int ColorGetNColor(PyMOLGlobals * G); | int ColorGetNColor(PyMOLGlobals * G); | |||
char *ColorGetName(PyMOLGlobals * G, int index); | const char *ColorGetName(PyMOLGlobals * G, int index); | |||
int ColorGetStatus(PyMOLGlobals * G, int index); | int ColorGetStatus(PyMOLGlobals * G, int index); | |||
void ColorReset(PyMOLGlobals * G); | void ColorReset(PyMOLGlobals * G); | |||
int ColorGetRamped(PyMOLGlobals * G, int index, const float *vertex, float *colo r, int state); | int ColorGetRamped(PyMOLGlobals * G, int index, const float *vertex, float *colo r, int state); | |||
int ColorCheckRamped(PyMOLGlobals * G, int index); | int ColorCheckRamped(PyMOLGlobals * G, int index); | |||
bool ColorGetCheckRamped(PyMOLGlobals * G, int index, const float *vertex, float *color, int state); | ||||
struct ObjectGadgetRamp *ColorGetRamp(PyMOLGlobals * G, int index); | struct ObjectGadgetRamp *ColorGetRamp(PyMOLGlobals * G, int index); | |||
void ColorRegisterExt(PyMOLGlobals * G, const char *name, void *extPtr, int type ); | void ColorRegisterExt(PyMOLGlobals * G, const char *name, void *extPtr, int type ); | |||
void ColorForgetExt(PyMOLGlobals * G, const char *name); | void ColorForgetExt(PyMOLGlobals * G, const char *name); | |||
PyObject *ColorAsPyList(PyMOLGlobals * G); | PyObject *ColorAsPyList(PyMOLGlobals * G); | |||
int ColorFromPyList(PyMOLGlobals * G, PyObject * list, int partial_restore); | int ColorFromPyList(PyMOLGlobals * G, PyObject * list, int partial_restore); | |||
int ColorExtFromPyList(PyMOLGlobals * G, PyObject * list, int partial_restore); | int ColorExtFromPyList(PyMOLGlobals * G, PyObject * list, int partial_restore); | |||
PyObject *ColorExtAsPyList(PyMOLGlobals * G); | PyObject *ColorExtAsPyList(PyMOLGlobals * G); | |||
int ColorTableLoad(PyMOLGlobals * G, char *fname, float gamma, int quiet); | int ColorTableLoad(PyMOLGlobals * G, const char *fname, float gamma, int quiet); | |||
void ColorUpdateFromLut(PyMOLGlobals * G, int index); | void ColorUpdateFromLut(PyMOLGlobals * G, int index); | |||
int ColorLookupColor(PyMOLGlobals * G, float *color); | int ColorLookupColor(PyMOLGlobals * G, float *color); | |||
void ColorGetBkrdContColor(PyMOLGlobals * G, float *rgb, int invert_flag); | void ColorGetBkrdContColor(PyMOLGlobals * G, float *rgb, int invert_flag); | |||
unsigned int ColorGet32BitWord(PyMOLGlobals * G, float *rgba); | unsigned int ColorGet32BitWord(PyMOLGlobals * G, const float *rgba); | |||
int ColorGetEncoded(PyMOLGlobals * G, int index, float *color); | int ColorGetEncoded(PyMOLGlobals * G, int index, float *color); | |||
int Color3fToInt(PyMOLGlobals * G, float *rgb); | int Color3fToInt(PyMOLGlobals * G, const float *rgb); | |||
#endif | #endif | |||
End of changes. 8 change blocks. | ||||
11 lines changed or deleted | 12 lines changed or added |