"Fossies" - the Fresh Open Source Software Archive  

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

RepRibbon.cpp  (pymol-open-source-2.2.0)	:	RepRibbon.cpp  (pymol-open-source-2.3.0)
skipping to change at line 47		skipping to change at line 47
Rep R;		Rep R;
float ribbon_width;		float ribbon_width;
float radius;		float radius;
CGO *shaderCGO;		CGO *shaderCGO;
CGO *primitiveCGO;		CGO *primitiveCGO;
bool shaderCGO_has_cylinders;		bool shaderCGO_has_cylinders;
} RepRibbon;		} RepRibbon;
#include"ObjectMolecule.h"		#include"ObjectMolecule.h"
void RepRibbonFree(RepRibbon * I);		static
void RepRibbonInit(void)
{
}
void RepRibbonFree(RepRibbon * I)		void RepRibbonFree(RepRibbon * I)
{		{
if (I->primitiveCGO){		if (I->primitiveCGO){
CGOFree(I->primitiveCGO);		CGOFree(I->primitiveCGO);
I->primitiveCGO = 0;		I->primitiveCGO = 0;
}		}
if (I->shaderCGO){		if (I->shaderCGO){
CGOFree(I->shaderCGO);		CGOFree(I->shaderCGO);
I->shaderCGO = 0;		I->shaderCGO = 0;
}		}
RepPurge(&I->R);		RepPurge(&I->R);
OOFreeP(I);		OOFreeP(I);
}		}
static void RepRibbonRender(RepRibbon * I, RenderInfo * info)		static void RepRibbonRender(RepRibbon * 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;
short use_shader = SettingGetGlobal_b(G, cSetting_ribbon_use_shader) &&		short use_shader = SettingGetGlobal_b(G, cSetting_ribbon_use_shader) &&
SettingGetGlobal_b(G, cSetting_use_shaders);		SettingGetGlobal_b(G, cSetting_use_shaders);
bool ribbon_as_cylinders = SettingGetGlobal_b(G, cSetting_render_as_cylinders) &&		bool ribbon_as_cylinders = SettingGetGlobal_b(G, cSetting_render_as_cylinders) &&
SettingGetGlobal_b(G, cSetting_ribbon_as_cylinders) ;		SettingGetGlobal_b(G, cSetting_ribbon_as_cylinders) ;
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);
End of changes. 2 change blocks.
7 lines changed or deleted		2 lines changed or added

---