Font.h (pymol-v2.1.0.tar.bz2) | : | Font.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 44 | skipping to change at line 44 | |||
typedef struct _CFont CFont; | typedef struct _CFont CFont; | |||
#include "os_gl.h" | #include "os_gl.h" | |||
#define SHADERCGOARG , CGO *shaderCGO | #define SHADERCGOARG , CGO *shaderCGO | |||
#define SHADERCGOARGVAR ,shaderCGO | #define SHADERCGOARGVAR ,shaderCGO | |||
#define SHADERCGOARGV shaderCGO | #define SHADERCGOARGV shaderCGO | |||
typedef char *FontRenderOpenGLFn(RenderInfo * info, CFont *, const char *text, f loat size, | typedef char *FontRenderOpenGLFn(RenderInfo * info, CFont *, const char *text, f loat size, | |||
float *rpos SHADERCGOARG); | float *rpos, short needSize, short relativeMode | |||
typedef char *FontRenderRayFn(CRay * ray, CFont *, const char *text, float size, | , short shouldRender SHADERCGOARG); | |||
float *rpos); | typedef char *FontRenderRayFn(CRay * ray, CFont *, const char *text, float size, | |||
float *rpos, short needSize, short relativeMode); | ||||
struct _CFont { | struct _CFont { | |||
PyMOLGlobals *G; | PyMOLGlobals *G; | |||
int TextID; | int TextID; | |||
void (*fFree) (CFont *); | void (*fFree) (CFont *); | |||
FontRenderOpenGLFn *fRenderOpenGL; | FontRenderOpenGLFn *fRenderOpenGL; | |||
FontRenderOpenGLFn *fRenderOpenGLFlat; | FontRenderOpenGLFn *fRenderOpenGLFlat; | |||
FontRenderRayFn *fRenderRay; | FontRenderRayFn *fRenderRay; | |||
}; | }; | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |