From: <ha...@us...> - 2010-05-31 13:36:52
|
Revision: 13259 http://jmol.svn.sourceforge.net/jmol/?rev=13259&view=rev Author: hansonr Date: 2010-05-31 13:36:45 +0000 (Mon, 31 May 2010) Log Message: ----------- version=11.8.25_dev # bug fix: rocketBarrels not fully smooth barrels. Modified Paths: -------------- branches/v11_8/Jmol/src/org/jmol/shapebio/RocketsRenderer.java branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v11_8/Jmol/src/org/jmol/shapebio/RocketsRenderer.java =================================================================== --- branches/v11_8/Jmol/src/org/jmol/shapebio/RocketsRenderer.java 2010-05-30 08:34:47 UTC (rev 13258) +++ branches/v11_8/Jmol/src/org/jmol/shapebio/RocketsRenderer.java 2010-05-31 13:36:45 UTC (rev 13259) @@ -160,10 +160,10 @@ viewer.transformPoint(pointEnd, screenB); int zMid = (int) Math.floor((screenA.z + screenB.z) / 2f); int diameter = viewer.scaleToScreen(zMid, mad); - if (tEnd) { + if (tEnd && !renderAsBarrels) { viewer.transformPoint(pointBeforeEnd, screenC); if (g3d.setColix(colix)) { - if (renderAsBarrels || pointBeforeEnd.distance(pointEnd) <= MIN_CONE_HEIGHT) + if (pointBeforeEnd.distance(pointEnd) <= MIN_CONE_HEIGHT) g3d.fillCylinderBits(Graphics3D.ENDCAPS_FLAT, diameter, screenB, screenC); else Modified: branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties 2010-05-30 08:34:47 UTC (rev 13258) +++ branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties 2010-05-31 13:36:45 UTC (rev 13259) @@ -4,6 +4,7 @@ version=11.8.25_dev +# bug fix: rocketBarrels not fully smooth barrels. # bug fix: isosurface selecting 2nd model while two are displayed produces no surface # bug fix: draw xx* delete -- does not recognize xx* as wild # bug fix: dragSelected could be off by 1 pixel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |