Fix number to string cultureinfo bugs.

kylepaulsen · Apr 23, 2021 · ee1f112 · ee1f112
1 parent 9cfca69
commit ee1f112
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/WebMap/Config.cs b/WebMap/Config.cs
@@ -125,18 +125,32 @@ public static string getWorldName() {
             return worldName;
         }
 
+        private static System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.InvariantCulture;
+        public static string str(int n) {
+            return n.ToString(culture);
+        }
+        public static string str(float n) {
+            return n.ToString(culture);
+        }
+        public static string str(double n) {
+            return n.ToString(culture);
+        }
+        public static string str(long n) {
+            return n.ToString(culture);
+        }
+
         public static string makeClientConfigJSON() {
             var sb = new StringBuilder();
             sb.Length = 0;
 
             sb.Append("{");
             sb.Append($"\"world_name\":\"{getWorldName()}\",");
-            sb.Append($"\"world_start_pos\": \"{WORLD_START_POS.x},{WORLD_START_POS.y},{WORLD_START_POS.z}\",");
-            sb.Append($"\"default_zoom\":{DEFAULT_ZOOM},");
-            sb.Append($"\"texture_size\":{TEXTURE_SIZE},");
-            sb.Append($"\"pixel_size\":{PIXEL_SIZE},");
-            sb.Append($"\"update_interval\":{PLAYER_UPDATE_INTERVAL},");
-            sb.Append($"\"explore_radius\":{EXPLORE_RADIUS}");
+            sb.Append($"\"world_start_pos\": \"{str(WORLD_START_POS.x)},{str(WORLD_START_POS.y)},{str(WORLD_START_POS.z)}\",");
+            sb.Append($"\"default_zoom\":{str(DEFAULT_ZOOM)},");
+            sb.Append($"\"texture_size\":{str(TEXTURE_SIZE)},");
+            sb.Append($"\"pixel_size\":{str(PIXEL_SIZE)},");
+            sb.Append($"\"update_interval\":{str(PLAYER_UPDATE_INTERVAL)},");
+            sb.Append($"\"explore_radius\":{str(EXPLORE_RADIUS)}");
             sb.Append("}");
 
             return sb.ToString();

diff --git a/WebMap/MapDataServer.cs b/WebMap/MapDataServer.cs
@@ -8,6 +8,7 @@
 using WebSocketSharp.Server;
 
 using UnityEngine;
+using static WebMap.WebMapConfig;
 
 namespace WebMap {
 
@@ -57,7 +58,7 @@ public MapDataServer() {
                     var zdoData = ZDOMan.instance.GetZDO(player.m_characterID);
                     var pos = zdoData.GetPosition();
                     if (player.m_publicRefPos) {
-                        dataString += $"{player.m_uid}\n{player.m_playerName}\n{pos.x},{pos.y},{pos.z}\n";
+                        dataString += $"{player.m_uid}\n{player.m_playerName}\n{str(pos.x)},{str(pos.y)},{str(pos.z)}\n";
                     } else {
                         dataString += $"{player.m_uid}\n{player.m_playerName}\nhidden\n";
                     }
@@ -189,12 +190,12 @@ public void ListenAsync() {
         }
 
         public void BroadcastPing(long id, string name, Vector3 position) {
-            webSocketHandler.Sessions.Broadcast($"ping\n{id}\n{name}\n{position.x},{position.z}");
+            webSocketHandler.Sessions.Broadcast($"ping\n{str(id)}\n{name}\n{str(position.x)},{str(position.z)}");
         }
 
         public void AddPin(string id, string pinId, string type, string name, Vector3 position, string pinText) {
-            pins.Add($"{id},{pinId},{type},{name},{position.x},{position.z},{pinText}");
-            webSocketHandler.Sessions.Broadcast($"pin\n{id}\n{pinId}\n{type}\n{name}\n{position.x},{position.z}\n{pinText}");
+            pins.Add($"{id},{pinId},{type},{name},{str(position.x)},{str(position.z)},{pinText}");
+            webSocketHandler.Sessions.Broadcast($"pin\n{id}\n{pinId}\n{type}\n{name}\n{str(position.x)},{str(position.z)}\n{pinText}");
         }
 
         public void RemovePin(int idx) {

diff --git a/WebMap/WebMap.cs b/WebMap/WebMap.cs
@@ -403,7 +403,7 @@ static void Prefix(RoutedRPCData data) {
                         // string message = package.ReadString();
                         // message = (message == null ? "" : message).Trim();
 
-                        if (messageType == 3) {
+                        if (messageType == (int)Talker.Type.Ping) {
                             mapDataServer.BroadcastPing(data.m_senderPeerID, userName, pos);
                         }
                         // Debug.Log("CHAT!!! " + pos + " | " + messageType + " | " + userName + " | " + message);

diff --git a/WebMap/web/style.css b/WebMap/web/style.css
@@ -19,9 +19,9 @@ canvas {
 }
 
 @keyframes pulse {
-	from { transform: scale(1); }
-	50% { transform: scale(1.5); }
-	to { transform: scale(1); }
+	from { transform: translate(-50%, -50%) scale(1); }
+	50% { transform: translate(-50%, -50%) scale(1.5); }
+	to { transform: translate(-50%, -50%) scale(1); }
 }