Revision: 20238
http://sourceforge.net/p/jmol/code/20238
Author: hansonr
Date: 2015-01-23 02:36:11 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/g3d/Graphics3D.java
trunk/Jmol/src/org/jmol/g3d/PixelatorScreened.java
trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java
trunk/Jmol/src/org/jmol/g3d/PixelatorT.java
Modified: trunk/Jmol/src/org/jmol/g3d/Graphics3D.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2015-01-23 01:53:29 UTC (rev
20237)
+++ trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2015-01-23 02:36:11 UTC (rev
20238)
@@ -205,7 +205,9 @@
private int anaglyphLength;
Pixelator pixel;
- private Pixelator pixel0, pixelT0, pixelScreened;
+ Pixelator pixel0;
+ private Pixelator pixelT0;
+ private Pixelator pixelScreened;
private PixelatorShaded pixelShaded;
protected int zMargin;
@@ -548,9 +550,8 @@
setDepth(depthValue);
if (zSlab < zDepth) {
if (pixelShaded == null)
- pixelShaded = new PixelatorShaded(this, pixel0);
+ pixelShaded = new PixelatorShaded(this);
pixel = pixelShaded.set(zSlab, zDepth, zShadePower);
- pixel.p0 = pixel0;
} else {
pixel = pixel0;
}
Modified: trunk/Jmol/src/org/jmol/g3d/PixelatorScreened.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/PixelatorScreened.java 2015-01-23 01:53:29 UTC
(rev 20237)
+++ trunk/Jmol/src/org/jmol/g3d/PixelatorScreened.java 2015-01-23 02:36:11 UTC
(rev 20238)
@@ -42,6 +42,9 @@
this.p0 = p0;
}
+ /**
+ * @j2sOverride
+ */
@Override
void addPixel(int offset, int z, int p) {
if ((offset % width) % 2 == (offset / width) % 2)
Modified: trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java 2015-01-23 01:53:29 UTC
(rev 20237)
+++ trunk/Jmol/src/org/jmol/g3d/PixelatorShaded.java 2015-01-23 02:36:11 UTC
(rev 20238)
@@ -37,12 +37,10 @@
/**
* @param g
- * @param p0
*/
- PixelatorShaded(Graphics3D g, Pixelator p0) {
+ PixelatorShaded(Graphics3D g) {
super(g);
tmp = new int[3];
- this.p0 = p0;
}
Pixelator set(int zSlab, int zDepth, int zShadePower) {
@@ -51,9 +49,13 @@
this.zSlab = zSlab < 0 ? 0 : zSlab;
this.zDepth = zDepth < 0 ? 0 : zDepth;
this.zShadePower = zShadePower;
+ this.p0 = g.pixel0;
return this;
}
+ /**
+ * @j2sOverride
+ */
@Override
void addPixel(int offset, int z, int p) {
// z starts with 0 at camera and runs toward model, with zSlab <= zDepth
Modified: trunk/Jmol/src/org/jmol/g3d/PixelatorT.java
===================================================================
--- trunk/Jmol/src/org/jmol/g3d/PixelatorT.java 2015-01-23 01:53:29 UTC (rev
20237)
+++ trunk/Jmol/src/org/jmol/g3d/PixelatorT.java 2015-01-23 02:36:11 UTC (rev
20238)
@@ -43,6 +43,9 @@
// ignore in pass 2
}
+ /**
+ * @j2sOverride
+ */
@Override
void addPixel(int offset, int z, int p) {
int zT = g.zbufT[offset];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
