Changeset 402 for binary-improvements2/MapRendering/src

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

Location:

binary-improvements2/MapRendering/src

Files:

• Commands/EnableRendering.cs (modified) (1 diff)
• MapRenderBlockBuffer.cs (modified) (8 diffs)
• MapRenderer.cs (modified) (8 diffs)
• MapTileCache.cs (copied) (copied from binary-improvements2/7dtd-server-fixes/src/FileCache/MapTileCache.cs ) (7 diffs)
• ModApi.cs (modified) (2 diffs)

binary-improvements2/MapRendering/src/Commands/EnableRendering.cs

@@ -15 +15 @@
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
                         if (_params.Count != 1) {
-                                SdtdConsole.Instance.Output ("Current state: " + MapRenderer.renderingEnabled);
+                                SdtdConsole.Instance.Output ($"Current state: {MapRenderer.renderingEnabled}");
                                 return;
                         }
 
                         MapRenderer.renderingEnabled = _params [0].Equals ("1");
-                        SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1"));
+                        SdtdConsole.Instance.Output ($"Set live map rendering to {_params [0].Equals ("1")}");
                 }
         }

binary-improvements2/MapRendering/src/MapRenderBlockBuffer.cs

@@ -1 +1 @@
 using System;
 using System.IO;
-using AllocsFixes.FileCache;
 using Unity.Collections;
 using UnityEngine;
@@ -21 +20 @@
                         zoomLevel = _level;
                         cache = _cache;
-                        folderBase = Constants.MapDirectory + "/" + zoomLevel + "/";
+                        folderBase = $"{Constants.MapDirectory}/{zoomLevel}/";
 
                         {
@@ -52 +51 @@
                                 saveTextureToFile ();
                         } catch (Exception e) {
-                                Log.Warning ("Exception in MapRenderBlockBuffer.SaveBlock(): " + e);
+                                Log.Warning ($"Exception in MapRenderBlockBuffer.SaveBlock(): {e}");
                         }
                         Profiler.EndSample ();
@@ -64 +63 @@
                                         string folder;
                                         if (currentBlockMapPos.x != _block.x) {
-                                                folder = folderBase + _block.x + '/';
+                                                folder = $"{folderBase}{_block.x}/";
 
                                                 Profiler.BeginSample ("LoadBlock.Directory");
@@ -73 +72 @@
                                         }
 
-                                        string fileName = folder + _block.y + ".png";
+                                        string fileName = $"{folder}{_block.y}.png";
                                         Profiler.EndSample ();
                                         
@@ -105 +104 @@
                 public Color32[] GetHalfScaled () {
                         Profiler.BeginSample ("HalfScaled.ResizeBuffer");
-                        zoomBuffer.Resize (Constants.MapBlockSize, Constants.MapBlockSize);
+                        zoomBuffer.Reinitialize (Constants.MapBlockSize, Constants.MapBlockSize);
                         Profiler.EndSample ();
 
@@ -156 +155 @@
                         Profiler.BeginSample ("HalfScaledNative.ResizeBuffer");
                         if (zoomBuffer.format != blockMap.format || zoomBuffer.height != Constants.MapBlockSize / 2 || zoomBuffer.width != Constants.MapBlockSize / 2) {
-                                zoomBuffer.Resize (Constants.MapBlockSize / 2, Constants.MapBlockSize / 2, blockMap.format, false);
+                                zoomBuffer.Reinitialize (Constants.MapBlockSize / 2, Constants.MapBlockSize / 2, blockMap.format, false);
                         }
                         Profiler.EndSample ();
@@ -206 +205 @@
 
                         if (array != null) {
-                                Log.Error ("Map image tile " + _fileName + " has been corrupted, recreating tile");
+                                Log.Error ($"Map image tile {_fileName} has been corrupted, recreating tile");
                         }
 
                         if (blockMap.format != Constants.DefaultTextureFormat || blockMap.height != Constants.MapBlockSize ||
                             blockMap.width != Constants.MapBlockSize) {
-                                blockMap.Resize (Constants.MapBlockSize, Constants.MapBlockSize, Constants.DefaultTextureFormat,
+                                blockMap.Reinitialize (Constants.MapBlockSize, Constants.MapBlockSize, Constants.DefaultTextureFormat,
                                         false);
                         }

binary-improvements2/MapRendering/src/MapRenderer.cs

@@ -5 +5 @@
 using System.Text;
 using System.Threading;
-using AllocsFixes.FileCache;
-using AllocsFixes.JSON;
 using UnityEngine;
 using UnityEngine.Profiling;
+using Utf8Json;
+using Webserver.FileCache;
 using Object = UnityEngine.Object;
 
@@ -27 +27 @@
 
                 private MapRenderer () {
-                        Constants.MapDirectory = GameIO.GetSaveGameDir () + "/map";
-
-                        lock (lockObject) {
-                                if (!LoadMapInfo ()) {
-                                        WriteMapInfo ();
-                                }
+                        Constants.MapDirectory = $"{GameIO.GetSaveGameDir ()}/map";
+
+                        if (!LoadMapInfo ()) {
+                                WriteMapInfo ();
                         }
 
@@ -47 +45 @@
                 public static MapRenderer Instance => instance ??= new MapRenderer ();
 
-                public static MapTileCache GetTileCache () {
+                public static AbstractCache GetTileCache () {
                         return Instance.cache;
                 }
@@ -95 +93 @@
                                                 }
                                         } catch (Exception e) {
-                                                Log.Out ("Exception in MapRendering.RenderSingleChunk(): " + e);
+                                                Log.Out ($"Exception in MapRendering.RenderSingleChunk(): {e}");
                                         }
                                 }, _chunk);
@@ -161 +159 @@
                                                         }
                                                 } catch (Exception e) {
-                                                        Log.Out ("Exception: " + e);
+                                                        Log.Out ($"Exception: {e}");
                                                 }
                                         }
