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.
| ObjectSurface.cpp (pymol-v1.8.6.0.tar.bz2) | : | ObjectSurface.cpp (pymol-v2.1.0.tar.bz2) |
|---|
| | |
| skipping to change at line 517 | | skipping to change at line 517 |
|---|
| } | | } |
| } | | } |
| if(map && ms && oms && ms->N && ms->V && (I->Obj.visRep & cRepSurfaceBit))
{ | | if(map && ms && oms && ms->N && ms->V && (I->Obj.visRep & cRepSurfaceBit))
{ |
| if(ms->ResurfaceFlag) { | | if(ms->ResurfaceFlag) { |
| ms->ResurfaceFlag = false; | | ms->ResurfaceFlag = false; |
| ms->RecolorFlag = true; | | ms->RecolorFlag = true; |
| if(!ms->quiet) { | | if(!ms->quiet) { |
| PRINTFB(I->Obj.G, FB_ObjectSurface, FB_Details) | | PRINTFB(I->Obj.G, FB_ObjectSurface, FB_Details) |
| " ObjectSurface: updating \"%s\".\n", I->Obj.Name ENDFB(I->Obj.G); | | " ObjectSurface: updating \"%s\".\n", I->Obj.Name ENDFB(I->Obj.G); |
| } | | } |
|
| | |
| | CGOFree(ms->shaderCGO); |
| | |
| if(oms->Field) { | | if(oms->Field) { |
| | |
| { | | { |
| float *min_ext, *max_ext; | | float *min_ext, *max_ext; |
| float tmp_min[3], tmp_max[3]; | | float tmp_min[3], tmp_max[3]; |
| if(MatrixInvTransformExtentsR44d3f(ms->State.Matrix, | | if(MatrixInvTransformExtentsR44d3f(ms->State.Matrix, |
| ms->ExtentMin, ms->ExtentMax, | | ms->ExtentMin, ms->ExtentMax, |
| tmp_min, tmp_max)) { | | tmp_min, tmp_max)) { |
| min_ext = tmp_min; | | min_ext = tmp_min; |
| max_ext = tmp_max; | | max_ext = tmp_max; |
| | |
| skipping to change at line 662 | | skipping to change at line 665 |
|---|
| } | | } |
| } | | } |
| } | | } |
| } | | } |
| } | | } |
| if(ms->RecolorFlag) { | | if(ms->RecolorFlag) { |
| ObjectSurfaceStateUpdateColors(I, ms); | | ObjectSurfaceStateUpdateColors(I, ms); |
| ms->RecolorFlag = false; | | ms->RecolorFlag = false; |
| } | | } |
| } | | } |
|
| | | |
| CGOFree(ms->shaderCGO); | | |
| } | | } |
| } | | } |
| if(!I->Obj.ExtentFlag) { | | if(!I->Obj.ExtentFlag) { |
| ObjectSurfaceRecomputeExtent(I); | | ObjectSurfaceRecomputeExtent(I); |
| } | | } |
| SceneInvalidate(I->Obj.G); | | SceneInvalidate(I->Obj.G); |
| } | | } |
| | |
| static void ObjectSurfaceRender(ObjectSurface * I, RenderInfo * info) | | static void ObjectSurfaceRender(ObjectSurface * I, RenderInfo * info) |
| { | | { |
| | |
| skipping to change at line 1044 | | skipping to change at line 1045 |
|---|
| if(vc) | | if(vc) |
| vc += 3; | | vc += 3; |
| c -= 2; | | c -= 2; |
| | |
| v += 6; | | v += 6; |
| if(vc) | | if(vc) |
| vc += 3; | | vc += 3; |
| c -= 2; | | c -= 2; |
| | |
| while(c > 0) { | | while(c > 0) { |
|
| | | |
| if(vc) { | | if(vc) { |
| CGOAlphaTriangle(info->alpha_cgo, | | CGOAlphaTriangle(info->alpha_cgo, |
| v + (3 - 6), v + (3 - 12), v + 3, | | v + (3 - 6), v + (3 - 12), v + 3, |
| v - 6, v - 12, v, | | v - 6, v - 12, v, |
| vc - 3, vc - 6, vc, | | vc - 3, vc - 6, vc, |
| alpha, alpha, alpha, parity); | | alpha, alpha, alpha, parity); |
| } else { | | } else { |
| CGOAlphaTriangle(info->alpha_cgo, | | CGOAlphaTriangle(info->alpha_cgo, |
| v + (3 - 6), v + (3 - 12), v + 3, | | v + (3 - 6), v + (3 - 12), v + 3, |
| v - 6, v - 12, v, | | v - 6, v - 12, v, |
| | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 