[Jmol-commits] CVS: Jmol/src/org/jmol/g3d Graphics3D.java,1.95,1.96 Text3D.java,1.6,1.7

[Miguel <mig...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/g3d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11200/src/org/jmol/g3d

Modified Files:
	Graphics3D.java Text3D.java 
Log Message:
fixed bug 1342485 : echo did not display when slab was enabled


Index: Graphics3D.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/g3d/Graphics3D.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- Graphics3D.java	10 Nov 2005 15:52:39 -0000	1.95
+++ Graphics3D.java	28 Nov 2005 15:48:36 -0000	1.96
@@ -1304,6 +1304,16 @@
     }
   }
 
+  void plotPixelClippedNoSlab(int argb, int x, int y, int z) {
+    if (x < 0 || x >= width || y < 0 || y >= height)
+      return;
+    int offset = y * width + x;
+    if (z < zbuf[offset]) {
+      zbuf[offset] = (short)z;
+      pbuf[offset] = argb;
+    }
+  }
+
   void plotPixelClipped(int argb, boolean isTranslucent, int x, int y, int z) {
     if (x < 0 || x >= width || y < 0 || y >= height || z < slab || z > depth)
       return;

Index: Text3D.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/g3d/Text3D.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Text3D.java	10 Nov 2005 15:52:39 -0000	1.6
+++ Text3D.java	28 Nov 2005 15:48:36 -0000	1.7
@@ -268,8 +268,9 @@
           offset += skip;
         } else {
           if (shiftregister < 0 || argbBackground != 0)
-            g3d.plotPixelClipped(shiftregister < 0 ? argb : argbBackground,
-                                 x + j, y + i, z);
+            g3d.plotPixelClippedNoSlab(shiftregister < 0
+                                       ? argb : argbBackground,
+                                       x + j, y + i, z);
           shiftregister <<= 1;
           ++offset;
           ++j;