Skip to content

Commit 695071a

Browse files
committed
Fixes #7
1 parent 5b2b516 commit 695071a

17 files changed

Lines changed: 84 additions & 32 deletions

Source/Assets/Parameters_06_Complex.txt.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"androidStore":"GooglePlay"}

Source/Assets/Resources/BillingMode.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

Source/Assets/Scenes/Main3D.unity

8 Bytes
Binary file not shown.

Source/Assets/Scripts/DataSaver.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ public static void saveLocationData(Rock rock, string saveFolder)
1010

1111
var csv = new System.Text.StringBuilder();
1212
csv.AppendLine("Name PositionX PositionY PositionZ RotationEu1 RotationEu2 RotationEu3 ScaleX ScaleY ScaleZ Mass Density Volume SurfaceArea");
13+
System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
14+
1315

1416
for (int bedNumber = 0; bedNumber < nBeds; bedNumber++)
1517
{

Source/Assets/Scripts/Distribution.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections;
22
using UnityEngine;
3+
using System.Globalization;
34

45
public class Distribution{
56

@@ -86,8 +87,8 @@ public Distribution(float[,] pdfData)
8687
if (textData[i][0] != '-')
8788
{
8889
string[] splitText = textData[i].Split(',');
89-
readData[i, 0] = float.Parse(splitText[0].Trim());
90-
readData[i, 1] = float.Parse(splitText[1].Trim());
90+
readData[i, 0] = float.Parse(splitText[0].Trim(), CultureInfo.InvariantCulture);
91+
readData[i, 1] = float.Parse(splitText[1].Trim(), CultureInfo.InvariantCulture);
9192
}
9293
}
9394
}

Source/Assets/Scripts/ParameterGroup.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using UnityEngine;
22
using System.Collections;
3+
using System.Globalization;
34

45
public class ParameterGroup
56
{
@@ -81,14 +82,14 @@ public string getString(string parameterNameString) {
8182
//===================================================================
8283
public float getFloat(string parameterNameString) {
8384
int results = System.Array.FindIndex(parameterName, s => s.Equals(parameterNameString));
84-
return (float.Parse(parameterValue[results]));
85+
return (float.Parse(parameterValue[results], CultureInfo.InvariantCulture));
8586
}
8687
//===================================================================
8788

8889
//===================================================================
8990
public int getInteger(string parameterNameString) {
9091
int results = System.Array.FindIndex(parameterName, s => s.Equals(parameterNameString));
91-
return (int.Parse(parameterValue[results]));
92+
return (int.Parse(parameterValue[results], CultureInfo.InvariantCulture));
9293
}
9394
//===================================================================
9495

@@ -121,7 +122,7 @@ public Vector2 getVector2(string parameterNameString)
121122
string[] resultsString = parameterValue[results].Split(' ');
122123
resultsString[0] = resultsString[0].Remove(0, 1);
123124
resultsString[1] = resultsString[1].Remove(resultsString[1].Length - 1);
124-
Vector2 resultValue = new Vector2(float.Parse(resultsString[0]), float.Parse(resultsString[1]));
125+
Vector2 resultValue = new Vector2(float.Parse(resultsString[0], CultureInfo.InvariantCulture), float.Parse(resultsString[1], CultureInfo.InvariantCulture));
125126
return resultValue;
126127
}
127128

@@ -140,13 +141,13 @@ public Color getColor(string parameterNameString)
140141
resultsString[0] = resultsString[0].Remove(0, 1);
141142
resultsString[3] = resultsString[3].Remove(resultsString[3].Length - 1);
142143

143-
float r = float.Parse(resultsString[0])/ 255f;
144+
float r = float.Parse(resultsString[0], CultureInfo.InvariantCulture) / 255f;
144145

145-
float g = float.Parse(resultsString[1])/ 255f;
146+
float g = float.Parse(resultsString[1], CultureInfo.InvariantCulture) / 255f;
146147

147-
float b = float.Parse(resultsString[2])/ 255f;
148+
float b = float.Parse(resultsString[2], CultureInfo.InvariantCulture) / 255f;
148149

149-
float a = float.Parse(resultsString[3])/ 255f;
150+
float a = float.Parse(resultsString[3], CultureInfo.InvariantCulture) / 255f;
150151

151152
Color color = new Color(r,g,b,a);
152153
return color;
@@ -165,11 +166,11 @@ public Vector2 GetRange(string parameterNameString)
165166
{
166167
resultsString[0] = resultsString[0].Remove(0, 1);
167168
resultsString[1] = resultsString[1].Remove(resultsString[1].Length - 1);
168-
resultValue = new Vector3(float.Parse(resultsString[0]), float.Parse(resultsString[1]));
169+
resultValue = new Vector3(float.Parse(resultsString[0], CultureInfo.InvariantCulture), float.Parse(resultsString[1], CultureInfo.InvariantCulture));
169170
}
170171
else
171172
{
172-
resultValue = new Vector3(float.Parse(resultsString[0]), float.Parse(resultsString[0]));
173+
resultValue = new Vector3(float.Parse(resultsString[0], CultureInfo.InvariantCulture), float.Parse(resultsString[0], CultureInfo.InvariantCulture));
173174
}
174175

175176
return resultValue;

Source/Assets/Scripts/StlExporter.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public static string MeshToString(GameObject[] gameObjectsToSave, Vector3 refere
1111

1212
StringBuilder sb = new StringBuilder();
1313
sb.Append("solid Grains" + "\n");
14+
System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
15+
16+
1417

1518
for (int objectNumber = 0; objectNumber < gameObjectsToSave.Length; objectNumber++)
1619
{

0 commit comments

Comments
 (0)