Changeset 14491

Timestamp:

03/31/13 19:44:18 (12 years ago)

Author:

Eric.Larour

Message:

CHG: do need to have x and y scale factor on first draw

File:

• issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MyGLSurfaceView.java (modified) (2 diffs)

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/MyGLSurfaceView.java

@@ -41 +41 @@
         double alpha1, alpha2, alpha3;
                 float  xmin,xmax,ymin,ymax;
-        //final int XSCALE_FACTOR = 1;
-        //final int YSCALE_FACTOR = 2;
+        final double XSCALE_FACTOR = 1;
+        final double YSCALE_FACTOR = 1.5;
         RGB rgb = new RGB();
 
@@ -106 +106 @@
                                 
                 for (int i = 0; i < size; i++) {
-                                f[i][0] =  2*(f[i][0]-xmin)/(xmax-xmin)-1;
-                                f[i][1] =  2*(f[i][1]-ymin)/(ymax-ymin)-1;
-                                f[i][7] =  2*(f[i][7]-xmin)/(xmax-xmin)-1;
-                                f[i][8] =  2*(f[i][8]-ymin)/(ymax-ymin)-1;
-                                f[i][14] =  2*(f[i][14]-xmin)/(xmax-xmin)-1;
-                                f[i][15] =  2*(f[i][15]-ymin)/(ymax-ymin)-1;
+                                f[i][0] =  (float)XSCALE_FACTOR*2*(f[i][0]-xmin)/(xmax-xmin)-1;
+                                f[i][1] =  (float)YSCALE_FACTOR*2*(f[i][1]-ymin)/(ymax-ymin)-1;
+                                f[i][7] =  (float)XSCALE_FACTOR*2*(f[i][7]-xmin)/(xmax-xmin)-1;
+                                f[i][8] =  (float)YSCALE_FACTOR*2*(f[i][8]-ymin)/(ymax-ymin)-1;
+                                f[i][14] =  (float)XSCALE_FACTOR*2*(f[i][14]-xmin)/(xmax-xmin)-1;
+                                f[i][15] =  (float)YSCALE_FACTOR*2*(f[i][15]-ymin)/(ymax-ymin)-1;
                 }