"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer2/RepNonbondedSphere.cpp" 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.

RepNonbondedSphere.cpp  (pymol-open-source-2.2.0)	:	RepNonbondedSphere.cpp  (pymol-open-source-2.3.0)
skipping to change at line 41		skipping to change at line 41
#include"Scene.h"		#include"Scene.h"
#include"CGO.h"		#include"CGO.h"
typedef struct RepNonbondedSphere {		typedef struct RepNonbondedSphere {
Rep R;		Rep R;
CGO *shaderCGO, *primitiveCGO;		CGO *shaderCGO, *primitiveCGO;
} RepNonbondedSphere;		} RepNonbondedSphere;
#include"ObjectMolecule.h"		#include"ObjectMolecule.h"
void RepNonbondedSphereFree(RepNonbondedSphere * I);		static
void RepNonbondedSphereInit(void)
{
}
void RepNonbondedSphereFree(RepNonbondedSphere * I)		void RepNonbondedSphereFree(RepNonbondedSphere * I)
{		{
if (I->shaderCGO){		if (I->shaderCGO){
CGOFree(I->shaderCGO);		CGOFree(I->shaderCGO);
I->shaderCGO = 0;		I->shaderCGO = 0;
}		}
if (I->primitiveCGO){		if (I->primitiveCGO){
CGOFree(I->primitiveCGO);		CGOFree(I->primitiveCGO);
I->primitiveCGO = 0;		I->primitiveCGO = 0;
}		}
RepPurge(&I->R);		RepPurge(&I->R);
OOFreeP(I);		OOFreeP(I);
}		}
static void RepNonbondedSphereRender(RepNonbondedSphere * I, RenderInfo * info)		static void RepNonbondedSphereRender(RepNonbondedSphere * I, RenderInfo * info)
{		{
CRay *ray = info->ray;		CRay *ray = info->ray;
Picking **pick = info->pick;		auto pick = info->pick;
PyMOLGlobals *G = I->R.G;		PyMOLGlobals *G = I->R.G;
if(ray) {		if(ray) {
#ifndef _PYMOL_NO_RAY		#ifndef _PYMOL_NO_RAY
CGORenderRay(I->primitiveCGO, ray, info, NULL, NULL, I->R.cs->Setting, I->R. obj->Setting);		CGORenderRay(I->primitiveCGO, ray, info, NULL, NULL, I->R.cs->Setting, I->R. obj->Setting);
#endif		#endif
} else if(G->HaveGUI && G->ValidContext) {		} else if(G->HaveGUI && G->ValidContext) {
if(pick) {		if(pick) {
if (I->shaderCGO){		if (I->shaderCGO){
CGORenderGLPicking(I->shaderCGO, info, &I->R.context, I->R.cs->Setting, I ->R.obj->Setting);		CGORenderGLPicking(I->shaderCGO, info, &I->R.context, I->R.cs->Setting, I ->R.obj->Setting);
End of changes. 2 change blocks.
7 lines changed or deleted		2 lines changed or added

---