[Jmol-commits] CVS: Jmol/src/org/jmol/viewer SurfaceRenderer.java,1.15,1.16 PruebaRenderer.java,1.2,1.3 Surface.java,1.18,1.19

[Nicolas <ni...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/viewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2284/src/org/jmol/viewer

Modified Files:
	SurfaceRenderer.java PruebaRenderer.java Surface.java 
Log Message:
Fixed warnings

Index: SurfaceRenderer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/SurfaceRenderer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SurfaceRenderer.java	19 Jan 2005 21:01:10 -0000	1.15
+++ SurfaceRenderer.java	21 Jan 2005 17:23:02 -0000	1.16
@@ -290,9 +290,9 @@
       viewer.transformPoint(points[i], screens[i]);
 
     short colix1 = getColix(cavity.colixI, colixes, atoms, cavity.ixI);
-    short colix2 = getColix(cavity.colixJ, colixes, atoms, cavity.ixJ);
-    short colix3 = getColix(cavity.colixK, colixes, atoms, cavity.ixK);
-    short colixCenter = Graphics3D.RED;
+    //short colix2 = getColix(cavity.colixJ, colixes, atoms, cavity.ixJ);
+    //short colix3 = getColix(cavity.colixK, colixes, atoms, cavity.ixK);
+    //short colixCenter = Graphics3D.RED;
                         
     Point3i screenCenter = screens[0];
     short normixCenter = normixes[0];

Index: PruebaRenderer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/PruebaRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PruebaRenderer.java	18 Jan 2005 21:02:05 -0000	1.2
+++ PruebaRenderer.java	21 Jan 2005 17:23:02 -0000	1.3
@@ -24,7 +24,6 @@
  */
 package org.jmol.viewer;
 
-import javax.vecmath.Point3f;
 import javax.vecmath.Point3i;
 import javax.vecmath.Vector3f;
 
@@ -38,7 +37,7 @@
     short colix = prueba.colix;
 
     int vertexCount = g3d.getGeodesicVertexCount(level);
-    Vector3f[] vectors = g3d.getGeodesicVertexVectors();
+    //Vector3f[] vectors = g3d.getGeodesicVertexVectors();
     Vector3f[] tvs = g3d.getTransformedVertexVectors();
     Point3i[] screens = viewer.allocTempScreens(vertexCount);
     short[] geodesicFaceVertexes = g3d.getGeodesicFaceVertexes(level);

Index: Surface.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Surface.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Surface.java	20 Jan 2005 22:29:55 -0000	1.18
+++ Surface.java	21 Jan 2005 17:23:05 -0000	1.19
@@ -254,14 +254,14 @@
   /*
    * radius and diameter of the probe. 0 == no probe
    */
-  private float radiusP, diameterP;
+  float radiusP, diameterP;
 
   /*
    * these state variables are set by the routines below
    */
-  private int indexI, indexJ, indexK;
+  int indexI, indexJ, indexK;
   private Atom atomI, atomJ, atomK;
-  private Point3f centerI, centerJ, centerK;
+  Point3f centerI, centerJ, centerK;
   private float radiusI, radiusJ, radiusK;
   private float radiiIP2, radiiJP2, radiiKP2;
   private float distanceIJ2, distanceIK2, distanceJK2;
@@ -452,8 +452,8 @@
     float outerAngle;
     AxisAngle4f aaRotate;
     short colixI, colixJ;
-    int cavityCount;
-    Cavity[] cavities;
+    int cavityCountT;
+    Cavity[] cavitiesT;
     Vector3f outerVector;
     float outerRadians;
     Point3f[][] stripPointArrays;
@@ -528,17 +528,17 @@
     }
 
     void addCavity(Cavity cavity) {
-      if (cavities == null)
-        cavities = new Cavity[4];
-      else if (cavityCount == cavities.length)
-        cavities = (Cavity[])Util.doubleLength(cavities);
-      cavities[cavityCount++] = cavity;
+      if (cavitiesT == null)
+        cavitiesT = new Cavity[4];
+      else if (cavityCountT == cavitiesT.length)
+        cavitiesT = (Cavity[])Util.doubleLength(cavitiesT);
+      cavitiesT[cavityCountT++] = cavity;
     }
       
     void checkAngles() {
-      for (int i = cavityCount; --i >= 0; ) {
+      for (int i = cavityCountT; --i >= 0; ) {
         float cavityAngle = -999;
-        Cavity cavity = cavities[i];
+        Cavity cavity = cavitiesT[i];
         if (cavity.ixI == ixI) {
           if (cavity.ixJ == ixJ)
             cavityAngle = cavity.radiansIJ;
@@ -562,7 +562,7 @@
 
     void whyIsThisCavityHere(int cavityIndex) {
       
-      Cavity cavity = cavities[cavityIndex];
+      Cavity cavity = cavitiesT[cavityIndex];
       System.out.println("torus ixI=" + ixI + " ixJ=" + ixJ +
                          " cavity ixI=" + cavity.ixI +
                          " ixJ=" + cavity.ixJ + " ixK=" + cavity.ixK);
@@ -618,7 +618,7 @@
     }
     Point3f center = calcTorusCenter();
 
-    float holeRadius = radius - radiusP;
+    //float holeRadius = radius - radiusP;
     for (int n = neighborCount; --n >= 0; ) {
       int k = neighborIndexes[n];
       if (k == indexJ)