RepDistDash.cpp (pymol-open-source-2.2.0) | : | RepDistDash.cpp (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 51 | skipping to change at line 51 | |||
int N; | int N; | |||
CObject *Obj; | CObject *Obj; | |||
DistSet *ds; | DistSet *ds; | |||
float linewidth, radius; | float linewidth, radius; | |||
CGO *shaderCGO; | CGO *shaderCGO; | |||
bool shaderCGO_has_cylinders, shaderCGO_has_trilines; | bool shaderCGO_has_cylinders, shaderCGO_has_trilines; | |||
} RepDistDash; | } RepDistDash; | |||
#include"ObjectDist.h" | #include"ObjectDist.h" | |||
void RepDistDashFree(RepDistDash * I); | static | |||
void RepDistDashFree(RepDistDash * I) | void RepDistDashFree(RepDistDash * I) | |||
{ | { | |||
if (I->shaderCGO){ | if (I->shaderCGO){ | |||
CGOFree(I->shaderCGO); | CGOFree(I->shaderCGO); | |||
I->shaderCGO = 0; | I->shaderCGO = 0; | |||
} | } | |||
VLAFreeP(I->V); | VLAFreeP(I->V); | |||
RepPurge(&I->R); | RepPurge(&I->R); | |||
OOFreeP(I); | OOFreeP(I); | |||
} | } | |||
skipping to change at line 120 | skipping to change at line 119 | |||
c -= 2; | c -= 2; | |||
} | } | |||
if (ok) | if (ok) | |||
ok &= CGOEnd(I->shaderCGO); | ok &= CGOEnd(I->shaderCGO); | |||
} | } | |||
} | } | |||
static void RepDistDashRender(RepDistDash * I, RenderInfo * info) | static void RepDistDashRender(RepDistDash * 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; | |||
float *v = I->V; | float *v = I->V; | |||
int c = I->N; | int c = I->N; | |||
const float *vc; | const float *vc; | |||
int round_ends; | int round_ends; | |||
int ok = true; | int ok = true; | |||
int color = | int color = | |||
SettingGet_color(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_color); | SettingGet_color(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_color); | |||
float line_width = | float line_width = | |||
SettingGet_f(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_width); | SettingGet_f(G, NULL, I->ds->Obj->Obj.Setting, cSetting_dash_width); | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |