Revision: 21166
http://sourceforge.net/p/jmol/code/21166
Author: hansonr
Date: 2016-06-29 12:47:23 +0000 (Wed, 29 Jun 2016)
Log Message:
-----------
2016.06.28 broke cartoon rendering
Modified Paths:
--------------
branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
trunk/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
Modified: branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
2016-06-27 21:46:16 UTC (rev 21165)
+++ branches/v14_6/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
2016-06-29 12:47:23 UTC (rev 21166)
@@ -137,12 +137,14 @@
if (val != aspectRatio && val != 0 && val1 != 0)
invalidateMesh = true;
aspectRatio = val;
- if (aspectRatio > 0 && meshRenderer == null) {
- meshRenderer = (BioMeshRenderer)
Interface.getInterface("org.jmol.renderbio.BioMeshRenderer");
- meshRenderer.setViewerG3dShapeID(vwr, shape.shapeID);
+ if (aspectRatio > 0) {
+ if (meshRenderer == null) {
+ meshRenderer = (BioMeshRenderer) Interface
+ .getInterface("org.jmol.renderbio.BioMeshRenderer");
+ meshRenderer.setViewerG3dShapeID(vwr, shape.shapeID);
+ }
+ meshRenderer.setup(g3d, vwr.ms, shape);
}
- meshRenderer.setup(g3d, vwr.ms, shape);
-
TF = vwr.getBoolean(T.tracealpha);
if (TF != isTraceAlpha)
invalidateMesh = true;
Modified: trunk/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java 2016-06-27
21:46:16 UTC (rev 21165)
+++ trunk/Jmol/src/org/jmol/renderbio/BioShapeRenderer.java 2016-06-29
12:47:23 UTC (rev 21166)
@@ -102,11 +102,11 @@
needTranslucent = false;
g3d.addRenderer(T.hermitelevel);
boolean TF = (!isExport && !vwr.checkMotionRendering(T.cartoon));
-
+
if (TF != wireframeOnly)
invalidateMesh = true;
wireframeOnly = TF;
-
+
TF = (isExport || !wireframeOnly && vwr.getBoolean(T.highresolution));
if (TF != isHighRes)
invalidateMesh = true;
@@ -122,7 +122,7 @@
if (cartoonsFancy && !wireframeOnly)
val1 = Math.max(val1, 3); // at least HermiteLevel 3 for "cartoonFancy"
and
//else if (val1 == 0 && exportType == GData.EXPORT_CARTESIAN)
- //val1 = 5; // forces hermite for 3D exporters
+ //val1 = 5; // forces hermite for 3D exporters
if (val1 != hermiteLevel)// && val1 != 0)
invalidateMesh = true;
hermiteLevel = Math.min(val1, 8);
@@ -137,11 +137,14 @@
if (val != aspectRatio && val != 0 && val1 != 0)
invalidateMesh = true;
aspectRatio = val;
- if (aspectRatio > 0 && meshRenderer == null) {
- meshRenderer = (BioMeshRenderer)
Interface.getInterface("org.jmol.renderbio.BioMeshRenderer");
- meshRenderer.setViewerG3dShapeID(vwr, shape.shapeID);
+ if (aspectRatio > 0) {
+ if (meshRenderer == null) {
+ meshRenderer = (BioMeshRenderer) Interface
+ .getInterface("org.jmol.renderbio.BioMeshRenderer");
+ meshRenderer.setViewerG3dShapeID(vwr, shape.shapeID);
+ }
+ meshRenderer.setup(g3d, vwr.ms, shape);
}
- meshRenderer.setup(g3d, vwr.ms, shape);
TF = vwr.getBoolean(T.tracealpha);
if (TF != isTraceAlpha)
invalidateMesh = true;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Attend Shape: An AT&T Tech Expo July 15-16. Meet us at AT&T Park in San
Francisco, CA to explore cutting-edge tech and listen to tech luminaries
present their vision of the future. This family event has something for
everyone, including kids. Get more information and register today.
http://sdm.link/attshape
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
