From: <ha...@us...> - 2006-12-20 04:12:59
|
Revision: 6522 http://svn.sourceforge.net/jmol/?rev=6522&view=rev Author: hansonr Date: 2006-12-19 20:12:57 -0800 (Tue, 19 Dec 2006) Log Message: ----------- all set for animated navigation Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/TransformManager.java trunk/Jmol/src/org/jmol/viewer/TransformManager11.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-12-20 04:05:38 UTC (rev 6521) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-12-20 04:12:57 UTC (rev 6522) @@ -2100,7 +2100,7 @@ case Token.depth: float depth = floatParameter(++i); if (!isSyntaxCheck) - viewer.setNavigationDepthPercent(depth); + viewer.setNavigationDepthPercent(timeSec, depth); break; case Token.center: pt = centerParameter(++i); Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2006-12-20 04:05:38 UTC (rev 6521) +++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2006-12-20 04:12:57 UTC (rev 6522) @@ -1933,9 +1933,10 @@ * sets the position of the navigation offset relative * to the model (50% center; 0% rear, 100% front; can be <0 or >100) * + * @param timeSec * @param percent */ - void setNavigationDepthPercent(float percent) { + void setNavigationDepthPercent(float timeSec, float percent) { } } Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager11.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/TransformManager11.java 2006-12-20 04:05:38 UTC (rev 6521) +++ trunk/Jmol/src/org/jmol/viewer/TransformManager11.java 2006-12-20 04:12:57 UTC (rev 6522) @@ -158,7 +158,7 @@ return true; } - void setNavigationDepthPercent(float percent) { + void setNavigationDepthPercent(float timeSec, float percent) { // navigation depth 0 # place user at front plane of the model // navigation depth 100 # place user at rear plane of the model @@ -166,6 +166,7 @@ // perspectiveScale + navigationZOffset = observerOffset + dz + //time not implemented calcCameraFactors(); //current float dz = ((50 - percent) / 100) * rotationRadius * scalePixelsPerAngstrom; navigationZOffset = observerOffset + dz - perspectiveScale; Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-12-20 04:05:38 UTC (rev 6521) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-12-20 04:12:57 UTC (rev 6522) @@ -3701,8 +3701,8 @@ refresh(1, "set cameraDepth"); } - void setNavigationDepthPercent(float percent) { - transformManager.setNavigationDepthPercent(percent); + void setNavigationDepthPercent(float timeSec, float percent) { + transformManager.setNavigationDepthPercent(timeSec, percent); refresh(1, "set navigationdDepth"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |