"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Text.h" between
pymol-v2.1.0.tar.bz2 and pymol-open-source-2.2.0.tar.gz

About: PyMOL 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.

Text.h  (pymol-v2.1.0.tar.bz2)	:	Text.h  (pymol-open-source-2.2.0)
skipping to change at line 77		skipping to change at line 77
#define cTextSrcGeneral 0		#define cTextSrcGeneral 0
#define cTextSrcGLUT 1		#define cTextSrcGLUT 1
#define cTextSrcFreeType 2		#define cTextSrcFreeType 2
int TextInit(PyMOLGlobals * G);		int TextInit(PyMOLGlobals * G);
int TextGetFontID(PyMOLGlobals * G, int src, int code, const char *name, int siz e_mode,		int TextGetFontID(PyMOLGlobals * G, int src, int code, const char *name, int siz e_mode,
int style);		int style);
void TextFree(PyMOLGlobals * G);		void TextFree(PyMOLGlobals * G);
void TextSetLabPos(PyMOLGlobals * G, float *pos, LabPosType * labpos, const char *text);		void TextSetLabPos(PyMOLGlobals * G, const float *pos, const LabPosType * labpos , const char *text);
void TextSetPickColor(PyMOLGlobals * G, int index, int pass);		void TextSetPickColor(PyMOLGlobals * G, int index, int pass);
		void TextSetColorFromUColor(PyMOLGlobals * G);
void TextSetWorldPos(PyMOLGlobals * G, float *pos);		void TextSetWorldPos(PyMOLGlobals * G, const float *pos);
float *TextGetWorldPos(PyMOLGlobals * G);		float *TextGetWorldPos(PyMOLGlobals * G);
void TextSetScreenWorldOffset(PyMOLGlobals * G, float *pos);		void TextSetLabelPushPos(PyMOLGlobals * G, const float *pos);
		float *TextGetLabelPushPos(PyMOLGlobals * G);
		void TextSetLabelPos(PyMOLGlobals * G, const float *pos);
		float *TextGetLabelPos(PyMOLGlobals * G);
		void TextSetLabelPosIsSet(PyMOLGlobals * G, unsigned char isSet);
		unsigned char TextGetLabelPosIsSet(PyMOLGlobals * G);
		void TextSetScreenWorldOffset(PyMOLGlobals * G, const float *pos);
float *TextGetScreenWorldOffset(PyMOLGlobals * G);		float *TextGetScreenWorldOffset(PyMOLGlobals * G);
void TextSetPos(PyMOLGlobals * G, float *pos);		void TextSetTargetPos(PyMOLGlobals * G, const float *pos);
		float *TextGetTargetPos(PyMOLGlobals * G);
void TextSetColor(PyMOLGlobals * G, float *color);		float TextGetWidth(PyMOLGlobals * G);
		float TextGetHeight(PyMOLGlobals * G);
		void TextSetWidth(PyMOLGlobals * G, float text_width);
		void TextSetHeight(PyMOLGlobals * G, float text_height);
		void TextSetIndentFactorX(PyMOLGlobals * G, float factor);
		void TextSetIndentFactorY(PyMOLGlobals * G, float factor);
		float *TextGetIndentFactor(PyMOLGlobals * G);
		void TextSetPos(PyMOLGlobals * G, const float *pos);
		void TextSetColor(PyMOLGlobals * G, const float *color);
void TextSetColor3f(PyMOLGlobals * G, float red, float green, float blue);		void TextSetColor3f(PyMOLGlobals * G, float red, float green, float blue);
void TextGetOutlineColor(PyMOLGlobals * G,		void TextGetOutlineColor(PyMOLGlobals * G,
unsigned char *red,		unsigned char *red,
unsigned char *green, unsigned char *blue, unsigned cha r *alpha);		unsigned char *green, unsigned char *blue, unsigned cha r *alpha);
void TextSetOutlineColor(PyMOLGlobals * G, int color);		void TextSetOutlineColor(PyMOLGlobals * G, int color);
void TextSetPosNColor(PyMOLGlobals * G, float *pos, float *color);		void TextSetPosNColor(PyMOLGlobals * G, const float *pos, const float *color);
float *TextGetColor(PyMOLGlobals * G);		float *TextGetColor(PyMOLGlobals * G);
float *TextGetPos(PyMOLGlobals * G);		float *TextGetPos(PyMOLGlobals * G);
void TextGetColorUChar(PyMOLGlobals * G, unsigned char *red,		void TextGetColorUChar(PyMOLGlobals * G, unsigned char *red,
unsigned char *green, unsigned char *blue, unsigned char *alpha);		unsigned char *green, unsigned char *blue, unsigned char *alpha);
		unsigned char *TextGetColorUChar4uv(PyMOLGlobals * G);
const char *TextRenderOpenGL(PyMOLGlobals * G, RenderInfo * info, int text_id, c onst char *st,		const char *TextRenderOpenGL(PyMOLGlobals * G, RenderInfo * info, int text_id, c onst char *st,
float size, float *rpos, CGO *shaderCGO);		float size, float *rpos, short needSize, short relativeMo de, short shouldRender, CGO *shaderCGO);
const char *TextRenderRay(PyMOLGlobals * G, CRay * ray, int text_id, const char *st, float size,		const char *TextRenderRay(PyMOLGlobals * G, CRay * ray, int text_id, const char *st, float size,
float *rpos);		float *rpos, short needSize, short relativeMode);
void TextDrawStrAt(PyMOLGlobals * G, const char *st, int x, int y ORTHOCGOARG);		void TextDrawStrAt(PyMOLGlobals * G, const char *st, int x, int y ORTHOCGOARG);
void TextDrawStr(PyMOLGlobals * G, const char *st ORTHOCGOARG);		void TextDrawStr(PyMOLGlobals * G, const char *st ORTHOCGOARG);
void TextIndent(PyMOLGlobals * G, float x, float y);		void TextIndent(PyMOLGlobals * G, float x, float y);
void TextAdvance(PyMOLGlobals * G, float advance);		void TextAdvance(PyMOLGlobals * G, float advance);
void TextSetPos2i(PyMOLGlobals * G, int x, int y);		void TextSetPos2i(PyMOLGlobals * G, int x, int y);
void TextDrawChar(PyMOLGlobals * G, char ch ORTHOCGOARG);		void TextDrawChar(PyMOLGlobals * G, char ch ORTHOCGOARG);
void TextDrawSubStrFast(PyMOLGlobals * G, const char *c, int x, int y, int start , int n ORTHOCGOARG);		void TextDrawSubStrFast(PyMOLGlobals * G, const char *c, int x, int y, int start , int n ORTHOCGOARG);
void TextDrawCharRepeat(PyMOLGlobals * G, char c, int x, int y, int start, int n ORTHOCGOARG);		void TextDrawCharRepeat(PyMOLGlobals * G, char c, int x, int y, int start, int n ORTHOCGOARG);
		void TextSetLabelBkgrdInfo(PyMOLGlobals * G, float label_spacing, float label_ju
		st, const float *buff);
		float TextGetSpacing(PyMOLGlobals * G);
		float TextGetJustification(PyMOLGlobals * G);
		float *TextGetLabelBuffer(PyMOLGlobals * G);
		void TextSetIsPicking(PyMOLGlobals * G, bool IsPicking);
		bool TextGetIsPicking(PyMOLGlobals * G);
		bool TextStartsWithColorCode(const char *);
		bool TextSetColorFromCode(PyMOLGlobals *, const char *, const float *);
#endif		#endif
End of changes. 10 change blocks.
10 lines changed or deleted		38 lines changed or added

---