Changeset 402 for binary-improvements2/MapRendering/src/MapRenderBlockBuffer.cs

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

File:

• binary-improvements2/MapRendering/src/MapRenderBlockBuffer.cs (modified) (8 diffs)

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);
                         }