Skip to content

Fix Culture settings when serializing floats and doubles #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaze-xiv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Culture settings when serializing floats and doubles #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion LSLib/LS/Matrix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ OTHER DEALINGS IN THE SOFTWARE.

namespace LSLib.LS;

using System.Globalization;

public class Matrix
{
Expand Down Expand Up @@ -257,7 +258,7 @@ public static Matrix Parse(string ps) // Function parses
for (int i = 0; i < rows.Length; i++)
{
nums = rows[i].Split(' ');
for (int j = 0; j < nums.Length; j++) matrix[i, j] = double.Parse(nums[j]);
for (int j = 0; j < nums.Length; j++) matrix[i, j] = double.Parse(nums[j], CultureInfo.InvariantCulture);
}
}
catch (FormatException) { throw new MException("Wrong input format!"); }
Expand Down
12 changes: 10 additions & 2 deletions LSLib/LS/NodeAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace LSLib.LS;

using System.Globalization;

public class TranslatedString
{
public UInt16 Version = 0;
Expand Down Expand Up @@ -243,12 +245,12 @@ public string AsString(NodeSerializationSettings settings)
case AttributeType.IVec2:
case AttributeType.IVec3:
case AttributeType.IVec4:
return String.Join(" ", new List<int>((int[])value).ConvertAll(i => i.ToString()).ToArray());
return String.Join(" ", new List<int>((int[])value).ConvertAll(i => i.ToString(CultureInfo.InvariantCulture)).ToArray());

case AttributeType.Vec2:
case AttributeType.Vec3:
case AttributeType.Vec4:
return String.Join(" ", new List<float>((float[])value).ConvertAll(i => i.ToString()).ToArray());
return String.Join(" ", new List<float>((float[])value).ConvertAll(i => i.ToString(CultureInfo.InvariantCulture)).ToArray());

case AttributeType.UUID:
if (settings.ByteSwapGuids)
Expand All @@ -260,6 +262,12 @@ public string AsString(NodeSerializationSettings settings)
return value.ToString();
}

case AttributeType.Float:
return ((float) value).ToString(CultureInfo.InvariantCulture);

case AttributeType.Double:
return ((double) value).ToString(CultureInfo.InvariantCulture);

default:
return value.ToString();
}
Expand Down
3 changes: 3 additions & 0 deletions LSLib/LS/Resources/LSJ/LSJReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace LSLib.LS;

using System.Globalization;

public class LSJReader(Stream stream) : IDisposable
{
private readonly Stream stream = stream;
Expand All @@ -16,6 +18,7 @@ public Resource Read()
{
var settings = new JsonSerializerSettings();
settings.Converters.Add(new LSJResourceConverter(SerializationSettings));
settings.Culture = CultureInfo.InvariantCulture;
var serializer = JsonSerializer.Create(settings);

using var streamReader = new StreamReader(stream);
Expand Down
8 changes: 5 additions & 3 deletions LSLib/LS/Resources/LSJ/LSJResourceConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace LSLib.LS;

using System.Globalization;

public class LSJResourceConverter(NodeSerializationSettings settings) : JsonConverter
{
private LSMetadata Metadata;
Expand Down Expand Up @@ -200,11 +202,11 @@ private NodeAttribute ReadAttribute(JsonReader reader)
break;

case AttributeType.Float:
attribute.Value = Convert.ToSingle(reader.Value);
attribute.Value = Convert.ToSingle(reader.Value, CultureInfo.InvariantCulture);
break;

case AttributeType.Double:
attribute.Value = Convert.ToDouble(reader.Value);
attribute.Value = Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture);
break;

case AttributeType.Bool:
Expand Down Expand Up @@ -304,7 +306,7 @@ private NodeAttribute ReadAttribute(JsonReader reader)

float[] vec = new float[length];
for (int i = 0; i < length; i++)
vec[i] = float.Parse(nums[i]);
vec[i] = float.Parse(nums[i], CultureInfo.InvariantCulture);

attribute.Value = vec;
break;
Expand Down
3 changes: 3 additions & 0 deletions LSLib/LS/Resources/LSJ/LSJWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace LSLib.LS;

using System.Globalization;

public class LSJWriter(Stream stream)
{
private readonly Stream stream = stream;
Expand All @@ -21,6 +23,7 @@ public void Write(Resource rsrc)
using var writer = new JsonTextWriter(streamWriter);
writer.IndentChar = '\t';
writer.Indentation = 1;
writer.Culture = CultureInfo.InvariantCulture;
serializer.Serialize(writer, rsrc);
}
}
20 changes: 11 additions & 9 deletions LSLib/LS/Resources/LSX/LSXReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace LSLib.LS;

using System.Globalization;

public class LSXReader(Stream stream) : IDisposable
{
private Stream stream = stream;
Expand Down Expand Up @@ -215,27 +217,27 @@ private void ReadElement()
case "float2":
{
var val = (float[])LastAttribute.Value;
val[ValueOffset++] = Single.Parse(reader["x"]);
val[ValueOffset++] = Single.Parse(reader["y"]);
val[ValueOffset++] = Single.Parse(reader["x"], CultureInfo.InvariantCulture);
val[ValueOffset++] = Single.Parse(reader["y"], CultureInfo.InvariantCulture);
break;
}

case "float3":
{
var val = (float[])LastAttribute.Value;
val[ValueOffset++] = Single.Parse(reader["x"]);
val[ValueOffset++] = Single.Parse(reader["y"]);
val[ValueOffset++] = Single.Parse(reader["z"]);
val[ValueOffset++] = Single.Parse(reader["x"], CultureInfo.InvariantCulture);
val[ValueOffset++] = Single.Parse(reader["y"], CultureInfo.InvariantCulture);
val[ValueOffset++] = Single.Parse(reader["z"], CultureInfo.InvariantCulture);
break;
}

case "float4":
{
var val = (float[])LastAttribute.Value;
val[ValueOffset++] = Single.Parse(reader["x"]);
val[ValueOffset++] = Single.Parse(reader["y"]);
val[ValueOffset++] = Single.Parse(reader["z"]);
val[ValueOffset++] = Single.Parse(reader["w"]);
val[ValueOffset++] = Single.Parse(reader["x"], CultureInfo.InvariantCulture);
val[ValueOffset++] = Single.Parse(reader["y"], CultureInfo.InvariantCulture);
val[ValueOffset++] = Single.Parse(reader["z"], CultureInfo.InvariantCulture);
val[ValueOffset++] = Single.Parse(reader["w"], CultureInfo.InvariantCulture);
break;
}

Expand Down
4 changes: 3 additions & 1 deletion LSLib/LS/Story/Database.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace LSLib.LS.Story;

using System.Globalization;

public class Fact : OsirisSerializable
{
public List<Value> Columns;
Expand Down Expand Up @@ -121,7 +123,7 @@ public override void SetValue(object component, object value)

case Value.Type.Float:
{
if (value is String) column.FloatValue = Single.Parse((String)value);
if (value is String) column.FloatValue = Single.Parse((String)value, CultureInfo.InvariantCulture);
else if (value is Single) column.FloatValue = (Single)value;
else throw new ArgumentException("Invalid float value");
break;
Expand Down