[Jmol-commits] CVS: Jmol/src/org/openscience/jmol DisplayControl.java,1.24,1.25

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv2153/src/org/openscience/jmol

Modified Files:
	DisplayControl.java 
Log Message:
bonds now connect with surfaces/edges of atoms and have perspective depth


Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** DisplayControl.java	17 Dec 2002 23:19:11 -0000	1.24
--- DisplayControl.java	22 Dec 2002 12:51:43 -0000	1.25
***************
*** 878,887 ****
  
    public Color getAtomColor(Atom atom) {
!     return colorProfile.getAtomColor((org.openscience.cdk.Atom)atom);
    }
  
    public Color getAtomOutlineColor(Color color) {
!     return (showDarkerOutline || atomDrawMode == SHADING)
        ? getDarker(color) : outlineColor;
    }
  
--- 878,893 ----
  
    public Color getAtomColor(Atom atom) {
!     Color color = colorProfile.getAtomColor((org.openscience.cdk.Atom)atom);
!     if (modeTransparentColors)
!       color = getTransparent(color);
!     return color;
    }
  
    public Color getAtomOutlineColor(Color color) {
!     Color outline = (showDarkerOutline || atomDrawMode == SHADING)
        ? getDarker(color) : outlineColor;
+     if (modeTransparentColors)
+       outline = getTransparent(outline);
+     return outline;
    }
  
***************
*** 894,897 ****
--- 900,920 ----
      }
      return darker;
+   }
+ 
+   private boolean modeTransparentColors = false;
+   public void setModeTransparentColors(boolean modeTransparentColors) {
+     this.modeTransparentColors = modeTransparentColors;
+   }
+ 
+   private final static int transparency = 0x40;
+   private Hashtable htTransparent = new Hashtable();
+   public Color getTransparent(Color color) {
+     Color transparent = (Color) htTransparent.get(color);
+     if (transparent == null) {
+       int argb = (color.getRGB() & 0x00FFFFFF) | (transparency << 24);
+       transparent = new Color (argb, true);
+       htTransparent.put(color, transparent);
+     }
+     return transparent;
    }
  }