From: Miguel <mic...@us...> - 2004-05-12 16:05:58
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3435/src/org/openscience/jmol/viewer Modified Files: JmolConstants.java JmolViewer.java Log Message: test class for shading/lighting Index: JmolConstants.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/JmolConstants.java,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- JmolConstants.java 12 May 2004 09:14:25 -0000 1.105 +++ JmolConstants.java 12 May 2004 16:05:17 -0000 1.106 @@ -1685,7 +1685,8 @@ public final static int SHAPE_FRANK = 15; public final static int SHAPE_ECHO = 16; public final static int SHAPE_HOVER = 17; - public final static int SHAPE_MAX = 18; + public final static int SHAPE_PRUEBA = 18; + public final static int SHAPE_MAX = 19; public final static String[] shapeClassBases = { "Balls", "Sticks", "Labels", "Vectors", "Measures", @@ -1693,7 +1694,8 @@ "Backbone", "Trace", "Cartoon", "Strands", "Mesh", "Ribbons", - "Axes", "Bbcage", "Uccage", "Frank", "Echo", "Hover" + "Axes", "Bbcage", "Uccage", "Frank", "Echo", "Hover", + "Prueba" }; // all of these things are compile-time constants Index: JmolViewer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/JmolViewer.java,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- JmolViewer.java 8 May 2004 09:35:49 -0000 1.170 +++ JmolViewer.java 12 May 2004 16:05:17 -0000 1.171 @@ -388,6 +388,11 @@ transformManager.transformPoint(pointAngstroms, pointScreen); } + public void transformPoints(Point3f[] pointsAngstroms, Point3i[] pointsScreens) { + transformManager.transformPoints(pointsAngstroms.length, + pointsAngstroms, pointsScreens); + } + public void transformVector(Vector3f vectorAngstroms, Vector3f vectorTransformed) { transformManager.transformVector(vectorAngstroms, vectorTransformed); |