"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Scene.h" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.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.

Scene.h  (pymol-open-source-2.2.0)	:	Scene.h  (pymol-open-source-2.3.0)
skipping to change at line 71		skipping to change at line 71
int SceneCountFrames(PyMOLGlobals * G);		int SceneCountFrames(PyMOLGlobals * G);
int SceneGetNFrame(PyMOLGlobals * G, int *has_movie);		int SceneGetNFrame(PyMOLGlobals * G, int *has_movie);
void SceneSetMatrix(PyMOLGlobals * G, float *);		void SceneSetMatrix(PyMOLGlobals * G, float *);
float *SceneGetMatrix(PyMOLGlobals * G);		float *SceneGetMatrix(PyMOLGlobals * G);
#define SceneGetModMatrix SceneGetModelViewMatrix		#define SceneGetModMatrix SceneGetModelViewMatrix
float *SceneGetPmvMatrix(PyMOLGlobals * G);		float *SceneGetPmvMatrix(PyMOLGlobals * G);
void SceneReshape(Block * block, int width, int height);		float SceneGetScreenVertexScale(PyMOLGlobals * G, const float *v1);
float SceneGetScreenVertexScale(PyMOLGlobals * G, float *v1);		bool SceneGetVisible(PyMOLGlobals * G, const float *v1);
short SceneGetVisible(PyMOLGlobals * G, float *v1);		float SceneGetDepth(PyMOLGlobals * G, const float *v1);
float SceneGetDepth(PyMOLGlobals * G, float *v1);		float SceneGetRawDepth(PyMOLGlobals * G, const float *v1);
float SceneGetRawDepth(PyMOLGlobals * G, float *v1);
void SceneTest(PyMOLGlobals * G);
void SceneIdle(PyMOLGlobals * G);		void SceneIdle(PyMOLGlobals * G);
void SceneFree(PyMOLGlobals * G);		void SceneFree(PyMOLGlobals * G);
int SceneGetDrawFlagGrid(PyMOLGlobals * G, GridInfo * grid, int slot);		int SceneGetDrawFlagGrid(PyMOLGlobals * G, GridInfo * grid, int slot);
int SceneDeferRay(PyMOLGlobals * G,		int SceneDeferRay(PyMOLGlobals * G,
int ray_width,		int ray_width,
int ray_height,		int ray_height,
int mode,		int mode,
float angle, float shift, int quiet, int show_timing, int anti alias);		float angle, float shift, int quiet, int show_timing, int anti alias);
int SceneMakeMovieImage(PyMOLGlobals * G,		int SceneMakeMovieImage(PyMOLGlobals * G,
int show_timing, int validate, int mode,		int show_timing, int validate, int mode,
int width=0, int height=0);		int width=0, int height=0);
int SceneValidateImageMode(PyMOLGlobals * G, int mode, bool defaultdraw);		int SceneValidateImageMode(PyMOLGlobals * G, int mode, bool defaultdraw);
int ScenePNG(PyMOLGlobals * G, char *png, float dpi, int quiet,		bool ScenePNG(PyMOLGlobals * G, const char *png, float dpi, int quiet,
int prior_only, int format);		int prior_only, int format);
int SceneCopyExternal(PyMOLGlobals * G, int width, int height, int rowbytes,		int SceneCopyExternal(PyMOLGlobals * G, int width, int height, int rowbytes,
unsigned char *dest, int mode);		unsigned char *dest, int mode);
void SceneResetMatrix(PyMOLGlobals * G);		void SceneResetMatrix(PyMOLGlobals * G);
void SceneRestartFrameTimer(PyMOLGlobals * G);		void SceneRestartFrameTimer(PyMOLGlobals * G);
void SceneGetEyeNormal(PyMOLGlobals * G, float *v1, float *normal);		void SceneGetEyeNormal(PyMOLGlobals * G, float *v1, float *normal);
void SceneRotate(PyMOLGlobals * G, float angle, float x, float y, float z);		void SceneRotate(PyMOLGlobals * G, float angle, float x, float y, float z);
void SceneTranslate(PyMOLGlobals * G, float x, float y, float z);		void SceneTranslate(PyMOLGlobals * G, float x, float y, float z);
void SceneTranslateScaled(PyMOLGlobals * G, float x, float y, float z, int sdof_ mode);		void SceneTranslateScaled(PyMOLGlobals * G, float x, float y, float z, int sdof_ mode);
void SceneRotateScaled(PyMOLGlobals * G, float rx, float ry, float rz, int sdof_ mode);		void SceneRotateScaled(PyMOLGlobals * G, float rx, float ry, float rz, int sdof_ mode);
void SceneClip(PyMOLGlobals * G, int plane, float movement, const char *sele, in t state);		void SceneClip(PyMOLGlobals * G, int plane, float movement, const char *sele, in t state);
void SceneGetImageSize(PyMOLGlobals * G, int *width, int *height);		std::pair<int, int> SceneGetImageSize(PyMOLGlobals * G);
float SceneGetGridAspectRatio(PyMOLGlobals * G);		float SceneGetGridAspectRatio(PyMOLGlobals * G);
void SceneScale(PyMOLGlobals * G, float scale);		void SceneScale(PyMOLGlobals * G, float scale);
void SceneResetNormalCGO(PyMOLGlobals * G, CGO *cgo, int lines);		void SceneResetNormalCGO(PyMOLGlobals * G, CGO *cgo, int lines);
void SceneResetNormal(PyMOLGlobals * G, int lines);		void SceneResetNormal(PyMOLGlobals * G, int lines);
void SceneResetNormalUseShader(PyMOLGlobals * G, int lines, short use_shader);		void SceneResetNormalUseShader(PyMOLGlobals * G, int lines, short use_shader);
void SceneResetNormalToViewVector(PyMOLGlobals * G, short use_shader);		void SceneResetNormalToViewVector(PyMOLGlobals * G, short use_shader);
void SceneResetNormalUseShaderAttribute(PyMOLGlobals * G, int lines, short use_s hader, int attr);		void SceneResetNormalUseShaderAttribute(PyMOLGlobals * G, int lines, short use_s hader, int attr);
void SceneGetResetNormal(PyMOLGlobals * G, float *normal, int lines);		void SceneGetResetNormal(PyMOLGlobals * G, float *normal, int lines);
int SceneObjectAdd(PyMOLGlobals * G, CObject * obj);		int SceneObjectAdd(PyMOLGlobals * G, CObject * obj);
int SceneObjectDel(PyMOLGlobals * G, CObject * obj, int allow_purge);		int SceneObjectDel(PyMOLGlobals * G, CObject * obj, int allow_purge);
int SceneObjectIsActive(PyMOLGlobals * G, CObject * obj);		int SceneObjectIsActive(PyMOLGlobals * G, CObject * obj);
void SceneOriginSet(PyMOLGlobals * G, float *origin, int preserve);		void SceneOriginSet(PyMOLGlobals * G, const float *origin, int preserve);
void SceneOriginGet(PyMOLGlobals * G, float *origin);		void SceneOriginGet(PyMOLGlobals * G, float *origin);
void SceneWindowSphere(PyMOLGlobals * G, float *location, float radius);		void SceneWindowSphere(PyMOLGlobals * G, const float *location, float radius);
void SceneRelocate(PyMOLGlobals * G, float *location);		void SceneRelocate(PyMOLGlobals * G, const float *location);
Block *SceneGetBlock(PyMOLGlobals * G);		Block *SceneGetBlock(PyMOLGlobals * G);
void SceneApplyMatrix(PyMOLGlobals * G, float *m);		void SceneApplyMatrix(PyMOLGlobals * G, float *m);
void SceneSetStereo(PyMOLGlobals * G, int flag);		void SceneSetStereo(PyMOLGlobals * G, int flag);
int SceneGetStereo(PyMOLGlobals * G);		int SceneGetStereo(PyMOLGlobals * G);
void SceneDontCopyNext(PyMOLGlobals * G);		void SceneDontCopyNext(PyMOLGlobals * G);
void ScenePrepareExit(PyMOLGlobals * G);
void SceneGetViewNormal(PyMOLGlobals * G, float *v);		void SceneGetViewNormal(PyMOLGlobals * G, float *v);
void SceneClipSet(PyMOLGlobals * G, float front, float back);		void SceneClipSet(PyMOLGlobals * G, float front, float back);
void SceneGetView(PyMOLGlobals * G, SceneViewType view);		void SceneGetView(PyMOLGlobals * G, SceneViewType view);
void SceneSetView(PyMOLGlobals * G, SceneViewType view,		void SceneSetView(PyMOLGlobals * G, SceneViewType view,
int quiet, float animate, int hand);		int quiet, float animate, int hand);
void SceneRestartSweepTimer(PyMOLGlobals * G);		void SceneRestartSweepTimer(PyMOLGlobals * G);
int SceneViewEqual(SceneViewType left, SceneViewType right);		int SceneViewEqual(SceneViewType left, SceneViewType right);
void SceneToViewElem(PyMOLGlobals * G, CViewElem * elem, const char *scene_name) ;		void SceneToViewElem(PyMOLGlobals * G, CViewElem * elem, const char *scene_name) ;
void SceneFromViewElem(PyMOLGlobals * G, CViewElem * elem, int dirty);		void SceneFromViewElem(PyMOLGlobals * G, CViewElem * elem, int dirty);
void SceneGetCenter(PyMOLGlobals * G, float *pos);		void SceneGetCenter(PyMOLGlobals * G, float *pos);
skipping to change at line 157		skipping to change at line 154
void SceneSetCardInfo(PyMOLGlobals * G, const char *vendor, const char *renderer , const char *version);		void SceneSetCardInfo(PyMOLGlobals * G, const char *vendor, const char *renderer , const char *version);
void SceneGetCardInfo(PyMOLGlobals * G, char **vendor, char **renderer, char **v ersion);		void SceneGetCardInfo(PyMOLGlobals * G, char **vendor, char **renderer, char **v ersion);
int SceneLoadPNG(PyMOLGlobals * G, const char *fname, int movie_flag, int stereo , int quiet);		int SceneLoadPNG(PyMOLGlobals * G, const char *fname, int movie_flag, int stereo , int quiet);
void SceneSetDefaultView(PyMOLGlobals * G);		void SceneSetDefaultView(PyMOLGlobals * G);
void SceneRovingDirty(PyMOLGlobals * G);		void SceneRovingDirty(PyMOLGlobals * G);
int SceneRovingCheckDirty(PyMOLGlobals * G);		int SceneRovingCheckDirty(PyMOLGlobals * G);
void SceneRovingUpdate(PyMOLGlobals * G);		void SceneRovingUpdate(PyMOLGlobals * G);
void SceneRovingChanged(PyMOLGlobals * G);		void SceneRovingChanged(PyMOLGlobals * G);
void SceneRovingPostpone(PyMOLGlobals * G);		void SceneRovingPostpone(PyMOLGlobals * G);
void SceneCleanupStereo(PyMOLGlobals * G);
int SceneReinitialize(PyMOLGlobals * G);		int SceneReinitialize(PyMOLGlobals * G);
void SceneUpdateStereoMode(PyMOLGlobals * G);		void SceneUpdateStereoMode(PyMOLGlobals * G);
void SceneSuppressMovieFrame(PyMOLGlobals * G);		void SceneSuppressMovieFrame(PyMOLGlobals * G);
int SceneDeferClick(Block * block, int button, int x, int y, int mod);		int SceneDeferClick(Block * block, int button, int x, int y, int mod);
int SceneDeferRelease(Block * block, int button, int x, int y, int mod);
int SceneDeferDrag(Block * block, int x, int y, int mod);		int SceneDeferDrag(Block * block, int x, int y, int mod);
int SceneDeferImage(PyMOLGlobals * G, int width, int height, const char *filenam e,		int SceneDeferImage(PyMOLGlobals * G, int width, int height, const char *filenam e,
int antialias, float dpi, int format, int quiet);		int antialias, float dpi, int format, int quiet);
char *SceneGetSeleModeKeyword(PyMOLGlobals * G);		const char *SceneGetSeleModeKeyword(PyMOLGlobals * G);
void SceneUpdateStereo(PyMOLGlobals * G);		void SceneUpdateStereo(PyMOLGlobals * G);
float ScenePushRasterMatrix(PyMOLGlobals * G, float *v);		float ScenePushRasterMatrix(PyMOLGlobals * G, float *v);
void ScenePopRasterMatrix(PyMOLGlobals * G);		void ScenePopRasterMatrix(PyMOLGlobals * G);
void ScenePrimeAnimation(PyMOLGlobals * G);		void ScenePrimeAnimation(PyMOLGlobals * G);
void SceneLoadAnimation(PyMOLGlobals * G, double duration, int hand);		void SceneLoadAnimation(PyMOLGlobals * G, double duration, int hand);
int SceneMustDrawBoth(PyMOLGlobals * G);		int SceneMustDrawBoth(PyMOLGlobals * G);
float SceneGetReflectScaleValue(PyMOLGlobals * G, int limit = 8);		float SceneGetReflectScaleValue(PyMOLGlobals * G, int limit = 8);
float SceneGetSpecularValue(PyMOLGlobals * G, float spec, int limit = 8);		float SceneGetSpecularValue(PyMOLGlobals * G, float spec, int limit = 8);
void SceneGetAdjustedLightValues(PyMOLGlobals * G,		void SceneGetAdjustedLightValues(PyMOLGlobals * G,
skipping to change at line 255		skipping to change at line 250
void ScenePrepareUnitContext(SceneUnitContext * context, int width, int height);		void ScenePrepareUnitContext(SceneUnitContext * context, int width, int height);
float GetFovWidth(PyMOLGlobals * G);		float GetFovWidth(PyMOLGlobals * G);
void ScenePrepareMatrix(PyMOLGlobals * G, int mode);		void ScenePrepareMatrix(PyMOLGlobals * G, int mode);
void SceneCopy(PyMOLGlobals * G, GLenum buffer, int force, int entire_window);		void SceneCopy(PyMOLGlobals * G, GLenum buffer, int force, int entire_window);
void SceneInvalidatePicking(PyMOLGlobals * G);		void SceneInvalidatePicking(PyMOLGlobals * G);
unsigned char *SceneImagePrepare(PyMOLGlobals * G, int prior_only, int noinvalid		pymol::Image* SceneImagePrepare(PyMOLGlobals * G, bool prior_only);
=0);
void SceneImageFinish(PyMOLGlobals * G, GLvoid *image);
#endif		#endif
End of changes. 11 change blocks.
18 lines changed or deleted		11 lines changed or added

---