"Fossies" - the Fresh Open Source Software Archive  

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

RepNonbonded.cpp  (pymol-open-source-2.2.0)	:	RepNonbonded.cpp  (pymol-open-source-2.3.0)
skipping to change at line 41		skipping to change at line 41
typedef struct RepNonbonded {		typedef struct RepNonbonded {
Rep R;		Rep R;
CGO *primitiveCGO;		CGO *primitiveCGO;
CGO *shaderCGO;		CGO *shaderCGO;
bool shaderCGO_has_cylinders;		bool shaderCGO_has_cylinders;
} RepNonbonded;		} RepNonbonded;
#include"ObjectMolecule.h"		#include"ObjectMolecule.h"
void RepNonbondedFree(RepNonbonded * I);		static
void RepNonbondedFree(RepNonbonded * I)		void RepNonbondedFree(RepNonbonded * I)
{		{
CGOFree(I->primitiveCGO);		CGOFree(I->primitiveCGO);
CGOFree(I->shaderCGO);		CGOFree(I->shaderCGO);
RepPurge(&I->R);		RepPurge(&I->R);
OOFreeP(I);		OOFreeP(I);
}		}
void RepNonbondedRenderImmediate(CoordSet * cs, RenderInfo * info)		void RepNonbondedRenderImmediate(CoordSet * cs, RenderInfo * info)
{		{
skipping to change at line 194		skipping to change at line 193
I->shaderCGO = convertcgo;		I->shaderCGO = convertcgo;
I->shaderCGO->use_shader = use_shader;		I->shaderCGO->use_shader = use_shader;
convertcgo = NULL;		convertcgo = NULL;
}		}
return ok;		return ok;
}		}
static void RepNonbondedRender(RepNonbonded * I, RenderInfo * info)		static void RepNonbondedRender(RepNonbonded * 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;
int ok = true;		int ok = true;
float alpha =		float alpha =
SettingGet_f(G, I->R.cs->Setting, I->R.obj->Setting, cSetting_nonbonded_tran sparency);		SettingGet_f(G, I->R.cs->Setting, I->R.obj->Setting, cSetting_nonbonded_tran sparency);
alpha = 1.0F - alpha;		alpha = 1.0F - alpha;
if(fabs(alpha - 1.0) < R_SMALL4)		if(fabs(alpha - 1.0) < R_SMALL4)
alpha = 1.0F;		alpha = 1.0F;
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. cs->Obj->Obj.Setting);		CGORenderRay(I->primitiveCGO, ray, info, NULL, NULL, I->R.cs->Setting, I->R. cs->Obj->Obj.Setting);
End of changes. 2 change blocks.
3 lines changed or deleted		2 lines changed or added

---