RepDot.cpp (pymol-open-source-2.2.0) | : | RepDot.cpp (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
#include"Color.h" | #include"Color.h" | |||
#include"Sphere.h" | #include"Sphere.h" | |||
#include"Map.h" | #include"Map.h" | |||
#include"Setting.h" | #include"Setting.h" | |||
#include"main.h" | #include"main.h" | |||
#include"ObjectMolecule.h" | #include"ObjectMolecule.h" | |||
#include"Scene.h" | #include"Scene.h" | |||
#include"ShaderMgr.h" | #include"ShaderMgr.h" | |||
#include"CGO.h" | #include"CGO.h" | |||
void RepDotFree(RepDot * I); | ||||
static void RepDotRender(RepDot * I, RenderInfo * info); | static void RepDotRender(RepDot * I, RenderInfo * info); | |||
void RepDotInit(void) | static | |||
{ | ||||
} | ||||
void RepDotFree(RepDot * I) | void RepDotFree(RepDot * I) | |||
{ | { | |||
if (I->shaderCGO){ | if (I->shaderCGO){ | |||
CGOFree(I->shaderCGO); | CGOFree(I->shaderCGO); | |||
I->shaderCGO = 0; | I->shaderCGO = 0; | |||
} | } | |||
FreeP(I->VC); | FreeP(I->VC); | |||
FreeP(I->V); | FreeP(I->V); | |||
FreeP(I->T); | FreeP(I->T); | |||
FreeP(I->F); | FreeP(I->F); | |||
skipping to change at line 161 | skipping to change at line 157 | |||
if (ok) | if (ok) | |||
RepDotRender(I, info); | RepDotRender(I, info); | |||
return ok; | return ok; | |||
} | } | |||
static void RepDotRender(RepDot * I, RenderInfo * info) | static void RepDotRender(RepDot * 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; | |||
int cc = 0; | int cc = 0; | |||
int ok = true; | int ok = true; | |||
if(ray) { | if(ray) { | |||
#ifndef _PYMOL_NO_RAY | #ifndef _PYMOL_NO_RAY | |||
float radius; | float radius; | |||
End of changes. 3 change blocks. | ||||
6 lines changed or deleted | 2 lines changed or added |