"Fossies" - the Fresh Open Source Software Archive  

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

RepEllipsoid.cpp  (pymol-v2.1.0.tar.bz2)	:	RepEllipsoid.cpp  (pymol-open-source-2.2.0)
skipping to change at line 63		skipping to change at line 63
Picking **pick = info->pick;		Picking **pick = info->pick;
int ok = true;		int ok = true;
PyMOLGlobals *G = I->R.G;		PyMOLGlobals *G = I->R.G;
if(ray) {		if(ray) {
int try_std = false;		int try_std = false;
PRINTFD(G, FB_RepEllipsoid)		PRINTFD(G, FB_RepEllipsoid)
" RepEllipsoidRender: rendering ray...\n" ENDFD;		" RepEllipsoidRender: rendering ray...\n" ENDFD;
if(I->ray){		if(I->ray){
int rayok = CGORenderRay(I->ray, ray, NULL, I->R.cs->Setting, I->R.obj->Se tting);		int rayok = CGORenderRay(I->ray, ray, info, NULL, NULL, I->R.cs->Setting, I->R.obj->Setting);
if (!rayok){		if (!rayok){
CGOFree(I->ray);		CGOFree(I->ray);
try_std = true;		try_std = true;
}		}
} else {		} else {
try_std = true;		try_std = true;
}		}
if(try_std && I->std){		if(try_std && I->std){
ok &= CGORenderRay(I->std, ray, NULL, I->R.cs->Setting, I->R.obj->Setting) ;		ok &= CGORenderRay(I->std, ray, info, NULL, NULL, I->R.cs->Setting, I->R.o bj->Setting);
if (!ok){		if (!ok){
CGOFree(I->std);		CGOFree(I->std);
}		}
}		}
CHECKOK(ok, I->std);		CHECKOK(ok, I->std);
} else if(G->HaveGUI && G->ValidContext) {		} else if(G->HaveGUI && G->ValidContext) {
if(pick) {		if(pick) {
if(I->std) {		if(I->shaderCGO) {
CGORenderGLPicking(I->std, pick, &I->R.context,		CGORenderGLPicking(I->shaderCGO, info, &I->R.context,
		I->R.cs->Setting, I->R.obj->Setting);
		} else if(I->std) {
		CGORenderGLPicking(I->std, info, &I->R.context,
I->R.cs->Setting, I->R.obj->Setting);		I->R.cs->Setting, I->R.obj->Setting);
}		}
} else {		} else {
int use_shaders;		int use_shaders;
use_shaders = SettingGetGlobal_b(G, cSetting_use_shaders);		use_shaders = SettingGetGlobal_b(G, cSetting_use_shaders);
PRINTFD(G, FB_RepEllipsoid)		PRINTFD(G, FB_RepEllipsoid)
" RepEllipsoidRender: rendering GL...\n" ENDFD;		" RepEllipsoidRender: rendering GL...\n" ENDFD;
if (use_shaders){		if (use_shaders){
if (!I->shaderCGO){		if (!I->shaderCGO){
CGO *convertcgo = NULL;		CGO *convertcgo = NULL;
convertcgo = CGOCombineBeginEnd(I->std, 0);		convertcgo = CGOCombineBeginEnd(I->std, 0);
I->shaderCGO = CGOOptimizeToVBONotIndexed(convertcgo, 0);		I->shaderCGO = CGOOptimizeToVBONotIndexed(convertcgo, 0);
I->shaderCGO->use_shader = true;		I->shaderCGO->use_shader = true;
I->shaderCGO->enable_shaders = true;
CGOFree(convertcgo);		CGOFree(convertcgo);
}		}
} else {		} else {
CGOFree(I->shaderCGO);		CGOFree(I->shaderCGO);
}		}
if (I->shaderCGO){		if (I->shaderCGO){
CGORenderGL(I->shaderCGO, NULL, I->R.cs->Setting, I->R.obj->Setting, i nfo, &I->R);		CGORenderGL(I->shaderCGO, NULL, I->R.cs->Setting, I->R.obj->Setting, i nfo, &I->R);
} else if(I->std){		} else if(I->std){
CGORenderGL(I->std, NULL, I->R.cs->Setting, I->R.obj->Setting, info, & I->R);		CGORenderGL(I->std, NULL, I->R.cs->Setting, I->R.obj->Setting, info, & I->R);
}		}
End of changes. 4 change blocks.
5 lines changed or deleted		7 lines changed or added

---