pub_soft/pymol-open-source
3
0
Fork 0
mirror of https://github.com/schrodinger/pymol-open-source.git synced 2026-06-03 19:54:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

* fix segfault in SceneImagePrepareImpl

Browse Source 
* fix dihedral rep for objects with >20 states
* cmd.png: consider image_dots_per_inch with _unit2px
* preset.py: delete temporary selections
* fixed CGO demo crash in CGOSimplify
* print OpenGL info not only to STDOUT, but to PyMOL text output
* fix tcl/tk window placement on OS X 10.9
* get_viewport: do not print int as float
* fix: do not set wiz.cmd to None when saving PSE
* fix cartoon picking bug
* fix crash during selection
* fix two_sided_lighting cartoon shader bug
* fix isolevel command for isosurface with shaders
* mol2 writing with multiple objects
* fix removing non-polar hydrogens
* fix crash during select bychain
* fixed line_as_cylinder bug
* fixed smooth half bonds with line as cylinders
* get_bond command
This commit is contained in:
Thomas Holder
2013-11-11 20:40:57 +00:00
parent f2177bdf62
commit 2f38b849c0
26 changed files with 360 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/shaders/cylinder.fs
View File

@@ -128,12 +128,10 @@ void main(void)
2nd - endcap
3rd - frontcapround
4th - endcapround
5th - smooth_half_bonds
*/
float fcap = cap;
float frontcap = 0.0, frontcapround = 0.0;
float endcap = 0.0, endcapround = 0.0;
float smooth_half_bonds = 0.0;
frontcap = mod(fcap, 2.0);
fcap = ( fcap - frontcap ) / 2.0;
@@ -144,11 +142,9 @@ void main(void)
endcapround = floor((mod(fcap, 2.0) + no_flat_caps) / 2.0);
fcap = ( fcap - endcapround ) / 2.0;
smooth_half_bonds = floor((mod(fcap, 2.0) + no_flat_caps) / 2.0);
vec4 color;
float dp = clamp(-half_bond*new_point.z*inv_height, 0., .5) * smooth_half_bonds;
float dp = clamp(-half_bond*new_point.z*inv_height, 0., .5);
color = mix(color1, color2, smoothstep(.5 - dp, .5 + dp, ratio));
// test front cap