source: issm/oecreview/Archive/14312-15392/ISSM-14338-14339.diff

../trunk-jpl/src/android/ISSM/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>ISSM</name>
+        <name>ISSM_Android</name>
         <comment></comment>
         <projects>
         </projects>

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

@@ -137 +137 @@
     public void onSurfaceCreated(GL10 unused, EGLConfig config) 
     {
         // Set the background frame color
-        GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+        GLES20.glClearColor(0.2f, 0.4f, 1.0f, 1.0f);
         
                 // Position the eye behind the origin.
                 eyeX = 0.0f;
@@ -273 +273 @@
                 
                 mProjectionMatrix = new float[triangleVert.length][16];
                 for (int i = 0; i < triangleVert.length; i++)
-                        Matrix.frustumM(mProjectionMatrix[i], 0, -ratio*0.7f, ratio*1.0f, 0.0f, 1.0f, 1.0f, 14f);
+                        Matrix.frustumM(mProjectionMatrix[i], 0, -ratio, ratio, -1, 1, 1f, 5);
+                        
     }
     
     public void onDrawFrame(GL10 glUnused) 

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

@@ -95 +95 @@
 
                 }
 
-                /*scale coordinates: */
+        
                 xmin=0; ymin=0; xmax=0; ymax=0;
 
                 for (int i = 0; i < size; i++) {
@@ -105 +105 @@
                         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;
+                                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;
                 }
-                
-                //Random r = new Random();
-                //float z1,z2,z3;
-                for(int i = 0 ; i <size; i++)
-                {
-                        //r.nextFloat() will generate random from 0-1
-                        
-                        System.out.println(f[i][2]);
-                        System.out.println(f[i][9]);
-                        System.out.println(f[i][16]);
-                        
-                        //System.out.println("z = " + z1 + "," + z2 + "," + z3);
-                        //System.out.println("x = " + f[i][1] + "," + f[i][7] + "," + f[i][14]);
-                }
-                        
+                                
         mRend = new MyGLRenderer(f);
         // Set the Renderer for drawing on the GLSurfaceView
         setRenderer(mRend);