diff --git a/Source/Assets/Parameters_06_Complex.txt.meta b/Source/Assets/Parameters_06_Complex.txt.meta new file mode 100644 index 0000000..8c80922 --- /dev/null +++ b/Source/Assets/Parameters_06_Complex.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7ff6e399ac48c474cb682bbba40a7aa5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Assets/Resources/BillingMode.json b/Source/Assets/Resources/BillingMode.json new file mode 100644 index 0000000..6f4bfb7 --- /dev/null +++ b/Source/Assets/Resources/BillingMode.json @@ -0,0 +1 @@ +{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Source/Assets/Resources/BillingMode.json.meta b/Source/Assets/Resources/BillingMode.json.meta new file mode 100644 index 0000000..584214f --- /dev/null +++ b/Source/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 31763167c7a457c43b1c6bda76f9dd43 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Assets/Resources/Grains/Realistic.prefab b/Source/Assets/Resources/Grains/Realistic.prefab index a07cd76..61b0454 100644 Binary files a/Source/Assets/Resources/Grains/Realistic.prefab and b/Source/Assets/Resources/Grains/Realistic.prefab differ diff --git a/Source/Assets/Resources/Grains/Sphere.prefab b/Source/Assets/Resources/Grains/Sphere.prefab index 9223d04..9a09668 100644 Binary files a/Source/Assets/Resources/Grains/Sphere.prefab and b/Source/Assets/Resources/Grains/Sphere.prefab differ diff --git a/Source/Assets/Scenes/Main3D.unity b/Source/Assets/Scenes/Main3D.unity index 0fff3e0..a0d666b 100644 Binary files a/Source/Assets/Scenes/Main3D.unity and b/Source/Assets/Scenes/Main3D.unity differ diff --git a/Source/Assets/Scripts/DataSaver.cs b/Source/Assets/Scripts/DataSaver.cs index da259cd..d161294 100644 --- a/Source/Assets/Scripts/DataSaver.cs +++ b/Source/Assets/Scripts/DataSaver.cs @@ -10,6 +10,8 @@ public static void saveLocationData(Rock rock, string saveFolder) var csv = new System.Text.StringBuilder(); csv.AppendLine("Name PositionX PositionY PositionZ RotationEu1 RotationEu2 RotationEu3 ScaleX ScaleY ScaleZ Mass Density Volume SurfaceArea"); + System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture; + for (int bedNumber = 0; bedNumber < nBeds; bedNumber++) { diff --git a/Source/Assets/Scripts/Distribution.cs b/Source/Assets/Scripts/Distribution.cs index 9ae0920..c3453a6 100644 --- a/Source/Assets/Scripts/Distribution.cs +++ b/Source/Assets/Scripts/Distribution.cs @@ -1,5 +1,6 @@ using System.Collections; using UnityEngine; +using System.Globalization; public class Distribution{ @@ -86,8 +87,8 @@ public Distribution(float[,] pdfData) if (textData[i][0] != '-') { string[] splitText = textData[i].Split(','); - readData[i, 0] = float.Parse(splitText[0].Trim()); - readData[i, 1] = float.Parse(splitText[1].Trim()); + readData[i, 0] = float.Parse(splitText[0].Trim(), CultureInfo.InvariantCulture); + readData[i, 1] = float.Parse(splitText[1].Trim(), CultureInfo.InvariantCulture); } } } diff --git a/Source/Assets/Scripts/ParameterGroup.cs b/Source/Assets/Scripts/ParameterGroup.cs index 404777f..3bc3634 100644 --- a/Source/Assets/Scripts/ParameterGroup.cs +++ b/Source/Assets/Scripts/ParameterGroup.cs @@ -1,5 +1,6 @@ using UnityEngine; using System.Collections; +using System.Globalization; public class ParameterGroup { @@ -81,14 +82,14 @@ public string getString(string parameterNameString) { //=================================================================== public float getFloat(string parameterNameString) { int results = System.Array.FindIndex(parameterName, s => s.Equals(parameterNameString)); - return (float.Parse(parameterValue[results])); + return (float.Parse(parameterValue[results], CultureInfo.InvariantCulture)); } //=================================================================== //=================================================================== public int getInteger(string parameterNameString) { int results = System.Array.FindIndex(parameterName, s => s.Equals(parameterNameString)); - return (int.Parse(parameterValue[results])); + return (int.Parse(parameterValue[results], CultureInfo.InvariantCulture)); } //=================================================================== @@ -121,7 +122,7 @@ public Vector2 getVector2(string parameterNameString) string[] resultsString = parameterValue[results].Split(' '); resultsString[0] = resultsString[0].Remove(0, 1); resultsString[1] = resultsString[1].Remove(resultsString[1].Length - 1); - Vector2 resultValue = new Vector2(float.Parse(resultsString[0]), float.Parse(resultsString[1])); + Vector2 resultValue = new Vector2(float.Parse(resultsString[0], CultureInfo.InvariantCulture), float.Parse(resultsString[1], CultureInfo.InvariantCulture)); return resultValue; } @@ -140,13 +141,13 @@ public Color getColor(string parameterNameString) resultsString[0] = resultsString[0].Remove(0, 1); resultsString[3] = resultsString[3].Remove(resultsString[3].Length - 1); - float r = float.Parse(resultsString[0])/ 255f; + float r = float.Parse(resultsString[0], CultureInfo.InvariantCulture) / 255f; - float g = float.Parse(resultsString[1])/ 255f; + float g = float.Parse(resultsString[1], CultureInfo.InvariantCulture) / 255f; - float b = float.Parse(resultsString[2])/ 255f; + float b = float.Parse(resultsString[2], CultureInfo.InvariantCulture) / 255f; - float a = float.Parse(resultsString[3])/ 255f; + float a = float.Parse(resultsString[3], CultureInfo.InvariantCulture) / 255f; Color color = new Color(r,g,b,a); return color; @@ -165,11 +166,11 @@ public Vector2 GetRange(string parameterNameString) { resultsString[0] = resultsString[0].Remove(0, 1); resultsString[1] = resultsString[1].Remove(resultsString[1].Length - 1); - resultValue = new Vector3(float.Parse(resultsString[0]), float.Parse(resultsString[1])); + resultValue = new Vector3(float.Parse(resultsString[0], CultureInfo.InvariantCulture), float.Parse(resultsString[1], CultureInfo.InvariantCulture)); } else { - resultValue = new Vector3(float.Parse(resultsString[0]), float.Parse(resultsString[0])); + resultValue = new Vector3(float.Parse(resultsString[0], CultureInfo.InvariantCulture), float.Parse(resultsString[0], CultureInfo.InvariantCulture)); } return resultValue; diff --git a/Source/Assets/Scripts/StlExporter.cs b/Source/Assets/Scripts/StlExporter.cs index a978dfe..d8e83c2 100644 --- a/Source/Assets/Scripts/StlExporter.cs +++ b/Source/Assets/Scripts/StlExporter.cs @@ -11,6 +11,9 @@ public static string MeshToString(GameObject[] gameObjectsToSave, Vector3 refere StringBuilder sb = new StringBuilder(); sb.Append("solid Grains" + "\n"); + System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture; + + for (int objectNumber = 0; objectNumber < gameObjectsToSave.Length; objectNumber++) { diff --git a/Source/Packages/manifest.json b/Source/Packages/manifest.json index 2e01617..fdf7f2f 100644 --- a/Source/Packages/manifest.json +++ b/Source/Packages/manifest.json @@ -2,18 +2,18 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "3.6.1", + "com.unity.ads": "3.7.5", "com.unity.analytics": "3.5.3", - "com.unity.collab-proxy": "1.3.9", + "com.unity.collab-proxy": "1.7.1", "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.5", + "com.unity.ide.visualstudio": "2.0.11", "com.unity.ide.vscode": "1.2.3", - "com.unity.purchasing": "2.2.2", - "com.unity.test-framework": "1.1.22", - "com.unity.textmeshpro": "3.0.1", - "com.unity.timeline": "1.4.6", + "com.unity.purchasing": "3.2.2", + "com.unity.test-framework": "1.1.27", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7", + "com.unity.xr.legacyinputhelpers": "2.1.8", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Source/Packages/packages-lock.json b/Source/Packages/packages-lock.json index 6bc642d..ab5f02d 100644 --- a/Source/Packages/packages-lock.json +++ b/Source/Packages/packages-lock.json @@ -13,7 +13,7 @@ "dependencies": {} }, "com.unity.ads": { - "version": "3.6.1", + "version": "3.7.5", "depth": 0, "source": "registry", "dependencies": { @@ -31,10 +31,12 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.3.9", + "version": "1.7.1", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { @@ -54,10 +56,12 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.5", + "version": "2.0.11", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { @@ -67,17 +71,28 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.nuget.newtonsoft-json": { + "version": "2.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.purchasing": { - "version": "2.2.2", + "version": "3.2.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.22", + "version": "1.1.27", "depth": 0, "source": "registry", "dependencies": { @@ -88,7 +103,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -97,7 +112,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.6", + "version": "1.4.8", "depth": 0, "source": "registry", "dependencies": { @@ -118,7 +133,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.7", + "version": "2.1.8", "depth": 0, "source": "registry", "dependencies": { diff --git a/Source/ProjectSettings/ProjectSettings.asset b/Source/ProjectSettings/ProjectSettings.asset index 0bccc52..88c8755 100644 Binary files a/Source/ProjectSettings/ProjectSettings.asset and b/Source/ProjectSettings/ProjectSettings.asset differ diff --git a/Source/ProjectSettings/ProjectVersion.txt b/Source/ProjectSettings/ProjectVersion.txt index aa2fd82..2c2c446 100644 --- a/Source/ProjectSettings/ProjectVersion.txt +++ b/Source/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.6f1 -m_EditorVersionWithRevision: 2020.2.6f1 (8a2143876886) +m_EditorVersion: 2020.3.17f1 +m_EditorVersionWithRevision: 2020.3.17f1 (a4537701e4ab) diff --git a/Source/ProjectSettings/TimeManager.asset b/Source/ProjectSettings/TimeManager.asset index 1ed3607..d23bfe4 100644 Binary files a/Source/ProjectSettings/TimeManager.asset and b/Source/ProjectSettings/TimeManager.asset differ diff --git a/Source/ProjectSettings/TimelineSettings.asset b/Source/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..b4fbdb0 --- /dev/null +++ b/Source/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 diff --git a/Source/ProjectSettings/UnityConnectSettings.asset b/Source/ProjectSettings/UnityConnectSettings.asset index bb4829a..de7a2bf 100644 Binary files a/Source/ProjectSettings/UnityConnectSettings.asset and b/Source/ProjectSettings/UnityConnectSettings.asset differ