RepEllipsoid.cpp (pymol-open-source-2.2.0) | : | RepEllipsoid.cpp (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 39 | skipping to change at line 39 | |||
#include"Matrix.h" | #include"Matrix.h" | |||
#include"CGO.h" | #include"CGO.h" | |||
typedef struct RepEllipsoid { | typedef struct RepEllipsoid { | |||
Rep R; /* must be first! */ | Rep R; /* must be first! */ | |||
CGO *ray, *std, *shaderCGO; | CGO *ray, *std, *shaderCGO; | |||
} RepEllipsoid; | } RepEllipsoid; | |||
#include"ObjectMolecule.h" | #include"ObjectMolecule.h" | |||
void RepEllipsoidFree(RepEllipsoid * I); | static | |||
void RepEllipsoidFree(RepEllipsoid * I) | void RepEllipsoidFree(RepEllipsoid * I) | |||
{ | { | |||
CGOFree(I->ray); | CGOFree(I->ray); | |||
CGOFree(I->std); | CGOFree(I->std); | |||
CGOFree(I->shaderCGO); | CGOFree(I->shaderCGO); | |||
RepPurge(&I->R); | RepPurge(&I->R); | |||
OOFreeP(I); | OOFreeP(I); | |||
} | } | |||
static void RepEllipsoidRender(RepEllipsoid * I, RenderInfo * info) | static void RepEllipsoidRender(RepEllipsoid * I, RenderInfo * info) | |||
{ | { | |||
CRay *ray = info->ray; | CRay *ray = info->ray; | |||
Picking **pick = info->pick; | auto 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, info, NULL, NULL, I->R.cs->Setting, I->R.obj->Setting); | int rayok = CGORenderRay(I->ray, ray, info, NULL, NULL, I->R.cs->Setting, I->R.obj->Setting); | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |