Merge tag 'v155' into be

Author: BalaM314

arc-core/src/arc/Files.java

@@ -53,6 +53,11 @@ default String getCachePath(){
         return local("cache").absolutePath();
     }
 
+    /** @return on IOS, the internal path to the assets directory. Not used on other platforms. */
+    default String getInternalStoragePath(){
+        return "";
+    }
+
     /**
      * @return the external storage path directory. This is the SD card on Android and the home directory of the current user on
      * the desktop.

arc-core/src/arc/Input.java

@@ -235,6 +235,11 @@ public float axisTap(KeyBind key){
     public void getTextInput(TextInput input){
     }
 
+    /** @return on mobile, whether text input is currently being fetched. Not implemented on other platforms. */
+    public boolean isShowingTextInput(){
+        return false;
+    }
+
     /**
      * Sets the on-screen keyboard visible if available. Only applicable on mobile.
      * @param visible visible or not
@@ -357,6 +362,11 @@ public Orientation getNativeOrientation(){
         return Orientation.landscape;
     }
 
+    /** Internal method for looking up a key's name based on keyboard layout. Internal use only - use {@link KeyCode#getName()} instead. */
+    public String getKeyName(KeyCode code){
+        return code.value;
+    }
+
     public enum Orientation{
         landscape, portrait
     }

arc-core/src/arc/audio/Audio.java