@@ -177 +175 @@
                         if (fullMapTexture != null) {
                                 byte[] array = fullMapTexture.EncodeToPNG ();
-                                File.WriteAllBytes (Constants.MapDirectory + "/map.png", array);
+                                File.WriteAllBytes ($"{Constants.MapDirectory}/map.png", array);
                                 Object.Destroy (fullMapTexture);
                         }
@@ -183 +181 @@
                         renderingFullMap = false;
 
-                        Log.Out ("Generating map took: " + microStopwatch.ElapsedMilliseconds + " ms");
-                        Log.Out ("World extent: " + minPos + " - " + maxPos);
+                        Log.Out ($"Generating map took: {microStopwatch.ElapsedMilliseconds} ms");
+                        Log.Out ($"World extent: {minPos} - {maxPos}");
                 }
 
@@ -307 +305 @@
 
                 private void WriteMapInfo () {
-                        JsonObject mapInfo = new JsonObject ();
-                        mapInfo.Add ("blockSize", new JsonNumber (Constants.MapBlockSize));
-                        mapInfo.Add ("maxZoom", new JsonNumber (Constants.Zoomlevels - 1));
+                        JsonWriter writer = new JsonWriter ();
+                        writer.WriteBeginObject ();
+                        
+                        writer.WriteString ("blockSize");
+                        writer.WriteNameSeparator ();
+                        writer.WriteInt32 (Constants.MapBlockSize);
+                        
+                        writer.WriteValueSeparator ();
+                        writer.WriteString ("maxZoom");
+                        writer.WriteNameSeparator ();
+                        writer.WriteInt32 (Constants.Zoomlevels - 1);
+                        
+                        writer.WriteEndObject ();
 
                         Directory.CreateDirectory (Constants.MapDirectory);
-                        File.WriteAllText (Constants.MapDirectory + "/mapinfo.json", mapInfo.ToString (), Encoding.UTF8);
+                        File.WriteAllBytes ($"{Constants.MapDirectory}/mapinfo.json", writer.ToUtf8ByteArray ());
                 }
 
                 private bool LoadMapInfo () {
-                        if (!File.Exists (Constants.MapDirectory + "/mapinfo.json")) {
+                        if (!File.Exists ($"{Constants.MapDirectory}/mapinfo.json")) {
                                 return false;
                         }
 
-                        string json = File.ReadAllText (Constants.MapDirectory + "/mapinfo.json", Encoding.UTF8);
+                        string json = File.ReadAllText ($"{Constants.MapDirectory}/mapinfo.json", Encoding.UTF8);
                         try {
-                                JsonNode node = Parser.Parse (json);
-                                if (node is JsonObject jo) {
-                                        if (jo.ContainsKey ("blockSize")) {
-                                                Constants.MapBlockSize = ((JsonNumber) jo ["blockSize"]).GetInt ();
-                                        }
-
-                                        if (jo.ContainsKey ("maxZoom")) {
-                                                Constants.Zoomlevels = ((JsonNumber) jo ["maxZoom"]).GetInt () + 1;
-                                        }
-
-                                        return true;
-                                }
-                        } catch (MalformedJsonException e) {
-                                Log.Out ("Exception in LoadMapInfo: " + e);
-                        } catch (InvalidCastException e) {
-                                Log.Out ("Exception in LoadMapInfo: " + e);
+                                IDictionary<string,object> inputJson = JsonSerializer.Deserialize<IDictionary<string, object>> (json);
+
+                                if (inputJson.TryGetValue ("blockSize", out object fieldNode) && fieldNode is double value) {
+                                        Constants.MapBlockSize = (int)value;
+                                }
+
+                                if (inputJson.TryGetValue ("maxZoom", out fieldNode) && fieldNode is double value2) {
+                                        Constants.Zoomlevels = (int)value2 + 1;
+                                }
+
+                                return true;
+                        } catch (Exception e) {
+                                Log.Out ($"Exception in LoadMapInfo: {e}");
                         }
 

binary-improvements2/MapRendering/src/MapTileCache.cs

@@ -1 +1 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using UnityEngine;
 using UnityEngine.Profiling;
+using Webserver.FileCache;
 using Object = UnityEngine.Object;
 
-namespace AllocsFixes.FileCache {
+namespace MapRendering {
         // Special "cache" for map tile folder as both map rendering and webserver access files in there.
         // Only map rendering tiles are cached. Writing is done by WriteThrough.
@@ -25 +27 @@
                 }
 
+                // SetZoomCount only called before processing happens in MapRenderer.ctor, no locking required
+                [SuppressMessage ("ReSharper", "InconsistentlySynchronizedField")]
                 public void SetZoomCount (int _count) {
                         cache = new CurrentZoomFile[_count];
@@ -55 +59 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.LoadTile: " + e);
+                                Log.Warning ($"Error in MapTileCache.LoadTile: {e}");
                         }
 
@@ -81 +85 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.SaveTile: " + e);
+                                Log.Warning ($"Error in MapTileCache.SaveTile: {e}");
                         }
                 }
@@ -92 +96 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.ResetTile: " + e);
+                                Log.Warning ($"Error in MapTileCache.ResetTile: {e}");
                         }
                 }
@@ -108 +112 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.GetFileContent: " + e);
+                                Log.Warning ($"Error in MapTileCache.GetFileContent: {e}");
                         }
 
@@ -119 +123 @@
 
                 private static byte[] ReadAllBytes (string _path) {
-                        using (FileStream fileStream = new FileStream(_path, FileMode.Open, FileAccess.Read, FileShare.Read, 4096)) {
-                                int bytesRead = 0;
-                                int bytesLeft = (int) fileStream.Length;
-                                byte[] result = new byte[bytesLeft];
-                                while (bytesLeft > 0) {
-                                        int readThisTime = fileStream.Read (result, bytesRead, bytesLeft);
-                                        if (readThisTime == 0) {
-                                                throw new IOException ("Unexpected end of stream");
-                                        }
-
-                                        bytesRead += readThisTime;
-                                        bytesLeft -= readThisTime;
+                        using FileStream fileStream = new FileStream(_path, FileMode.Open, FileAccess.Read, FileShare.Read, 4096);
+                        
+                        int bytesRead = 0;
+                        int bytesLeft = (int) fileStream.Length;
+                        byte[] result = new byte[bytesLeft];
+                        while (bytesLeft > 0) {
+                                int readThisTime = fileStream.Read (result, bytesRead, bytesLeft);
+                                if (readThisTime == 0) {
+                                        throw new IOException ("Unexpected end of stream");
                                 }
 
-                                return result;
+                                bytesRead += readThisTime;
+                                bytesLeft -= readThisTime;
                         }
+
+                        return result;
                 }
 

binary-improvements2/MapRendering/src/ModApi.cs

@@ -1 +1 @@
 using JetBrains.Annotations;
+using Webserver;
+using Webserver.UrlHandlers;
 
 namespace MapRendering {
@@ -7 +9 @@
                         ModEvents.GameShutdown.RegisterHandler (GameShutdown);
                         ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
+
+                        Web.ServerInitialized += _web => {
+                                _web.RegisterPathHandler ("/map/", new StaticHandler (
+                                        $"{GameIO.GetSaveGameDir ()}/map",
+                                        MapRenderer.GetTileCache (),
+                                        false,
+                                        "web.map")
+                                );
+                        };
                 }