[Jmol-commits] SF.net SVN: jmol: [6516] trunk/Jmol/src/org/jmol/viewer/TransformManager11. java

[<ha...@us...>]

Revision: 6516
          http://svn.sourceforge.net/jmol/?rev=6516&view=rev
Author:   hansonr
Date:     2006-12-19 13:46:30 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/TransformManager11.java

Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager11.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/TransformManager11.java	2006-12-19 21:45:35 UTC (rev 6515)
+++ trunk/Jmol/src/org/jmol/viewer/TransformManager11.java	2006-12-19 21:46:30 UTC (rev 6516)
@@ -34,7 +34,7 @@
 
   private float navigationZOffset = 0;
   private final Point3f navigationCenter = new Point3f();
-  private final Point3f ptNav = new Point3f();
+  private final Point3f ptNav = new Point3f(Float.NaN, Float.NaN, Float.NaN);
   private final Point3f newNavigationOffset = new Point3f();
 
   TransformManager11(Viewer viewer) {
@@ -74,14 +74,15 @@
     slabValue = 0;
     depthValue = Integer.MAX_VALUE;
     //System.out.println("calcSlab " + slabEnabled + " " + slabPercentSetting
-      //  + " " + visualRange);
+    //  + " " + visualRange);
     if (slabEnabled) {
       float radius = rotationRadius * scalePixelsPerAngstrom;
       float center = cameraDistance + screenPixelCount / 2f;
       if (perspectiveDepth && visualRange > 0 && slabPercentSetting == 0) {
         slabValue = (int) observerOffset;
         depthValue = Integer.MAX_VALUE;
-        System.out.println("fixedNavigationOffset=" + fixedNavigationOffset + " navigationZOffset="+navigationZOffset);
+        System.out.println("fixedNavigationOffset=" + fixedNavigationOffset
+            + " navigationZOffset=" + navigationZOffset);
         return;
       }
       // a slab percentage of 100 should map to zero
@@ -154,7 +155,6 @@
 
   // navigation
 
-
   boolean canNavigate() {
     return true;
   }
@@ -230,8 +230,7 @@
    * @return whether it is appropriate to zoom
    */
   private boolean isNavigationDistant() {
-    return (fixedRotationOffset.z - rotationRadius * scalePixelsPerAngstrom 
-        > observerOffset);
+    return (fixedRotationOffset.z - rotationRadius * scalePixelsPerAngstrom > observerOffset);
   }
 
   /** 
@@ -285,8 +284,8 @@
       // but we center it by moving the rotation center instead
       matrixTransform(navigationCenter, ptNav);
       matrixTransform(fixedRotationCenter, pointT);
-      navigationZOffset = observerOffset 
-         + (pointT.z - ptNav.z) - perspectiveScale;
+      navigationZOffset = observerOffset + (pointT.z - ptNav.z)
+          - perspectiveScale;
       calcCameraFactors();
       calcTransformMatrix();
     }
@@ -308,7 +307,8 @@
    * @param fixedModelXYZ
    * @param center
    */
-  private void findCenterAt(Point3f fixedModelXYZ, Point3f fixedScreenXYZ, Point3f center) {
+  private void findCenterAt(Point3f fixedModelXYZ, Point3f fixedScreenXYZ,
+                            Point3f center) {
     isNavigationMode = false;
     //get the rotation center's Z offset and move X and Y to 0,0
     transformPoint(fixedModelXYZ, pointT);
@@ -350,7 +350,7 @@
 
   protected String getNavigationState() {
     StringBuffer commands = new StringBuffer("");
-    
+
     return commands.toString();
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.