@@ -15,8 +15,8 @@ public class Audio implements Disposable{
     public int defaultSoundMaxConcurrent = 6;
 
     boolean initialized;
-    float sfxVolume = 0f;
 
+    public float sfxVolume = 0f;
     /** Global bus for all sounds. */
     public AudioBus soundBus = new AudioBus();
     /** Global bus for all music. */

arc-core/src/arc/audio/Music.java

@@ -1,6 +1,7 @@
 package arc.audio;
 
 import arc.*;
+import arc.Files.*;
 import arc.files.*;
 import arc.util.*;
 

arc-core/src/arc/input/KeyCode.java

@@ -1,5 +1,6 @@
 package arc.input;
 
+import arc.*;
 import arc.input.KeyBind.*;
 
 /** Enum for storing input codes of mouse, keyboard and controllers. */
@@ -206,6 +207,8 @@ public enum KeyCode implements KeybindValue{
     public final String value;
     public final boolean axis;
 
+    private String cachedName;
+
     KeyCode(KeyType type, String value){
         this(type, value, false);
     }
@@ -221,9 +224,18 @@ public static KeyCode byOrdinal(int id){
         return all[id];
     }
 
+    /** @return a human-friendly name based on keyboard layout. */
+    public String getName(){
+        if(cachedName == null){
+            cachedName = Core.input == null ? value : Core.input.getKeyName(this);
+            if(cachedName == null || cachedName.isEmpty()) cachedName = value;
+        }
+        return cachedName;
+    }
+
     @Override
     public String toString(){
-        return value;
+        return getName();
     }
 
     public enum KeyType{

arc-core/src/arc/math/geom/Geometry.java

@@ -112,6 +112,20 @@ public static <T extends Position> T findClosest(float x, float y, Iterable<T> l
         return closest;
     }
 
+    public static <T extends Position> T findClosest(float x, float y, Iterable<T> list, Boolf<T> predicate){
+        T closest = null;
+        float cdist = 0f;
+        for(T t : list){
+            if(!predicate.get(t)) continue;
+            float dst = t.dst2(x, y);
+            if(closest == null || dst < cdist){
+                closest = t;
+                cdist = dst;
+            }
+        }
+        return closest;
+    }
+
     public static <T extends Position> T findFurthest(float x, float y, Iterable<T> list){
         T furthest = null;
         float fdist = 0f;
@@ -125,6 +139,20 @@ public static <T extends Position> T findFurthest(float x, float y, Iterable<T>
         return furthest;
     }
 
+    public static <T extends Position> T findFurthest(float x, float y, Iterable<T> list, Boolf<T> predicate){
+        T furthest = null;
+        float fdist = 0f;
+        for(T t : list){
+            if(!predicate.get(t)) continue;
+            float dst = t.dst2(x, y);
+            if(furthest == null || dst > fdist){
+                furthest = t;
+                fdist = dst;
+            }
+        }
+        return furthest;
+    }
+
     public static Vec2[] pixelCircle(float tindex){
         return pixelCircle(tindex, (index, x, y) -> Mathf.dst(x, y, index, index) < index - 0.5f);
     }

arc-core/src/arc/util/Strings.java

@@ -7,6 +7,7 @@
 import java.io.*;
 import java.net.*;
 import java.nio.charset.*;
+import java.util.*;
 import java.util.regex.*;
 
 public class Strings{
@@ -285,6 +286,30 @@ public static String join(String separator, Iterable<String> strings){
     public static int levenshtein(String x, String y){
         int[][] dp = new int[x.length() + 1][y.length() + 1];
 
+        for(int i = 0; i <= x.length(); i++){
+            for(int j = 0; j <= y.length(); j++){
+                if(i == 0){
+                    dp[i][j] = j;
+                }else if(j == 0){
+                    dp[i][j] = i;
+                }else{
+                    dp[i][j] = Math.min(Math.min(dp[i - 1][j - 1] + (x.charAt(i - 1) == y.charAt(j - 1) ? 0 : 1),
+                    dp[i - 1][j] + 1),
+                    dp[i][j - 1] + 1);
+                }
+            }
+        }
+
+        return dp[x.length()][y.length()];
+    }
+
+    /** Returns the case-independent biased levenshtein distance between two strings. */
+    public static float biasedLevenshtein(String x, String y){
+        x = x.toLowerCase(Locale.ROOT);
+        y = y.toLowerCase(Locale.ROOT);
+
+        int[][] dp = new int[x.length() + 1][y.length() + 1];
+
         for(int i = 0; i <= x.length(); i++){
             for(int j = 0; j <= y.length(); j++){
                 if(i == 0){
@@ -300,7 +325,11 @@ public static int levenshtein(String x, String y){
             }
         }
 
-        return dp[x.length()][y.length()];
+        float output = dp[x.length()][y.length()];
+        if(y.startsWith(x) || x.startsWith(y)){
+            return output / 3f;
+        }
+        return (y.contains(x) || x.contains(y)) ? output / 1.5f : output;
     }
 
     public static String animated(float time, int length, float scale, String replacement){

arc-core/src/arc/util/serialization/Jval.java

@@ -716,6 +716,15 @@ static Jval tryParseNumber(StringBuilder value, boolean stopAtNext){
                 while(idx < len && isDigit(value.charAt(idx))) idx++;
             }
 
+            // exp
+            if(idx < len && Character.toLowerCase(value.charAt(idx)) == 'e'){
+                idx++;
+                if(idx < len && (value.charAt(idx) == '+' || value.charAt(idx) == '-')) idx++;
+
+                if(idx >= len || !isDigit(value.charAt(idx++))) return null;
+                while(idx < len && isDigit(value.charAt(idx))) idx++;
+            }
+
             int last = idx;
             while(idx < len && isWhiteSpace(value.charAt(idx))) idx++;
 

arc-core/test/utils/JvalTest.java

@@ -10,6 +10,13 @@
 
 public class JvalTest{
 
+    @Test
+    public void parseExponential(){
+        Jval val = Jval.read("{a: 1e-4, b: 1e92}");
+        assertEquals(1e-4f, val.getDouble("a", 0f), 0.00001f);
+        assertEquals(1e92, val.getDouble("b", 0f), 0.00001f);
+    }
+
     @Test
     public void parseUnquotedStringArray(){
         Jval val = Jval.read("{\nkey: [result, result2]\n}");

backends/backend-android/src/arc/backend/android/AndroidInput.java

@@ -77,6 +77,7 @@ protected TouchEvent newObject(){
     private int mouseLastX = 0;
     private int mouseLastY = 0;
     private boolean justTouched = false;
+    private boolean showingTextInput;
     private long currentEventTimeStamp = System.nanoTime();
     private Vec3 accel = new Vec3(), gyro = new Vec3(), orient = new Vec3();
     private SensorEventListener accelerometerListener;
@@ -157,7 +158,10 @@ public void getTextInput(TextInput info){
             alert.setView(input);
             alert.setPositiveButton(context.getString(android.R.string.ok), (dialog, whichButton) -> Core.app.post(() -> info.accepted.get(input.getText().toString())));
             alert.setNegativeButton(context.getString(android.R.string.cancel), (dialog, whichButton) -> Core.app.post(() -> info.canceled.run()));
-            alert.setOnCancelListener(arg0 -> Core.app.post(() -> info.canceled.run()));
+            alert.setOnCancelListener(a -> Core.app.post(() -> info.canceled.run()));
+            alert.setOnDismissListener(a -> showingTextInput = false);
+
+            showingTextInput = true;
             AlertDialog dialog = alert.show();
 
             input.addTextChangedListener(new TextWatcher(){
@@ -190,6 +194,11 @@ public void afterTextChanged(Editable editable){
         });
     }
 
+    @Override
+    public boolean isShowingTextInput(){
+        return showingTextInput;
+    }
+
     @Override
     public int mouseX(){
         synchronized(this){