From: <ha...@us...> - 2006-12-22 03:56:48
|
Revision: 6537 http://svn.sourceforge.net/jmol/?rev=6537&view=rev Author: hansonr Date: 2006-12-21 19:56:47 -0800 (Thu, 21 Dec 2006) Log Message: ----------- 11.0 bug fix for nucleic cartoon not connected properly Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java Modified: trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java 2006-12-22 03:56:12 UTC (rev 6536) +++ trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java 2006-12-22 03:56:47 UTC (rev 6537) @@ -58,13 +58,22 @@ viewer.freeTempScreens(ribbonBottomScreens); } + Point3i ptConnect = new Point3i(); void renderNucleic() { - for (int i = monomerCount; --i >= 0;) - if (bsVisible.get(i)) { - renderHermiteConic(i, false); - renderNucleicBaseStep((NucleicMonomer) monomers[i], getLeadColix(i), mads[i], - controlPointScreens[i]); - } + boolean isTraceAlpha = viewer.getTraceAlpha(); + for (int i = monomerCount; --i >= 0;) + if (bsVisible.get(i)) { + if (isTraceAlpha) { + ptConnect.set((controlPointScreens[i].x + controlPointScreens[i + 1].x)/2, + (controlPointScreens[i].y + controlPointScreens[i + 1].y)/2, + (controlPointScreens[i].z + controlPointScreens[i + 1].z)/2); + } else { + ptConnect.set(controlPointScreens[i + 1]); + } + renderHermiteConic(i, false); + renderNucleicBaseStep((NucleicMonomer) monomers[i], getLeadColix(i), mads[i], + ptConnect); + } } void render1() { @@ -151,9 +160,9 @@ if (hasRing5) { viewer.transformPoints(ring5Points, ring5Screens); renderRing5(); - stepScreen = ring5Screens[2]; + stepScreen = ring5Screens[3];//was 2 } else { - stepScreen = ring6Screens[1]; + stepScreen = ring6Screens[2];//was 1 } g3d.fillCylinder(colix, Graphics3D.ENDCAPS_SPHERICAL, viewer.scaleToScreen(backboneScreen.z, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |