Use invariant culture while working with floats in managed code

Author: weeeBox

Project/Assets/Editor/Tests/StringUtilsTest.cs

@@ -31,6 +31,55 @@
 
 public class StringUtilsTest
 {
+    #region Parsing
+
+    [Test]
+    public void TestParseFloat()
+    {
+        Assert.AreEqual(123f, StringUtils.ParseFloat("123"));
+        Assert.AreEqual(-123f, StringUtils.ParseFloat("-123"));
+        Assert.AreEqual(0f, StringUtils.ParseFloat("0", float.NaN));
+        Assert.AreEqual(3.14f, StringUtils.ParseFloat("3.14"));
+        Assert.AreEqual(-3.14f, StringUtils.ParseFloat("-3.14"));
+        Assert.AreEqual(float.NaN, StringUtils.ParseFloat("3.14f", float.NaN));
+        Assert.AreEqual(float.NaN, StringUtils.ParseFloat("abs", float.NaN));
+
+        float actual;
+        Assert.IsTrue(StringUtils.ParseFloat("123", out actual));
+        Assert.AreEqual(123f, actual);
+
+        Assert.IsTrue(StringUtils.ParseFloat("-123", out actual));
+        Assert.AreEqual(-123f, actual);
+
+        Assert.IsTrue(StringUtils.ParseFloat("0", out actual));
+        Assert.AreEqual(0f, actual);
+
+        Assert.IsTrue(StringUtils.ParseFloat("3.14", out actual));
+        Assert.AreEqual(3.14f, actual);
+
+        Assert.IsTrue(StringUtils.ParseFloat("-3.14", out actual));
+        Assert.AreEqual(-3.14f, actual);
+
+        Assert.IsFalse(StringUtils.ParseFloat("-3.14f", out _));
+        Assert.IsFalse(StringUtils.ParseFloat("abs", out _));
+    }
+
+    #endregion
+
+    #region String Representation
+
+    [Test]
+    public void TestFloatString()
+    {
+        Assert.AreEqual("3.14", StringUtils.ToString(3.14f));
+        Assert.AreEqual("-3.14", StringUtils.ToString(-3.14f));
+        Assert.AreEqual("0", StringUtils.ToString(0.0f));
+        Assert.AreEqual("123", StringUtils.ToString(123.0f));
+        Assert.AreEqual("-123", StringUtils.ToString(-123.0f));
+    }
+
+    #endregion
+
     #region Serialization
 
     [Test]

Project/Assets/LunarConsole/Scripts/LunarConsole.cs

@@ -548,7 +548,7 @@ void LoadVariables()
                                     continue;
                                 }
 
-                                cvar.Value = value;
+                                cvar.Value = FixLegacyValue(cvar.Type, value);
                                 m_platform.OnVariableUpdated(m_registry, cvar);
                             }
                         }
@@ -608,6 +608,17 @@ bool ShouldSaveVar(CVar cvar)
             return !cvar.IsDefault && !cvar.HasFlag(CFlags.NoArchive);
         }
 
+        private static string FixLegacyValue(CVarType type, string value)
+        {
+            // we need to fix incorrect value: https://github.com/SpaceMadness/lunar-unity-console/issues/201
+            if (type == CVarType.Float)
+            {
+                return value.Replace(',', '.');
+            }
+
+            return value;
+        }
+
         #endregion
 
         #region Messages
