Changeset 14208

Timestamp:

12/20/12 14:21:47 (12 years ago)

Author:

ltnguyen

Message:

Fixed: Layout, and slider

Location:

issm/trunk-jpl/src/android/ISSM

Files:

• res/layout/activity_issm.xml (modified) (2 diffs)
• src/com/example/issm/ISSM.java (modified) (3 diffs)
• src/com/example/issm/MyGLRenderer.java (modified) (1 diff)

issm/trunk-jpl/src/android/ISSM/res/layout/activity_issm.xml

@@ -12 +12 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
+        android:progress="90"
+        android:max="490"
         android:layout_marginBottom="41dp" />
 
@@ -21 +23 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="15dp"
-        android:text="alpha value = 0" />
+        android:text="Friction Scaling: 100%" />
 
     <FrameLayout

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

@@ -37 +37 @@
     private ColorMap colorMap;
     private int alpha;
-
+    private final int MINIMUM = 0;
+    private final int OFFSET = 10;
     @Override
   //------------------------------------------------------------------------------------------------    
@@ -50 +51 @@
                 }
         }
+        alpha = 90 + OFFSET;
         setContentView(R.layout.activity_issm);
         this.bar  = (SeekBar) findViewById(R.id.seekBar);
@@ -60 +62 @@
                 public void onProgressChanged(SeekBar seekBar, int progress,boolean fromUser)
                 {
-                        alpha = progress;
+        
+                        alpha = progress + OFFSET;
+                        txtValue.setText("Friction Scaling: " +  alpha + "%");
                 }
 

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

@@ -235 +235 @@
                 mProjectionMatrix = new float[triangleVert.length][16];
                 for (int i = 0; i < triangleVert.length; i++)
-                        Matrix.frustumM(mProjectionMatrix[i], 0, -ratio*0.5f, ratio*1.0f, 0.0f, 1.0f, 1.0f, 14f);
+                        Matrix.frustumM(mProjectionMatrix[i], 0, -ratio*0.7f, ratio*1.0f, 0.0f, 1.0f, 1.0f, 14f);
                 //Matrix.frustumM(m, offset, left, right, bottom, top, near, far)
     }