Revision: 18339
http://sourceforge.net/p/jmol/code/18339
Author: hansonr
Date: 2013-06-16 23:52:10 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
___version=13.0.17_dev_2013.06.16b
bug fix: POLYHEDRA with faceCenterOffset not saved in state properly; EDGES
option nonfunctional
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/renderspecial/PolyhedraRenderer.java
trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
trunk/Jmol/src/org/jmol/shapespecial/Polyhedra.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/renderspecial/PolyhedraRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/renderspecial/PolyhedraRenderer.java
2013-06-16 23:51:30 UTC (rev 18338)
+++ trunk/Jmol/src/org/jmol/renderspecial/PolyhedraRenderer.java
2013-06-16 23:52:10 UTC (rev 18339)
@@ -105,11 +105,11 @@
}
private void drawCylinderTriangle(int xA, int yA, int zA, int xB, int yB,
- int zB, int xC, int yC, int zC) {
-
- g3d.fillCylinderScreen(GData.ENDCAPS_SPHERICAL, 3, xA, yA, zA, xB, yB, zB);
- g3d.fillCylinderScreen(GData.ENDCAPS_SPHERICAL, 3, xB, yB, zB, xC, yC, zC);
- g3d.fillCylinderScreen(GData.ENDCAPS_SPHERICAL, 3, xA, yA, zA, xC, yC, zC);
+ int zB, int xC, int yC, int zC) {
+ int d = (g3d.isAntialiased() ? 6 : 3);
+ g3d.fillCylinderScreen(GData.ENDCAPS_SPHERICAL, d, xA, yA, zA, xB, yB, zB);
+ g3d.fillCylinderScreen(GData.ENDCAPS_SPHERICAL, d, xB, yB, zB, xC, yC, zC);
+ g3d.fillCylinderScreen(GData.ENDCAPS_SPHERICAL, d, xA, yA, zA, xC, yC, zC);
}
private void fillFace(short normix, P3i A, P3i B, P3i C) {
Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-06-16 23:51:30 UTC
(rev 18338)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-06-16 23:52:10 UTC
(rev 18339)
@@ -16161,7 +16161,7 @@
int lighting = 0;
int nAtomSets = 0;
sm.loadShape(JC.SHAPE_POLYHEDRA);
- setShapeProperty(JC.SHAPE_POLYHEDRA, "init", null);
+ setShapeProperty(JC.SHAPE_POLYHEDRA, "init", Boolean.TRUE);
String setPropertyName = "centers";
String decimalPropertyName = "radius_";
float translucentLevel = Float.MAX_VALUE;
@@ -16302,7 +16302,7 @@
translucentLevel, null);
if (lighting != 0)
setShapeProperty(JC.SHAPE_POLYHEDRA, "token", Integer.valueOf(lighting));
- setShapeProperty(JC.SHAPE_POLYHEDRA, "init", null);
+ setShapeProperty(JC.SHAPE_POLYHEDRA, "init", Boolean.FALSE);
}
private void contact() throws ScriptException {
Modified: trunk/Jmol/src/org/jmol/shapespecial/Polyhedra.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/Polyhedra.java 2013-06-16 23:51:30 UTC
(rev 18338)
+++ trunk/Jmol/src/org/jmol/shapespecial/Polyhedra.java 2013-06-16 23:52:10 UTC
(rev 18339)
@@ -87,8 +87,9 @@
centers = null;
bsVertexCount = new BS();
bondedOnly = isCollapsed = iHaveCenterBitSet = false;
- drawEdges = EDGES_NONE;
haveBitSetVertices = false;
+ if (Boolean.TRUE == value)
+ drawEdges = EDGES_NONE;
return;
}
@@ -596,14 +597,12 @@
BS bs = new BS();
for (int i = 0; i < ptCenter; i++)
bs.set(((Atom) vertices[i]).getIndex());
- return " polyhedra ({" + centralAtom.getIndex() + "}) "
- + (myDistanceFactor == DEFAULT_DISTANCE_FACTOR ? ""
- : " distanceFactor " + myDistanceFactor)
- + (myFaceCenterOffset == DEFAULT_FACECENTEROFFSET ? ""
- : " faceCenterOffset " + myFaceCenterOffset) + " to "
- + Escape.eBS(bs) + (collapsed ? " collapsed" : "")
- + (isFullyLit ? " fullyLit" : "" ) + ";"
- + (visible ? "" : "polyhedra off;") + "\n";
+ return " polyhedra ({" + centralAtom.getIndex() + "}) to "
+ + Escape.eBS(bs) + (collapsed ? " collapsed" : "")
+ + " distanceFactor " + myDistanceFactor
+ + " faceCenterOffset " + myFaceCenterOffset
+ + (isFullyLit ? " fullyLit" : "" ) + ";"
+ + (visible ? "" : "polyhedra off;") + "\n";
}
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-16 23:51:30 UTC
(rev 18338)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-16 23:52:10 UTC
(rev 18339)
@@ -9,7 +9,8 @@
# The quotes above look odd for a parameter file, but they are
# important for the JavaScript version of Jmol.
-___JmolVersion="13.1.17_dev_2013.06.16"
+___JmolVersion="13.1.17_dev_2013.06.16b"
+bug fix: POLYHEDRA with faceCenterOffset not saved in state properly; EDGES
option nonfunctional
new feature: {atomset1}.distance.min({atomset2})
-- returns an array
@@ -30,6 +31,9 @@
-- load trajectory ({0 6}) 1cdr.pdb
-- animation MORPH 10
-- animation ON
+ -- load trajectory "test1.pdb" "test2.pdb"
+ -- animation MORPH 30
+ -- animation ON
bug fix: draw ARROW ATOM/BOND broken
bug fix: draw ARROW with offset disallows set picking draw adjustments
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
