Color.h (pymol-open-source-2.2.0) | : | Color.h (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 61 | skipping to change at line 61 | |||
} ColorRec; | } ColorRec; | |||
typedef struct { | typedef struct { | |||
int Name; | int Name; | |||
void *Ptr; | void *Ptr; | |||
int Type; | int Type; | |||
/* not saved */ | /* not saved */ | |||
int old_session_index; | int old_session_index; | |||
} ExtRec; | } ExtRec; | |||
struct _CColor { | struct CColor { | |||
ColorRec *Color; | ColorRec *Color{}; | |||
int NColor; | int NColor{}; | |||
ExtRec *Ext; | ExtRec *Ext{}; | |||
int NExt; | int NExt{}; | |||
int LUTActive; | int LUTActive{}; | |||
unsigned int *ColorTable; | std::vector<unsigned int> ColorTable{}; | |||
float Gamma; | float Gamma = 1.0f; | |||
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[11]; // "0xTTRRGGBB" | char RGBName[11]{}; // "0xTTRRGGBB" | |||
/* not stored */ | /* not stored */ | |||
int HaveOldSessionColors; | int HaveOldSessionColors{}; | |||
int HaveOldSessionExtColors; | int HaveOldSessionExtColors{}; | |||
float Front[3], Back[3]; | float Front[3] { 1.0f, 1.0f, 1.0f }; | |||
float 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); | |||
End of changes. 2 change blocks. | ||||
16 lines changed or deleted | 17 lines changed or added |