Commit: 6660ebbcfa3cfd883788f3fd6a03e4c3a93e4702 - automap (git)

Automap (client) [VS plugin mod]

Commit MetaInfo

• Revision: 6660ebbcfa3cfd883788f3fd6a03e4c3a93e4702 (tree)
• Time: 2020-04-29 03:43:43
• Author: melchior <melchior@user...>
• Commiter: melchior

Log Message

Fixed missing ref on ChunkMeta, Using Generics

Change Summary

• modified: Automap/Subsystems/AutomapSystem.cs
• modified: Automap/Subsystems/JsonGenerator.cs

Incremental Difference

--- a/Automap/Subsystems/AutomapSystem.cs
+++ b/Automap/Subsystems/AutomapSystem.cs
@@ -207,7 +207,7 @@ namespace Automap
 
 						ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta);
 
-						PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, chunkMeta);
+						PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, ref chunkMeta);
 						ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, pngWriter, out updatedPixels);
 
 						if (updatedPixels > 0)

--- a/Automap/Subsystems/JsonGenerator.cs
+++ b/Automap/Subsystems/JsonGenerator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -79,12 +80,11 @@ namespace Automap
 
 					jsonWriter.WriteKeyValue("chunkSize", chunkSize);
 
-					// fix later
-					//jsonWriter.WriteArray("edges", new int[4] {
-					//chunkTopMetadata.North_mostChunk,
-					//chunkTopMetadata.East_mostChunk,
-					//chunkTopMetadata.South_mostChunk,
-					//chunkTopMetadata.West_mostChunk } );
+					jsonWriter.WriteArray("edges", new int[]{
+					chunkTopMetadata.North_mostChunk,
+					chunkTopMetadata.East_mostChunk,
+					chunkTopMetadata.South_mostChunk,
+					chunkTopMetadata.West_mostChunk });
 
 					jsonWriter.WriteArray("chunkMetadataNames", ColumnMeta_Names);
 
@@ -236,23 +236,25 @@ namespace Automap
 
 	public static class JsonWriterExtentions
 	{
+		
 		/// <summary>
 		/// Writes an array in the form of key: [...ar] by calling .ToString() on all elements in ar.
 		/// </summary>
 		/// <param name="writer"></param>
 		/// <param name="key"></param>
 		/// <param name="ar"></param>
-		public static void WriteArray(this JsonTextWriter writer, string key, object[] ar)
+		public static void WriteArray<T>(this JsonTextWriter writer, string key, T[] ar)
 		{
 			writer.WritePropertyName(key);
 			writer.WriteStartArray();
 			foreach (var el in ar)
 			{
-				writer.WriteValue(el.ToString());
+				writer.WriteValue(el);
 			}
 			writer.WriteEndArray();
 		}
 
+
 		/// <summary>
 		/// Like WriteArray(string, object[]) but for JArrays.
 		/// </summary>