Revision: 20928
http://sourceforge.net/p/jmol/code/20928
Author: hansonr
Date: 2016-01-09 06:06:15 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.4.1_2016.01.08"
bug fix: labels, echos, and measurements improperly shaded when z-shaded with
nonblack background
bug fix: rendering error when set zshade followed by set antialiasdisplay
code: (JavaScript) refactoring to reduce extraneous file download
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/g3d/Graphics3D.java
branches/v14_4/Jmol/src/org/jmol/g3d/Pixelator.java
branches/v14_4/Jmol/src/org/jmol/g3d/PixelatorShaded.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/g3d/Graphics3D.java
trunk/Jmol/src/org/jmol/g3d/Pixelator.java
trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java
Modified: branches/v14_4/Jmol/src/org/jmol/g3d/Graphics3D.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/g3d/Graphics3D.java 2016-01-07
13:27:50 UTC (rev 20927)
+++ branches/v14_4/Jmol/src/org/jmol/g3d/Graphics3D.java 2016-01-09
06:06:15 UTC (rev 20928)
@@ -235,7 +235,9 @@
public void destroy() {
releaseBuffers();
platform = null;
- pixel = pixel0 = pixelScreened = pixelShaded = null;
+ pixel = pixel0 = pixelShaded = null;
+ pixelT0 = null;
+ pixelScreened = null;
graphicsForMetrics = null;
}
@@ -256,8 +258,8 @@
Pixelator pixel;
Pixelator pixel0;
- private Pixelator pixelT0;
- private Pixelator pixelScreened;
+ private PixelatorT pixelT0;
+ private PixelatorScreened pixelScreened;
private PixelatorShaded pixelShaded;
protected int zMargin;
@@ -363,6 +365,7 @@
colixCurrent = 0;
haveTranslucentObjects = wasScreened = false;
pixel = pixel0;
+ pixel.bgcolor = bgcolor;
translucentCoverOnly = !translucentMode;
if (pbuf == null) {
platform.allocateBuffers(windowWidth, windowHeight, antialiasThisFrame,
@@ -373,6 +376,8 @@
pixel0.setBuf();
if (pixelT0 != null)
pixelT0.setBuf();
+ if (pixelShaded != null)
+ pixelShaded.setBuf();
}
setWidthHeight(antialiasThisFrame);
if (pixelScreened != null)
Modified: branches/v14_4/Jmol/src/org/jmol/g3d/Pixelator.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/g3d/Pixelator.java 2016-01-07 13:27:50 UTC
(rev 20927)
+++ branches/v14_4/Jmol/src/org/jmol/g3d/Pixelator.java 2016-01-09 06:06:15 UTC
(rev 20928)
@@ -33,6 +33,7 @@
Pixelator p0;
protected int[] zb, pb;
int width;
+ int bgcolor;
/**
@@ -40,6 +41,7 @@
*/
Pixelator(Graphics3D graphics3d) {
g = graphics3d;
+ bgcolor = g.bgcolor;
setBuf();
}
@@ -62,6 +64,8 @@
public void addImagePixel(byte shade, int tLog, int offset, int z, int argb,
int bgargb) {
+ if (zb != g.zbuf)
+ System.out.println("OH");
if (z < zb[offset]) {
switch (shade) {
case 0:
@@ -78,7 +82,7 @@
if (bgargb != 0)
p = Graphics3D.mergeBufferPixel(p, bgargb, bgargb);
p = Graphics3D.mergeBufferPixel(p, (argb & 0xFFFFFF)
- | (shade << 24), bgargb);
+ | (shade << 24), bgcolor);
addPixel(offset, z, p);
}
}
Modified: branches/v14_4/Jmol/src/org/jmol/g3d/PixelatorShaded.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/g3d/PixelatorShaded.java 2016-01-07
13:27:50 UTC (rev 20927)
+++ branches/v14_4/Jmol/src/org/jmol/g3d/PixelatorShaded.java 2016-01-09
06:06:15 UTC (rev 20928)
@@ -45,12 +45,13 @@
}
Pixelator set(int zSlab, int zDepth, int zShadePower) {
- bgRGB = new int[] { g.bgcolor & 0xFF, (g.bgcolor >> 8) & 0xFF,
+ bgcolor = g.bgcolor;
+ bgRGB = new int[] { bgcolor & 0xFF, (bgcolor >> 8) & 0xFF,
(g.bgcolor >> 16) & 0xFF };
this.zSlab = zSlab < 0 ? 0 : zSlab;
this.zDepth = zDepth < 0 ? 0 : zDepth;
this.zShadePower = zShadePower;
- this.p0 = g.pixel0;
+ p0 = g.pixel0;
return this;
}
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-01-07
13:27:50 UTC (rev 20927)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-01-09
06:06:15 UTC (rev 20928)
@@ -7,8 +7,11 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.1_2016.01.07"
+Jmol.___JmolVersion="14.4.1_2016.01.08"
+bug fix: labels, echos, and measurements improperly shaded when z-shaded with
nonblack background
+bug fix: rendering error when set zshade followed by set antialiasdisplay
+
code: (JavaScript) refactoring to reduce extraneous file download
JmolVersion="14.4.1_2016.01.06"
Modified: trunk/Jmol/src/org/jmol/g3d/Graphics3D.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2016-01-07 13:27:50 UTC (rev
20927)
+++ trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2016-01-09 06:06:15 UTC (rev
20928)
@@ -235,7 +235,9 @@
public void destroy() {
releaseBuffers();
platform = null;
- pixel = pixel0 = pixelScreened = pixelShaded = null;
+ pixel = pixel0 = pixelShaded = null;
+ pixelT0 = null;
+ pixelScreened = null;
graphicsForMetrics = null;
}
@@ -256,8 +258,8 @@
Pixelator pixel;
Pixelator pixel0;
- private Pixelator pixelT0;
- private Pixelator pixelScreened;
+ private PixelatorT pixelT0;
+ private PixelatorScreened pixelScreened;
private PixelatorShaded pixelShaded;
protected int zMargin;
@@ -363,6 +365,7 @@
colixCurrent = 0;
haveTranslucentObjects = wasScreened = false;
pixel = pixel0;
+ pixel.bgcolor = bgcolor;
translucentCoverOnly = !translucentMode;
if (pbuf == null) {
platform.allocateBuffers(windowWidth, windowHeight, antialiasThisFrame,
@@ -373,6 +376,8 @@
pixel0.setBuf();
if (pixelT0 != null)
pixelT0.setBuf();
+ if (pixelShaded != null)
+ pixelShaded.setBuf();
}
setWidthHeight(antialiasThisFrame);
if (pixelScreened != null)
Modified: trunk/Jmol/src/org/jmol/g3d/Pixelator.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/Pixelator.java 2016-01-07 13:27:50 UTC (rev
20927)
+++ trunk/Jmol/src/org/jmol/g3d/Pixelator.java 2016-01-09 06:06:15 UTC (rev
20928)
@@ -33,6 +33,7 @@
Pixelator p0;
protected int[] zb, pb;
int width;
+ int bgcolor;
/**
@@ -40,6 +41,7 @@
*/
Pixelator(Graphics3D graphics3d) {
g = graphics3d;
+ bgcolor = g.bgcolor;
setBuf();
}
@@ -62,6 +64,8 @@
public void addImagePixel(byte shade, int tLog, int offset, int z, int argb,
int bgargb) {
+ if (zb != g.zbuf)
+ System.out.println("OH");
if (z < zb[offset]) {
switch (shade) {
case 0:
@@ -78,7 +82,7 @@
if (bgargb != 0)
p = Graphics3D.mergeBufferPixel(p, bgargb, bgargb);
p = Graphics3D.mergeBufferPixel(p, (argb & 0xFFFFFF)
- | (shade << 24), bgargb);
+ | (shade << 24), bgcolor);
addPixel(offset, z, p);
}
}
Modified: trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java 2016-01-07 13:27:50 UTC
(rev 20927)
+++ trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java 2016-01-09 06:06:15 UTC
(rev 20928)
@@ -45,12 +45,13 @@
}
Pixelator set(int zSlab, int zDepth, int zShadePower) {
- bgRGB = new int[] { g.bgcolor & 0xFF, (g.bgcolor >> 8) & 0xFF,
+ bgcolor = g.bgcolor;
+ bgRGB = new int[] { bgcolor & 0xFF, (bgcolor >> 8) & 0xFF,
(g.bgcolor >> 16) & 0xFF };
this.zSlab = zSlab < 0 ? 0 : zSlab;
this.zDepth = zDepth < 0 ? 0 : zDepth;
this.zShadePower = zShadePower;
- this.p0 = g.pixel0;
+ p0 = g.pixel0;
return this;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