@@ -1253,7 +1264,7 @@ void ConsoleVariableSetHandler(IDictionary<string, string> data)
                     case CVarType.Float:
                     {
                         float floatValue;
-                        if (float.TryParse(value, out floatValue))
+                        if (StringUtils.ParseFloat(value, out floatValue))
                         {
                             variable.FloatValue = floatValue;
                             m_variablesDirty = true;

Project/Assets/LunarConsole/Scripts/Utils/StringUtils.cs

@@ -23,6 +23,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -32,6 +33,7 @@ namespace LunarConsolePluginInternal
 {
     public static class StringUtils
     {
+        private const NumberStyles FLOAT_NUMBER_STYLES = NumberStyles.Integer | NumberStyles.Float | NumberStyles.AllowDecimalPoint;
         private static readonly char[] kSpaceSplitChars = { ' ' };
 
         internal static string TryFormat(string format, params object[] args)
@@ -116,34 +118,19 @@ public static int ParseInt(string str, out bool succeed)
             return 0;
         }
 
-        public static float ParseFloat(string str)
+        public static float ParseFloat(string str, float defValue = 0.0f)
         {
-            return ParseFloat(str, 0.0f);
-        }
-
-        public static float ParseFloat(string str, float defValue)
-        {
-            if (!string.IsNullOrEmpty(str))
+            if (ParseFloat(str, out float result))
             {
-                float value;
-                bool succeed = float.TryParse(str, out value);
-                return succeed ? value : defValue;
+                return result;
             }
-
             return defValue;
         }
 
-        public static float ParseFloat(string str, out bool succeed)
+        public static bool ParseFloat(string str, out float result)
         {
-            if (!string.IsNullOrEmpty(str))
-            {
-                float value;
-                succeed = float.TryParse(str, out value);
-                return succeed ? value : 0.0f;
-            }
-
-            succeed = false;
-            return 0.0f;
+            // Force '.' as decimal point
+            return float.TryParse(str, FLOAT_NUMBER_STYLES, CultureInfo.InvariantCulture, out result);
         }
 
         public static bool ParseBool(string str)
@@ -543,79 +530,80 @@ internal static string NonNullOrEmpty(string str)
 
         #region string representation
 
-        internal static string ToString(object value)
+        public static string ToString(object value)
         {
             return value != null ? value.ToString() : null;
         }
-        
-        internal static string ToString(int value)
+
+        public static string ToString(int value)
         {
             return value.ToString();
         }
 
-        internal static string ToString(float value)
+        public static string ToString(float value)
         {
-            return value.ToString("G");
+            // For '.' as decimal point
+            return value.ToString("G", CultureInfo.InvariantCulture);
         }
 
-        internal static string ToString(bool value)
+        public static string ToString(bool value)
         {
             return value.ToString();
         }
 
-        internal static string ToString(ref Color value)
+        public static string ToString(ref Color value)
         {
             if (value.a > 0.0f)
             {
                 return string.Format("{0} {1} {2} {3}", 
-                    value.r.ToString("G"), 
-                    value.g.ToString("G"), 
-                    value.b.ToString("G"), 
-                    value.a.ToString("G")
+                    ToString(value.r),
+                    ToString(value.g),
+                    ToString(value.b),
+                    ToString(value.a)
                 );
             }
 
-            return string.Format("{0} {1} {2}", 
-                value.r.ToString("G"), 
-                value.g.ToString("G"), 
-                value.b.ToString("G")
+            return string.Format("{0} {1} {2}",
+                ToString(value.r),
+                ToString(value.g),
+                ToString(value.b)
             );
         }
 
-        internal static string ToString(ref Rect value)
+        public static string ToString(ref Rect value)
         {
             return string.Format("{0} {1} {2} {3}", 
-                value.x.ToString("G"), 
-                value.y.ToString("G"), 
-                value.width.ToString("G"), 
-                value.height.ToString("G")
+                ToString(value.x), 
+                ToString(value.y), 
+                ToString(value.width), 
+                ToString(value.height)
             );
         }
 
-        internal static string ToString(ref Vector2 value)
+        public static string ToString(ref Vector2 value)
         {
             return string.Format("{0} {1}", 
-                value.x.ToString("G"), 
-                value.y.ToString("G")
+                ToString(value.x), 
+                ToString(value.y)
             );
         }
 
-        internal static string ToString(ref Vector3 value)
+        public static string ToString(ref Vector3 value)
         {
             return string.Format("{0} {1} {2}", 
-                value.x.ToString("G"), 
-                value.y.ToString("G"), 
-                value.z.ToString("G")
+                ToString(value.x), 
+                ToString(value.y), 
+                ToString(value.z)
             );
         }
 
-        internal static string ToString(ref Vector4 value)
+        public static string ToString(ref Vector4 value)
         {
             return string.Format("{0} {1} {2} {3}", 
-                value.x.ToString("G"), 
-                value.y.ToString("G"), 
-                value.z.ToString("G"), 
-                value.w.ToString("G")
+                ToString(value.x), 
+                ToString(value.y), 
+                ToString(value.z), 
+                ToString(value.w)
             );
         }