Changeset 14192

Timestamp:

12/18/12 12:20:37 (12 years ago)

Author:

Eric.Larour

Message:

CHG: scaling in x and y axis

File:

• issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLSurfaceView.java (modified) (2 diffs)

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLSurfaceView.java ¶

@@ -34 +34 @@
         //indexes prefer to velocity at each vertices of triangles.
         double alpha1, alpha2, alpha3;
-        final int SCALE_FACTOR = 700000;
+                float  xmin,xmax,ymin,ymax;
+        final int XSCALE_FACTOR = 1;
+        final int YSCALE_FACTOR = 2;
         RGB rgb = new RGB();
-                for (int i = 0; i < size; i++)
-                {
-                                f[i][0] = (float)db.get(12*i+0)/SCALE_FACTOR;
-                                f[i][1] = (float)db.get(12*i+1)/SCALE_FACTOR;
-                                f[i][2] = (float)db.get(12*i+2)/SCALE_FACTOR;
-                                f[i][7] = (float)db.get(12*i+3)/SCALE_FACTOR;
-                                f[i][8] = (float)db.get(12*i+4)/SCALE_FACTOR;
-                                f[i][9] = (float)db.get(12*i+5)/SCALE_FACTOR;
-                                f[i][14] = (float)db.get(12*i+6)/SCALE_FACTOR;
-                                f[i][15] = (float)db.get(12*i+7)/SCALE_FACTOR;
-                                f[i][16] = (float)db.get(12*i+8)/SCALE_FACTOR;
+
+                for (int i = 0; i < size; i++) {
+                                f[i][0] = (float)db.get(12*i+0);
+                                f[i][1] = (float)db.get(12*i+1);
+                                f[i][2] = (float)db.get(12*i+2);
+                                f[i][7] = (float)db.get(12*i+3);
+                                f[i][8] = (float)db.get(12*i+4);
+                                f[i][9] = (float)db.get(12*i+5);
+                                f[i][14] = (float)db.get(12*i+6);
+                                f[i][15] = (float)db.get(12*i+7);
+                                f[i][16] = (float)db.get(12*i+8);
                                 
                                 f[i][6] = 1.0f;
@@ -85 +87 @@
 
                 }
+
+                /*scale coordinates: */
+                xmin=0; ymin=0; xmax=0; ymax=0;
+
+                for (int i = 0; i < size; i++) {
+                        if (f[i][0]<xmin) xmin=f[i][0];
+                        if (f[i][0]>xmax) xmax=f[i][0];
+
+                        if (f[i][1]<ymin) ymin=f[i][1];
+                        if (f[i][1]>ymax) ymax=f[i][1];
+                }
+                
+                for (int i = 0; i < size; i++) {
+                                f[i][0] =  (f[i][0]-xmin)/(xmax-xmin)*XSCALE_FACTOR;
+                                f[i][1] =  (f[i][1]-ymin)/(ymax-ymin)*YSCALE_FACTOR;
+                                f[i][7] =  (f[i][7]-xmin)/(xmax-xmin)*XSCALE_FACTOR;
+                                f[i][8] =  (f[i][8]-ymin)/(ymax-ymin)*YSCALE_FACTOR;
+                                f[i][14] =  (f[i][14]-xmin)/(xmax-xmin)*XSCALE_FACTOR;
+                                f[i][15] =  (f[i][15]-ymin)/(ymax-ymin)*YSCALE_FACTOR;
+                }
+                        
         mRend = new MyGLRenderer(f);
         // Set the Renderer for drawing on the GLSurfaceView