From: <ha...@us...> - 2007-10-08 12:42:52
|
Revision: 8390 http://jmol.svn.sourceforge.net/jmol/?rev=8390&view=rev Author: hansonr Date: 2007-10-08 05:42:50 -0700 (Mon, 08 Oct 2007) Log Message: ----------- major reorganization of exporters Modified Paths: -------------- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java Modified: trunk/Jmol/src/org/jmol/export/_PovrayExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-08 12:39:53 UTC (rev 8389) +++ trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-08 12:42:50 UTC (rev 8390) @@ -359,8 +359,7 @@ public void fillSphereCentered(short colix, int diameter, Point3i pt) { //rockets: -System.out.println("pov fillspherecentered -- rockets"+this); -} + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-10-17 15:39:47
|
Revision: 8452 http://jmol.svn.sourceforge.net/jmol/?rev=8452&view=rev Author: hansonr Date: 2007-10-17 08:39:45 -0700 (Wed, 17 Oct 2007) Log Message: ----------- 11.3.34 first pass at mapped isosurfaces -- POV-Ray Windows accepts the file but skips the isosurface? Modified Paths: -------------- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java Modified: trunk/Jmol/src/org/jmol/export/_PovrayExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-17 13:25:26 UTC (rev 8451) +++ trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-17 15:39:45 UTC (rev 8452) @@ -285,6 +285,8 @@ } private String triad(Tuple3f pt) { + if (Float.isNaN(pt.x)) + return "0,0,0"; return pt.x + "," + pt.y + "," + pt.z; } @@ -301,9 +303,9 @@ return; Hashtable htColixes = new Hashtable(); String color; - + output("mesh2 {\n"); - + output("vertex_vectors { " + nVertices); for (int i = 0; i < nVertices; i++) { if (i % 10 == 0) @@ -311,16 +313,19 @@ output(", <" + triad(vertices[i]) + ">"); } output("\n}\n"); - - output("normal_vectors { " + nVertices); - Vector3f[] nv = g3d.getTransformedVertexVectors(); - for (int i = 0; i < nVertices; i++) { - if (i % 10 == 0) - output("\n"); - output(", <" + triad(nv[normals[i]]) + ">"); + + if (normals != null) { + output("normal_vectors { " + nVertices); + Vector3f[] nv = g3d.getTransformedVertexVectors(); + for (int i = 0; i < nVertices; i++) { + short normal = normals[i]; + if (i % 10 == 0) + output("\n"); + output(", <" + triad(nv[normal < 0 ? ~normal : normal]) + ">"); + } + output("\n}\n"); } - output("\n}\n"); - + if (colixes != null) { int nColix = 0; for (int i = 0; i < nVertices; i++) { @@ -332,65 +337,66 @@ Enumeration e = htColixes.keys(); while (e.hasMoreElements()) { color = (String) e.nextElement(); - list[((Integer)htColixes.get(color)).intValue()] = color; + list[((Integer) htColixes.get(color)).intValue()] = color; } - + output("texture_list { " + nColix); for (int i = 0; i < nColix; i++) output("\n, texture{pigment{rgb <" + list[i] + ">}}"); output("\n}\n"); } - + output("face_indices { " + nFaces); int p = 0; - for (int i = BitSetUtil.length(bsFaces); --i >= 0; ) - if (bsFaces.get(i)){ - if ((p++) % 10 == 0) - output("\n"); - output(", <" + indices[i][0] + "," + indices[i][1] + "," + indices[i][2] + ">"); - if (colixes != null) - for (int j = 0; j < 3; j++) { - color = rgbFractionalFromColix(colixes[indices[i][j]], ','); - output(", " + ((Integer)htColixes.get(color)).intValue()); - } - } + for (int i = BitSetUtil.length(bsFaces); --i >= 0;) + if (bsFaces.get(i)) { + if ((p++) % 10 == 0) + output("\n"); + output(", <" + indices[i][0] + "," + indices[i][1] + "," + + indices[i][2] + ">"); + if (colixes != null) + for (int j = 0; j < 3; j++) { + color = color4(colixes[indices[i][j]]); + output("," + ((Integer) htColixes.get(color)).intValue()); + } + } output("\n}\n"); - + if (colixes == null) { output("pigment{rgbt<" + color4(colix) + ">}\n"); } - + output("}\n"); -/* - mesh2 { - vertex_vectors { - 9, - <0,0,0>, <0.5,0,0>, <0.5,0.5,0>, - <1,0,0>, <1,0.5,0>, <1,1,0> - <0.5,1,0>, <0,1,0>, <0,0.5,0> - } - normal_vectors { - 9, - <-1,-1,0>, <0,-1,0>, <0,0,1>, - <1,-1,0>, <1,0,0>, <1,1,0>, - <0,1,0>, <-1,1,0>, <-1,0,0> - } - texture_list { - 3, - texture{pigment{rgb <0,0,1>}} - texture{pigment{rgb 1}} - texture{pigment{rgb <1,0,0>}} - } - face_indices { - 8, - <0,1,2>,0,1,2, <1,3,2>,1,0,2, - <3,4,2>,0,1,2, <4,5,2>,1,0,2, - <5,6,2>,0,1,2, <6,7,2>,1,0,2, - <7,8,2>,0,1,2, <8,0,2>,1,0,2 - } - } -*/ + /* + mesh2 { + vertex_vectors { + 9, + <0,0,0>, <0.5,0,0>, <0.5,0.5,0>, + <1,0,0>, <1,0.5,0>, <1,1,0> + <0.5,1,0>, <0,1,0>, <0,0.5,0> + } + normal_vectors { + 9, + <-1,-1,0>, <0,-1,0>, <0,0,1>, + <1,-1,0>, <1,0,0>, <1,1,0>, + <0,1,0>, <-1,1,0>, <-1,0,0> + } + texture_list { + 3, + texture{pigment{rgb <0,0,1>}} + texture{pigment{rgb 1}} + texture{pigment{rgb <1,0,0>}} + } + face_indices { + 8, + <0,1,2>,0,1,2, <1,3,2>,1,0,2, + <3,4,2>,0,1,2, <4,5,2>,1,0,2, + <5,6,2>,0,1,2, <6,7,2>,1,0,2, + <7,8,2>,0,1,2, <8,0,2>,1,0,2 + } + } + */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-10-17 15:42:53
|
Revision: 8453 http://jmol.svn.sourceforge.net/jmol/?rev=8453&view=rev Author: hansonr Date: 2007-10-17 08:42:51 -0700 (Wed, 17 Oct 2007) Log Message: ----------- 11.3.34 second pass at mapped isosurfaces Modified Paths: -------------- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java Modified: trunk/Jmol/src/org/jmol/export/_PovrayExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-17 15:39:45 UTC (rev 8452) +++ trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-17 15:42:51 UTC (rev 8453) @@ -310,7 +310,8 @@ for (int i = 0; i < nVertices; i++) { if (i % 10 == 0) output("\n"); - output(", <" + triad(vertices[i]) + ">"); + viewer.transformPoint(vertices[i], povpt1); + output(", <" + triad(povpt1) + ">"); } output("\n}\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pim...@us...> - 2007-10-31 19:16:35
|
Revision: 8549 http://jmol.svn.sourceforge.net/jmol/?rev=8549&view=rev Author: pimpimpim Date: 2007-10-31 12:16:33 -0700 (Wed, 31 Oct 2007) Log Message: ----------- fix to small copy/paste mistake in povray slab capping Modified Paths: -------------- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java Modified: trunk/Jmol/src/org/jmol/export/_PovrayExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-31 18:08:49 UTC (rev 8548) +++ trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-10-31 19:16:33 UTC (rev 8549) @@ -170,7 +170,7 @@ + " #if (cutRadius2 > 0)\n" + " #local cutRadius = sqrt(cutRadius2);\n" + " cylinder{<X,Y,boundBoxdepthZ>," - + "<X,Y,(boundBoxdepthZ+(boundBoxslabZ/Z))>,cutRadius\n" + + "<X,Y,(boundBoxdepthZ+(boundBoxdepthZ/Z))>,cutRadius\n" + " pigment{rgbt<R,G,B,T>}\n" + " translucentFinish(T)\n" + " no_shadow}\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-11-29 23:01:02
|
Revision: 8693 http://jmol.svn.sourceforge.net/jmol/?rev=8693&view=rev Author: hansonr Date: 2007-11-29 15:00:57 -0800 (Thu, 29 Nov 2007) Log Message: ----------- 11.3.50 VERSION Modified Paths: -------------- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java Modified: trunk/Jmol/src/org/jmol/export/_PovrayExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-11-29 22:38:28 UTC (rev 8692) +++ trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-11-29 23:00:57 UTC (rev 8693) @@ -39,6 +39,7 @@ import org.jmol.modelset.Atom; import org.jmol.shape.Text; import org.jmol.util.BitSetUtil; +import org.jmol.util.TextFormat; import org.jmol.viewer.JmolConstants; import org.jmol.viewer.Viewer; @@ -84,8 +85,8 @@ output("//\n"); output("// This script was generated on " + getExportDate() + "\n"); output("// ******************************************************\n"); - output("\n/** " + JmolConstants.EMBEDDED_SCRIPT_TAG + " \n"); - output(viewer.getSavedState("_Export")); + output("\n/* " + JmolConstants.EMBEDDED_SCRIPT_TAG + " \n"); + output(TextFormat.simpleReplace(viewer.getSavedState("_Export"),"/*file*/", "")); output("\n**/\n"); output("\n"); output("// ******************************************************\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-11-29 23:01:30
|
Revision: 8694 http://jmol.svn.sourceforge.net/jmol/?rev=8694&view=rev Author: hansonr Date: 2007-11-29 15:01:28 -0800 (Thu, 29 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java Modified: trunk/Jmol/src/org/jmol/export/_PovrayExporter.java =================================================================== --- trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-11-29 23:00:57 UTC (rev 8693) +++ trunk/Jmol/src/org/jmol/export/_PovrayExporter.java 2007-11-29 23:01:28 UTC (rev 8694) @@ -87,7 +87,7 @@ output("// ******************************************************\n"); output("\n/* " + JmolConstants.EMBEDDED_SCRIPT_TAG + " \n"); output(TextFormat.simpleReplace(viewer.getSavedState("_Export"),"/*file*/", "")); - output("\n**/\n"); + output("\n*/\n"); output("\n"); output("// ******************************************************\n"); output("// Declare the resolution, camera, and light sources.\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |