commit 8a40abf4170289abd6dd1b010d024b7ca31749c9
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Apr 7 23:46:28 2019 +0100

    Rubk App: improve 4 buttons in the top.

diff --git a/src/main/java/org/distorted/examples/rubik/RubikCube.java b/src/main/java/org/distorted/examples/rubik/RubikCube.java
index a63f33d..8f43700 100644
--- a/src/main/java/org/distorted/examples/rubik/RubikCube.java
+++ b/src/main/java/org/distorted/examples/rubik/RubikCube.java
@@ -87,7 +87,7 @@ class RubikCube
       Static3D center = new Static3D(TEXTURE_SIZE*0.5f, TEXTURE_SIZE*0.5f, TEXTURE_SIZE*0.5f);
       Static4D region = new Static4D(0,0,0, TEXTURE_SIZE*0.72f);
 
-      VertexEffectSink        sinkEffect = new VertexEffectSink( new Static1D(3.0f - 1.8f/mSize), center, region );
+      VertexEffectSink        sinkEffect = new VertexEffectSink( new Static1D(getSinkStrength()), center, region );
       MatrixEffectMove        moveEffect = new MatrixEffectMove(move);
       MatrixEffectScale      scaleEffect = new MatrixEffectScale(scale);
       MatrixEffectQuaternion quatCEffect = new MatrixEffectQuaternion(quatC, center);
@@ -286,6 +286,20 @@ class RubikCube
               }
       }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+    private float getSinkStrength()
+      {
+      switch(mSize)
+        {
+        case 1 : return 1.1f;
+        case 2 : return 1.5f;
+        case 3 : return 1.8f;
+        case 4 : return 2.0f;
+        default: return 3.0f - 4.0f/mSize;
+        }
+      }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
     private boolean belongsToRotation(int x, int y, int z, int vector, int row)
diff --git a/src/main/java/org/distorted/examples/rubik/RubikRenderer.java b/src/main/java/org/distorted/examples/rubik/RubikRenderer.java
index 2b21b30..e3702d4 100644
--- a/src/main/java/org/distorted/examples/rubik/RubikRenderer.java
+++ b/src/main/java/org/distorted/examples/rubik/RubikRenderer.java
@@ -38,7 +38,7 @@ class RubikRenderer implements GLSurfaceView.Renderer, EffectListener
 {
     private static final int NUM_CUBES = 4;
     private static final float CUBE_SCREEN_RATIO = 0.5f;
-    private static final float CAMERA_DISTANCE   = 0.5f;  // 0.5 of the length of max(scrHeight,scrWidth)
+    private static final float CAMERA_DISTANCE   = 0.6f;  // 0.6 of the length of max(scrHeight,scrWidth)
 
     private RubikSurfaceView mView;
     private DistortedScreen mScreen;
diff --git a/src/main/res/drawable/button_rubik2.png b/src/main/res/drawable/button_rubik2.png
new file mode 100644
index 0000000..b1933ca
Binary files /dev/null and b/src/main/res/drawable/button_rubik2.png differ
diff --git a/src/main/res/drawable/button_rubik3.png b/src/main/res/drawable/button_rubik3.png
new file mode 100644
index 0000000..610a059
Binary files /dev/null and b/src/main/res/drawable/button_rubik3.png differ
diff --git a/src/main/res/drawable/button_rubik4.png b/src/main/res/drawable/button_rubik4.png
new file mode 100644
index 0000000..f13cf66
Binary files /dev/null and b/src/main/res/drawable/button_rubik4.png differ
diff --git a/src/main/res/layout/rubiklayout.xml b/src/main/res/layout/rubiklayout.xml
index 42e0a37..ce891fb 100644
--- a/src/main/res/layout/rubiklayout.xml
+++ b/src/main/res/layout/rubiklayout.xml
@@ -12,7 +12,7 @@
         android:paddingBottom="10dp"
         android:paddingTop="10dp" >
 
-        <Button
+        <ImageButton
             android:id="@+id/rubikSize2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,9 +22,9 @@
             android:onClick="setSize"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:text="@string/swirl" />
+            android:src="@drawable/button_rubik2"/>
 
-        <Button
+        <ImageButton
             android:id="@+id/rubikSize3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -34,9 +34,9 @@
             android:onClick="setSize"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:text="@string/bubble" />
+            android:src="@drawable/button_rubik3"/>
 
-        <Button
+        <ImageButton
             android:id="@+id/rubikSize4"
             android:layout_width="54dp"
             android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
             android:onClick="setSize"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:text="@string/sink" />
+            android:src="@drawable/button_rubik4"/>
 
         <Button
             android:id="@+id/rubikScramble"
@@ -58,7 +58,7 @@
             android:onClick="Scramble"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
-            android:text="@string/alpha" />
+            android:text="@string/scramble" />
 
     </LinearLayout>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 45f9de3..8a3a614 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -80,6 +80,7 @@
     <string name="none">None</string>
     <string name="effect_live">LIVE </string>
     <string name="effect_finished">FINISHED </string>
+    <string name="scramble">Scramble</string>
 
     <string name="quality0">Highest</string>
     <string name="quality1">High</string>