"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer2/RepDistDash.cpp" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

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.

RepDistDash.cpp  (pymol-v1.8.6.0.tar.bz2)	:	RepDistDash.cpp  (pymol-v2.1.0.tar.bz2)
skipping to change at line 71		skipping to change at line 71
{		{
CRay *ray = info->ray;		CRay *ray = info->ray;
Picking **pick = info->pick;		Picking **pick = info->pick;
PyMOLGlobals *G = I->R.G;		PyMOLGlobals *G = I->R.G;
float *v = I->V;		float *v = I->V;
int c = I->N;		int c = I->N;
float *vc;		float *vc;
int round_ends;		int round_ends;
int ok = true;		int ok = true;
int color =		int color =
SettingGet_color(G, I->ds->Setting, I->ds->Obj->Obj.Setting, cSetting_dash_c olor);		SettingGet_color(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_color);
float line_width =		float line_width =
SettingGet_f(G, I->ds->Setting, I->ds->Obj->Obj.Setting, cSetting_dash_width );		SettingGet_f(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_width);
I->radius =		I->radius =
SettingGet_f(G, I->ds->Setting, I->ds->Obj->Obj.Setting, cSetting_dash_radiu s);		SettingGet_f(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_radius);
round_ends =		round_ends =
SettingGet_b(G, I->ds->Setting, I->ds->Obj->Obj.Setting, cSetting_dash_round _ends);		SettingGet_b(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_round_ends);
line_width = SceneGetDynamicLineWidth(info, line_width);		line_width = SceneGetDynamicLineWidth(info, line_width);
if(ray) {		if(ray) {
float radius;		float radius;
if(I->radius <= 0.0F) {		if(I->radius <= 0.0F) {
radius = ray->PixelRadius * line_width / 2.0F;		radius = ray->PixelRadius * line_width / 2.0F;
} else {		} else {
radius = I->radius;		radius = I->radius;
}		}
skipping to change at line 315		skipping to change at line 315
return (NULL);		return (NULL);
}		}
RepInit(G, &I->R);		RepInit(G, &I->R);
I->R.fRender = (void (*)(struct Rep *, RenderInfo *)) RepDistDashRender;		I->R.fRender = (void (*)(struct Rep *, RenderInfo *)) RepDistDashRender;
I->R.fFree = (void (*)(struct Rep *)) RepDistDashFree;		I->R.fFree = (void (*)(struct Rep *)) RepDistDashFree;
I->R.fRecolor = NULL;		I->R.fRecolor = NULL;
I->R.obj = &ds->Obj->Obj;		I->R.obj = &ds->Obj->Obj;
I->R.context.state = state;		I->R.context.state = state;
dash_len = SettingGet_f(G, ds->Setting, ds->Obj->Obj.Setting, cSetting_dash_le		dash_len = SettingGet_f(G, NULL, ds->Obj->Obj.Setting, cSetting_dash_length);
ngth);		dash_gap = SettingGet_f(G, NULL, ds->Obj->Obj.Setting, cSetting_dash_gap);
dash_gap = SettingGet_f(G, ds->Setting, ds->Obj->Obj.Setting, cSetting_dash_ga
p);
dash_sum = dash_len + dash_gap;		dash_sum = dash_len + dash_gap;
if(dash_sum < R_SMALL4)		if(dash_sum < R_SMALL4)
dash_sum = 0.5;		dash_sum = 0.5;
I->shaderCGO = 0;		I->shaderCGO = 0;
I->N = 0;		I->N = 0;
I->V = NULL;		I->V = NULL;
I->R.P = NULL;		I->R.P = NULL;
I->Obj = (CObject *) ds->Obj;		I->Obj = (CObject *) ds->Obj;
I->ds = ds;		I->ds = ds;
End of changes. 5 change blocks.
8 lines changed or deleted		6 lines changed or added

---