Revision: 20468
http://sourceforge.net/p/jmol/code/20468
Author: hansonr
Date: 2015-04-30 13:39:29 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/render/UccageRenderer.java
Modified: trunk/Jmol/src/org/jmol/render/UccageRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/UccageRenderer.java 2015-04-30 13:39:03 UTC
(rev 20467)
+++ trunk/Jmol/src/org/jmol/render/UccageRenderer.java 2015-04-30 13:39:29 UTC
(rev 20468)
@@ -97,15 +97,15 @@
P3 fset = unitcell.getUnitCellMultiplier();
boolean haveMultiple = (fset != null && fset.distanceSquared(fset0) != 0);
- if (!haveMultiple)
+ if (!haveMultiple)
fset = fset0;
SimpleUnitCell.ijkToPoint3f((int) fset.x, cell0, 0);
SimpleUnitCell.ijkToPoint3f((int) fset.y, cell1, 1);
int firstLine, allow0, allow1;
if (fset.z < 0) {
- cell0.scale (-1/fset.z);
- cell1.scale (-1/fset.z);
+ cell0.scale(-1 / fset.z);
+ cell1.scale(-1 / fset.z);
}
float scale = Math.abs(fset.z);
P3[] axisPoints = vwr.getAxisPoints();
@@ -116,40 +116,43 @@
offsetT.setT(cell0);
unitcell.toCartesian(offsetT, true);
offsetT.add(offset);
- aPoints = (cell0.x == 0 && cell0.y == 0 && cell0.z == 0 ? axisPoints :
null);
+ aPoints = (cell0.x == 0 && cell0.y == 0 && cell0.z == 0 ? axisPoints
+ : null);
firstLine = 0;
allow0 = 0xFF;
allow1 = 0xFF;
P3[] pts = BoxInfo.unitCubePoints;
for (int i = 8; --i >= 0;) {
- P3 v = P3.new3(pts[i].x * (cell1.x - cell0.x), pts[i].y * (cell1.y -
cell0.y), pts[i].z * (cell1.z - cell0.z));
+ P3 v = P3.new3(pts[i].x * (cell1.x - cell0.x), pts[i].y
+ * (cell1.y - cell0.y), pts[i].z * (cell1.z - cell0.z));
unitcell.toCartesian(v, true);
verticesT[i].add2(v, offsetT);
}
renderCage(mad, verticesT, aPoints, firstLine, allow0, allow1, 1);
} else
- for (int x = (int) cell0.x; x < cell1.x; x++) {
- for (int y = (int) cell0.y; y < cell1.y; y++) {
- for (int z = (int) cell0.z; z < cell1.z; z++) {
- if (haveMultiple) {
- offsetT.set(x, y, z);
- offsetT.scale(scale);
- unitcell.toCartesian(offsetT, true);
- offsetT.add(offset);
- aPoints = (x == 0 && y == 0 && z == 0 ? axisPoints : null);
- firstLine = (drawAllLines || aPoints == null ? 0 : 3);
- } else {
- offsetT.setT(offset);
- firstLine = (drawAllLines ? 0 : 3);
+ for (int x = (int) cell0.x; x < cell1.x; x++) {
+ for (int y = (int) cell0.y; y < cell1.y; y++) {
+ for (int z = (int) cell0.z; z < cell1.z; z++) {
+ if (haveMultiple) {
+ offsetT.set(x, y, z);
+ offsetT.scale(scale);
+ unitcell.toCartesian(offsetT, true);
+ offsetT.add(offset);
+ aPoints = (x == 0 && y == 0 && z == 0 ? axisPoints : null);
+ firstLine = (drawAllLines || aPoints == null ? 0 : 3);
+ } else {
+ offsetT.setT(offset);
+ firstLine = (drawAllLines ? 0 : 3);
+ }
+ allow0 = 0xFF;
+ allow1 = 0xFF;
+ for (int i = 8; --i >= 0;)
+ verticesT[i].add2(vertices[i], offsetT);
+ renderCage(mad, verticesT, aPoints, firstLine, allow0, allow1,
+ scale);
}
- allow0 = 0xFF;
- allow1 = 0xFF;
- for (int i = 8; --i >= 0;)
- verticesT[i].add2(vertices[i], offsetT);
- renderCage(mad, verticesT, aPoints, firstLine, allow0, allow1,
scale);
}
}
- }
renderInfo();
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
