using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
using System.IO;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
-using System.Web.UI;
using Hjg.Pngcs;
using Hjg.Pngcs.Chunks;
+using Newtonsoft.Json;
+
+using ProtoBuf;
+
using Vintagestory.API.Client;
using Vintagestory.API.Common;
-using Vintagestory.API.Common.Entities;
using Vintagestory.API.Config;
using Vintagestory.API.Datastructures;
using Vintagestory.API.MathTools;
public class AutomapSystem
{
private Thread cartographer_thread;
+ private Thread snapshotThread;
+ private Snapshotter snapshot;
private ICoreClientAPI ClientAPI { get; set; }
private ILogger Logger { get; set; }
private IChunkRenderer ChunkRenderer { get; set; }
+ private JsonGenerator JsonGenerator { get; set; }
- private const string _mapPath = @"Maps";
- private const string _chunkPath = @"Chunks";
+ internal const string _mapPath = @"Maps";
+ internal const string _chunkPath = @"Chunks";
private const string _domain = @"automap";
private const string chunkFile_filter = @"*_*.png";
- private static Regex chunkShardRegex = new Regex(@"(?<X>[\d]+)_(?<Z>[\d]+).png", RegexOptions.Singleline);
+ private const string poiFileName = @"poi_binary";
+ private const string eoiFileName = @"eoi_binary";
+ private const string pointsTsvFileName = @"points_of_interest.tsv";
+ private static Regex chunkShardRegex = new Regex(@"(?<X>[\d]+)_(?<Z>[\d]+)\.png", RegexOptions.Singleline);
private ConcurrentDictionary<Vec2i, uint> columnCounter = new ConcurrentDictionary<Vec2i, uint>(3, 150);
private ColumnsMetadata chunkTopMetadata;
internal Dictionary<AssetLocation, EntityDesignator> Entity_Designators { get; private set; }
internal Dictionary<int, string> RockIdCodes { get; private set; }
- internal RunState CurrentState { get; set; }
+ internal CommandType CurrentState { get; set; }
//Run status, Chunks processed, stats, center of map....
- private uint nullChunkCount, updatedChunksTotal;
+ private uint nullChunkCount, nullMapCount, updatedChunksTotal;
private Vec2i startChunkColumn;
private readonly int chunkSize;
private string path;
- private IAsset stylesFile;
+ private IAsset staticMap;
+ private PersistedConfiguration configuration;
+
public static string AutomapStatusEventKey = @"AutomapStatus";
public static string AutomapCommandEventKey = @"AutomapCommand";
-
- public AutomapSystem(ICoreClientAPI clientAPI, ILogger logger)
+ public AutomapSystem(ICoreClientAPI clientAPI, ILogger logger, PersistedConfiguration config)
{
this.ClientAPI = clientAPI;
this.Logger = logger;
chunkSize = ClientAPI.World.BlockAccessor.ChunkSize;
ClientAPI.Event.LevelFinalize += EngageAutomap;
+ configuration = config;
//TODO:Choose which one from GUI
this.ChunkRenderer = new StandardRenderer(clientAPI, logger);
//Listen on bus for commands
ClientAPI.Event.RegisterEventBusListener(CommandListener, 1.0, AutomapSystem.AutomapCommandEventKey);
+
+ if (configuration.Autostart)
+ {
+ CurrentState = CommandType.Run;
+ Logger.Debug("Autostart is Enabled.");
+ }
+
}
{
path = ClientAPI.GetOrCreateDataPath(_mapPath);
path = ClientAPI.GetOrCreateDataPath(Path.Combine(path, "World_" + ClientAPI.World.Seed));//Add name of World too...'ServerApi.WorldManager.CurrentWorldName'
+ ClientAPI.GetOrCreateDataPath(Path.Combine(path, _chunkPath));
+
+ JsonGenerator = new JsonGenerator(ClientAPI, Logger, path);
- stylesFile = ClientAPI.World.AssetManager.Get(new AssetLocation(_domain, "config/automap_format.css"));
- Logger.VerboseDebug("CSS loaded: {0} size: {1}", stylesFile.IsLoaded(), stylesFile.ToText().Length);
+ string mapFilename = Path.Combine(path, "automap.html");
+ StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite));
+
+ staticMap = ClientAPI.World.AssetManager.Get(new AssetLocation(_domain, "config/automap.html"));
+ outputText.Write(staticMap.ToText());
+ outputText.Flush();
Prefill_POI_Designators();
startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Z / chunkSize));
chunkTopMetadata = new ColumnsMetadata(startChunkColumn);
-
Logger.Notification("AUTOMAP Start {0}", startChunkColumn);
Reload_Metadata();
IsBackground = true
};
+ snapshot = new Snapshotter(path, chunkTopMetadata, chunkSize,ClientAPI.World.Seed );
+ snapshotThread = new Thread(Snap)
+ {
+ Name = "Snapshot",
+ Priority = ThreadPriority.Lowest,
+ IsBackground = true
+ };
+
ClientAPI.Event.RegisterGameTickListener(AwakenCartographer, 6000);
}
private void AwakenCartographer(float delayed)
{
- if (CurrentState == RunState.Run && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true))
+ if (CurrentState == CommandType.Run && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true))
{
#if DEBUG
Logger.VerboseDebug("Cartographer re-trigger from [{0}]", cartographer_thread.ThreadState);
//ClientAPI.TriggerChatMessage($"Automap {updatedChunksTotal} Updates - MAX (N:{chunkTopMetadata.North_mostChunk},S:{chunkTopMetadata.South_mostChunk},E:{chunkTopMetadata.East_mostChunk}, W:{chunkTopMetadata.West_mostChunk} - TOTAL: {chunkTopMetadata.Count})");
//#endif
}
- else if (CurrentState == RunState.Snapshot)
+ else if (CurrentState == CommandType.Snapshot)
{
- //TODO: Snapshot generator second thread...
+ if (snapshotThread.ThreadState.HasFlag(ThreadState.Unstarted))
+ {
+ snapshotThread.Start();
+ } else if (snapshotThread.ThreadState.HasFlag(ThreadState.WaitSleepJoin))
+ {
+ snapshotThread.Interrupt();
+ }
}
}
{
uint ejectedItem = 0;
uint updatedChunks = 0;
+ uint updatedPixels = 0;
//-- Should dodge enumerator changing underfoot....at a cost.
if (!columnCounter.IsEmpty)
{
var tempSet = columnCounter.ToArray().OrderByDescending(kvp => kvp.Value);
+ UpdateEntityMetadata();
+
foreach (var mostActiveCol in tempSet)
{
-
var mapChunk = ClientAPI.World.BlockAccessor.GetMapChunk(mostActiveCol.Key);
if (mapChunk == null)
{
Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key);
- nullChunkCount++;
+ nullMapCount++;
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
continue;
}
- ColumnMeta chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk);
- PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, chunkMeta);
- UpdateEntityMetadata();
- ProcessChunkBlocks(mostActiveCol.Key, mapChunk, chunkMeta);
-
- uint updatedPixels = 0;
+ ColumnMeta chunkMeta;
+ if (chunkTopMetadata.Contains(mostActiveCol.Key))
+ {
+ chunkMeta = chunkTopMetadata[mostActiveCol.Key];
+#if DEBUG
+ Logger.VerboseDebug("Loaded chunk {0}", mostActiveCol.Key);
+#endif
+ }
+ else
+ {
+ chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk);
+#if DEBUG
+ Logger.VerboseDebug("Created chunk {0}", mostActiveCol.Key);
+#endif
+ }
+ ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta);
+ PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, ref chunkMeta);
ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, pngWriter, out updatedPixels);
if (updatedPixels > 0)
{
-
#if DEBUG
Logger.VerboseDebug("Wrote chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
#endif
else
{
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
+#if DEBUG
Logger.VerboseDebug("Un-painted chunk: ({0}) ", mostActiveCol.Key);
+#endif
}
-
}
+ //Cleanup persisted Metadata...
+ chunkTopMetadata.ClearMetadata();
}
UpdateStatus(this.updatedChunksTotal, this.nullChunkCount, updatedChunks);
{
//What about chunk updates themselves; a update bitmap isn't kept...
updatedChunksTotal += updatedChunks;
- GenerateMapHTML();
- GenerateJSONMetadata();
+ JsonGenerator.GenerateJSONMetadata(chunkTopMetadata, startChunkColumn, POIs, EOIs, RockIdCodes);
updatedChunks = 0;
}
//Then sleep until interupted again, and repeat
-
+#if DEBUG
Logger.VerboseDebug("Thread '{0}' about to sleep indefinitely.", Thread.CurrentThread.Name);
-
+#endif
Thread.Sleep(Timeout.Infinite);
}
catch (ThreadInterruptedException)
{
+#if DEBUG
Logger.VerboseDebug("Thread '{0}' interupted [awoken]", Thread.CurrentThread.Name);
+#endif
goto wake;
}
catch (ThreadAbortException)
{
+#if DEBUG
Logger.VerboseDebug("Thread '{0}' aborted.", Thread.CurrentThread.Name);
-
+#endif
}
finally
{
+#if DEBUG
Logger.VerboseDebug("Thread '{0}' executing finally block.", Thread.CurrentThread.Name);
+#endif
+ PersistPointsData();
+ }
+ }
+
+ private void Snap()
+ {
+ snapshotTake:
+#if DEBUG
+ Logger.VerboseDebug("Snapshot started");
+#endif
+ try
+ {
+ snapshot.Take();
+#if DEBUG
+ Logger.VerboseDebug("Snapshot sleeping");
+#endif
+ CurrentState = CommandType.Run;
+ Thread.Sleep(Timeout.Infinite);
+ }
+ catch (ThreadInterruptedException)
+ {
+#if DEBUG
+ Logger.VerboseDebug("Snapshot intertupted");
+#endif
+ goto snapshotTake;
}
}
private void UpdateStatus(uint totalUpdates, uint voidChunks, uint delta)
{
- StatusData updateData = new StatusData(totalUpdates, voidChunks, delta, RunState.Run);
+ StatusData updateData = new StatusData(totalUpdates, voidChunks, delta, CommandType.Run);
this.ClientAPI.Event.PushEvent(AutomapStatusEventKey, updateData);
}
this.BlockID_Designators = new Dictionary<int, BlockDesignator>();
this.Entity_Designators = new Dictionary<AssetLocation, EntityDesignator>();
- this.RockIdCodes = Helpers.ArbitrarytBlockIdHunter(ClientAPI, new AssetLocation(GlobalConstants.DefaultDomain, "rock"), EnumBlockMaterial.Stone);
+ this.RockIdCodes = Helpers.ArbitrarytBlockIdHunter(ClientAPI, new AssetLocation(GlobalConstants.DefaultDomain, "rock-"), EnumBlockMaterial.Stone);
//Add special marker types for BlockID's of "Interest", overwrite colour, and method
- Install_POI_Designators(DefaultDesignators.DefaultBlockDesignators(), DefaultDesignators.DefaultEntityDesignators());
+ Reload_POI_Designators();
}
- private void Install_POI_Designators(ICollection<BlockDesignator> blockDesig, List<EntityDesignator> entDesig)
+ private void Reload_POI_Designators()
{
- Logger.VerboseDebug("Connecting {0} standard Block-Designators", blockDesig.Count);
- foreach (var designator in blockDesig)
+ Logger.VerboseDebug("Connecting {0} Configured Block-Designators", configuration.BlockDesignators.Count);
+ foreach (var designator in configuration.BlockDesignators)
{
var blockIDs = Helpers.ArbitrarytBlockIdHunter(ClientAPI, designator.Pattern, designator.Material);
if (blockIDs.Count > 0) { Logger.VerboseDebug("Designator {0} has {1} associated blockIDs", designator.ToString(), blockIDs.Count); }
this.ChunkRenderer.BlockID_Designators = BlockID_Designators;
- Logger.VerboseDebug("Connecting {0} standard Entity-Designators", entDesig.Count);
- foreach (var designator in entDesig)
+ Logger.VerboseDebug("Connecting {0} Configured Entity-Designators", configuration.EntityDesignators.Count);
+ foreach (var designator in configuration.EntityDesignators)
{
//Get Variants first, from EntityTypes...better be populated!
var matched = ClientAPI.World.EntityTypes.FindAll(entp => entp.Code.BeginsWith(designator.Pattern.Domain, designator.Pattern.Path));
this.Entity_Designators.Add(match.Code, designator);
}
-
-
//EntityProperties props = ClientAPI.World.GetEntityType(designator.Pattern);
}
}
- private void GenerateMapHTML()
- {
- string mapFilename = Path.Combine(path, "Automap.html");
- int TopNorth = chunkTopMetadata.North_mostChunk;
- int TopSouth = chunkTopMetadata.South_mostChunk;
- int TopEast = chunkTopMetadata.East_mostChunk;
- int TopWest = chunkTopMetadata.West_mostChunk;
+ /// <summary>
+ /// Store Points/Entity of Interest
+ /// </summary>
+ private void PersistPointsData()
+ {
+ //POI and EOI raw dump files ~ WRITE em!
+ //var poiRawFile = File.
+ string poiPath = Path.Combine(path, poiFileName);
+ string eoiPath = Path.Combine(path, eoiFileName);
- using (StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)))
+ if (this.POIs.Count > 0)
{
- using (HtmlTextWriter tableWriter = new HtmlTextWriter(outputText))
+ using (var poiFile = File.OpenWrite(poiPath))
{
- tableWriter.BeginRender();
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Html);
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Head);
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Title);
- tableWriter.WriteEncodedText("Generated Automap");
- tableWriter.RenderEndTag();
- //CSS style here
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Style);
- tableWriter.Write(stylesFile.ToText());
- tableWriter.RenderEndTag();//</style>
-
- tableWriter.RenderEndTag();
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Body);
- tableWriter.RenderBeginTag(HtmlTextWriterTag.P);
- tableWriter.WriteEncodedText($"Created {DateTimeOffset.UtcNow.ToString("u")}");
- tableWriter.RenderEndTag();
- tableWriter.RenderBeginTag(HtmlTextWriterTag.P);
- tableWriter.WriteEncodedText($"W:{TopWest}, E: {TopEast}, N:{TopNorth}, S:{TopSouth} ");
- tableWriter.RenderEndTag();
- tableWriter.WriteLine();
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Table);
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Caption);
- tableWriter.WriteEncodedText($"Start: {startChunkColumn}, Seed: {ClientAPI.World.Seed}\n");
- tableWriter.RenderEndTag();
-
- //################ X-Axis <thead> #######################
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Thead);
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Tr);
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Th);
- tableWriter.Write("N, W");
- tableWriter.RenderEndTag();
-
- for (int xAxisT = TopWest; xAxisT <= TopEast; xAxisT++)
- {
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Th);
- tableWriter.Write(xAxisT);
- tableWriter.RenderEndTag();
- }
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Th);
- tableWriter.Write("N, E");
- tableWriter.RenderEndTag();
-
- tableWriter.RenderEndTag();
- tableWriter.RenderEndTag();
- //###### </thead> ################################
-
- //###### <tbody> - Chunk rows & Y-axis cols
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Tbody);
-
- //######## <tr> for every vertical row
- for (int yAxis = TopNorth; yAxis <= TopSouth; yAxis++)
- {
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Tr);
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
- tableWriter.Write(yAxis);//legend: Y-axis
- tableWriter.RenderEndTag();
-
- for (int xAxis = TopWest; xAxis <= TopEast; xAxis++)
- {
- //###### <td> #### for chunk shard
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
- var colLoc = new Vec2i(xAxis, yAxis);
- if (chunkTopMetadata.Contains(colLoc))
- {
- ColumnMeta meta = chunkTopMetadata[colLoc];
- //Tooltip first
- tableWriter.AddAttribute(HtmlTextWriterAttribute.Class, "tooltip");
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Div);
-
- tableWriter.AddAttribute(HtmlTextWriterAttribute.Src, $"{xAxis}_{yAxis}.png");
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Img);
- tableWriter.RenderEndTag();
- // <span class="tooltiptext">Tooltip text
- tableWriter.AddAttribute(HtmlTextWriterAttribute.Class, "tooltiptext");
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Span);
-
- StringBuilder tooltipText = new StringBuilder();
- tooltipText.Append($"{meta.Location.PrettyCoords(ClientAPI)} ");
- tooltipText.Append($" Max-Height: {meta.YMax}, Temp: {meta.Temperature.ToString("F1")} ");
- tooltipText.Append($" Rainfall: {meta.Rainfall.ToString("F1")}, ");
- tooltipText.Append($" Shrubs: {meta.ShrubDensity.ToString("F1")}, ");
- tooltipText.Append($" Forest: {meta.ForestDensity.ToString("F1")}, ");
- tooltipText.Append($" Fertility: {meta.Fertility.ToString("F1")}, ");
-
- if (meta.RockRatio != null)
- {
- foreach (KeyValuePair<int, uint> blockID in meta.RockRatio)
- {
- var block = ClientAPI.World.GetBlock(blockID.Key);
- tooltipText.AppendFormat(" {0} × {1},\t", block.Code.GetName(), meta.RockRatio[blockID.Key]);
- }
- }
-
- tableWriter.WriteEncodedText(tooltipText.ToString());
-
- tableWriter.RenderEndTag();//</span>
-
-
- tableWriter.RenderEndTag();//</div> --tooltip enclosure
- }
- else
- {
- tableWriter.Write("?");
- }
-
- tableWriter.RenderEndTag();
- }//############ </td> ###########
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
- tableWriter.Write(yAxis);//legend: Y-axis
- tableWriter.RenderEndTag();
-
- tableWriter.RenderEndTag();
-
- }
- tableWriter.RenderEndTag();
-
- //################ X-Axis <tfoot> #######################
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Tfoot);
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Tr);
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
- tableWriter.Write("S, W");
- tableWriter.RenderEndTag();
-
- for (int xAxisB = TopWest; xAxisB <= TopEast; xAxisB++)
- {
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
- tableWriter.Write(xAxisB);
- tableWriter.RenderEndTag();
- }
-
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
- tableWriter.Write("S, E");
- tableWriter.RenderEndTag();
-
- tableWriter.RenderEndTag();
- tableWriter.RenderEndTag();
- //###### </tfoot> ################################
-
-
- tableWriter.RenderEndTag();//</table>
-
- //############## POI list #####################
- tableWriter.RenderBeginTag(HtmlTextWriterTag.P);
- tableWriter.WriteLine("Points of Interest");
- tableWriter.RenderEndTag();
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Ul);
- foreach (var poi in this.POIs)
- {
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Li);
- tableWriter.WriteEncodedText(poi.Location.PrettyCoords(this.ClientAPI) + "\t");
- tableWriter.WriteEncodedText(poi.Notes + "\t");
- tableWriter.WriteEncodedText(poi.Timestamp.ToString("u"));
- tableWriter.RenderEndTag();
- }
-
- foreach (var eoi in this.EOIs.PointsList)
- {
- tableWriter.RenderBeginTag(HtmlTextWriterTag.Li);
- tableWriter.WriteEncodedText(eoi.Location.PrettyCoords(this.ClientAPI) + "\t");
- tableWriter.WriteEncodedText(eoi.Notes + "\t");
- tableWriter.WriteEncodedText(eoi.Timestamp.ToString("u"));
- tableWriter.RenderEndTag();
- }
-
- tableWriter.RenderEndTag();
-
-
-
-
- tableWriter.RenderEndTag();//### </BODY> ###
-
- tableWriter.EndRender();
- tableWriter.Flush();
+ Serializer.Serialize<PointsOfInterest>(poiFile, this.POIs);
}
- outputText.Flush();
}
- Logger.VerboseDebug("Generated HTML map");
- }
-
- /// <summary>
- /// Generates the JSON Metadata. (in MAP object format )
- /// </summary>
- private void GenerateJSONMetadata()
- {
- string jsonFilename = Path.Combine(path, "Metadata.js");
-
- StreamWriter jsonWriter = new StreamWriter(jsonFilename, false, Encoding.UTF8);
- using (jsonWriter)
+ if (this.EOIs.Count > 0)
{
- jsonWriter.Write("ViewFrame.chunks={};");
- jsonWriter.Write("ViewFrame.chunks.worldSeedNum={0};", ClientAPI.World.Seed);
- jsonWriter.Write("ViewFrame.chunks.genTime=new Date('{0}');", DateTimeOffset.UtcNow.ToString("O"));
- jsonWriter.Write("ViewFrame.chunks.startCoords=[{0},{1}];", startChunkColumn.X, startChunkColumn.Y);
- jsonWriter.Write("ViewFrame.chunks.chunkSize={0};", chunkSize);
- jsonWriter.Write("ViewFrame.chunks.northMostChunk={0};", chunkTopMetadata.North_mostChunk);
- jsonWriter.Write("ViewFrame.chunks.southMostChunk={0};", chunkTopMetadata.South_mostChunk);
- jsonWriter.Write("ViewFrame.chunks.eastMostChunk={0};", chunkTopMetadata.East_mostChunk);
- jsonWriter.Write("ViewFrame.chunks.westMostChunk={0};", chunkTopMetadata.West_mostChunk);
- //MAP object format - [key, value]: key is "x_y"
- jsonWriter.Write("ViewFrame.chunks.chunkMetadata=new Map([");
- foreach (var shard in chunkTopMetadata)
+ using (var eoiFile = File.OpenWrite(eoiPath))
{
- jsonWriter.Write("['{0}_{1}',", shard.Location.X, shard.Location.Y);
- jsonWriter.Write("{");
- jsonWriter.Write("chunkAge:'{0}',", shard.ChunkAge.ToString("g"));//World age - relative? or last edit ??
- jsonWriter.Write("temp:{0},", shard.Temperature.ToString("F1"));
- jsonWriter.Write("YMax:{0},", shard.YMax);
- jsonWriter.Write("fert:{0},", shard.Fertility.ToString("F1"));
- jsonWriter.Write("forestDens:{0},", shard.ForestDensity.ToString("F1"));
- jsonWriter.Write("rain:{0},", shard.Rainfall.ToString("F1"));
- jsonWriter.Write("shrubDens:{0},", shard.ShrubDensity.ToString("F1"));
- jsonWriter.Write("airBlocks:{0},", shard.AirBlocks);
- jsonWriter.Write("nonAirBlocks:{0},", shard.NonAirBlocks);
- //TODO: Heightmap
- //TODO: Rock-ratio
- jsonWriter.Write("}],");
+ Serializer.Serialize<EntitiesOfInterest>(eoiFile, this.EOIs);
}
- jsonWriter.Write("]);");
+ }
+ //Create Easy to Parse TSV file for tool/human use....
+ string pointsTsvPath = Path.Combine(path, pointsTsvFileName);
- jsonWriter.Write("ViewFrame.chunks.pointsOfInterest = new Map([");
- foreach (var poi in POIs)
+ using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8))
+ {
+ tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\t");
+ foreach (var point in this.POIs)
{
- jsonWriter.Write("['{0}_{1}',", poi.Location.X, poi.Location.Z);
- jsonWriter.Write("{");
- jsonWriter.Write("notes:'{0}',", poi.Notes.Replace("'", "\'").Replace("\n","\\n"));
- jsonWriter.Write("time:new Date('{0}'),", poi.Timestamp.ToString("O"));
- jsonWriter.Write("chunkPos:'{0}_{1}',", (poi.Location.X / chunkSize), (poi.Location.Z / chunkSize));
- jsonWriter.Write("}],");
+ tsvWriter.Write(point.Name + "\t");
+ var notes = point.Notes
+ .Replace("\n", "\\n")
+ .Replace("\t", "\\t")
+ .Replace("\\", "\\\\");
+ tsvWriter.Write(notes + "\t");
+ tsvWriter.Write(point.Location.PrettyCoords(ClientAPI) + "\t");
+ tsvWriter.Write(point.Timestamp.ToString("u") + "\t");
+ tsvWriter.WriteLine();
}
-
- foreach (var poi in EOIs.PointsList)
+ foreach (var entity in this.EOIs)
{
- jsonWriter.Write("['{0}_{1}',", poi.Location.X, poi.Location.Z);
- jsonWriter.Write("{");
- jsonWriter.Write("notes:'{0}',", poi.Notes.Replace("'", "\'"));
- jsonWriter.Write("time:new Date('{0}'),", poi.Timestamp.ToString("O"));
- jsonWriter.Write("chunkPos:'{0}_{1}',", (poi.Location.X / chunkSize), (poi.Location.Z / chunkSize));
- jsonWriter.Write("}],");
+ tsvWriter.Write(entity.Name + "\t");
+ var notes = entity.Notes
+ .Replace("\n", "\\n")
+ .Replace("\t", "\\t")
+ .Replace("\\", "\\\\");
+ tsvWriter.Write(notes + "\t");
+ tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t");
+ tsvWriter.Write(entity.Timestamp.ToString("u") + "\t");
+ tsvWriter.WriteLine();
}
- jsonWriter.Write("]);");
-
- jsonWriter.Flush();
+ tsvWriter.WriteLine();
+ tsvWriter.Flush();
}
}
-
private ColumnMeta CreateColumnMetadata(KeyValuePair<Vec2i, uint> mostActiveCol, IMapChunk mapChunk)
{
- ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), chunkSize);
+ ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), ClientAPI, (byte) chunkSize);
BlockPos equivBP = new BlockPos(mostActiveCol.Key.X * chunkSize,
mapChunk.YMax,
mostActiveCol.Key.Y * chunkSize);
/// <returns>The metadata.</returns>
private void Reload_Metadata()
{
- var worldmapDir = new DirectoryInfo(path);
+ var shardsDir = new DirectoryInfo( Path.Combine(path, _chunkPath) );
- if (worldmapDir.Exists)
+ if (!shardsDir.Exists)
{
+ #if DEBUG
+ Logger.VerboseDebug("Could not open world map (shards) directory");
+ #endif
+ return;
+ }
+ var shardFiles = shardsDir.GetFiles(chunkFile_filter);
- var files = worldmapDir.GetFiles(chunkFile_filter);
+ if (shardFiles.Length > 0)
+ {
+ #if DEBUG
+ Logger.VerboseDebug("Metadata reloading from {0} shards", shardFiles.Length);
+ #endif
- if (files.Length > 0)
+ foreach (var shardFile in shardFiles)
{
-#if DEBUG
- Logger.VerboseDebug("{0} Existing world chunk shards", files.Length);
-#endif
+ if (shardFile.Length < 1024) continue;
+ var result = chunkShardRegex.Match(shardFile.Name);
+ if (!result.Success) continue;
+ int X_chunk_pos = int.Parse(result.Groups["X"].Value);
+ int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
- foreach (var shardFile in files)
+ try
{
-
- if (shardFile.Length < 512) continue;
- var result = chunkShardRegex.Match(shardFile.Name);
- if (result.Success)
+ using (var fileStream = shardFile.OpenRead())
{
- int X_chunk_pos = int.Parse(result.Groups["X"].Value);
- int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
+ PngReader pngRead = new PngReader(fileStream);
+ pngRead.ReadSkippingAllRows();
+ pngRead.End();
//Parse PNG chunks for METADATA in shard
- using (var fileStream = shardFile.OpenRead())
- {
- //TODO: Add corrupted PNG Exception handing HERE !
- PngReader pngRead = new PngReader(fileStream);
- pngRead.ReadSkippingAllRows();
- pngRead.End();
-
- PngMetadataChunk metadataFromPng = pngRead.GetChunksList().GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
-
- chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
- }
-
+ PngMetadataChunk metadataFromPng = pngRead.GetChunksList().GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
+ var column = metadataFromPng.ChunkMetadata;
+ if (column.PrettyLocation == null)
+ column = column.Reload(ClientAPI);
+ chunkTopMetadata.Add(column);
}
- }
+ }
+ catch (PngjException someEx)
+ {
+ Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
+ continue;
+ }
}
}
- else
+
+ //POI and EOI raw dump files ~ reload em!
+ //var poiRawFile = File.
+ string poiPath = Path.Combine(path, poiFileName);
+ string eoiPath = Path.Combine(path, eoiFileName);
+
+ if (File.Exists(poiPath))
{
-#if DEBUG
- Logger.VerboseDebug("Could not open world map directory");
-#endif
+ using (var poiFile = File.OpenRead(poiPath))
+ {
+ this.POIs = Serializer.Deserialize<PointsOfInterest>(poiFile);
+ Logger.VerboseDebug("Reloaded {0} POIs from file.", this.POIs.Count);
+ }
}
-
+ if (File.Exists(eoiPath))
+ {
+ using (var eoiFile = File.OpenRead(eoiPath))
+ {
+ this.EOIs = Serializer.Deserialize<EntitiesOfInterest>(eoiFile);
+ Logger.VerboseDebug("Reloaded {0} EOIs from file.", this.EOIs.Count);
+ }
+ }
}
- private PngWriter SetupPngImage(Vec2i coord, ColumnMeta metadata)
+ private PngWriter SetupPngImage(Vec2i coord, ref ColumnMeta metadata)
{
ImageInfo imageInf = new ImageInfo(chunkSize, chunkSize, 8, false);
string filename = $"{coord.X}_{coord.Y}.png";
- filename = Path.Combine(path, filename);
+ filename = Path.Combine(path, _chunkPath ,filename);
PngWriter pngWriter = FileHelper.CreatePngWriter(filename, imageInf, true);
PngMetadata meta = pngWriter.GetMetadata();
meta.SetText("Chunk_X", coord.X.ToString("D"));
meta.SetText("Chunk_Y", coord.Y.ToString("D"));
//Setup specialized meta-data PNG chunks here...
- PngMetadataChunk pngChunkMeta = new PngMetadataChunk(pngWriter.ImgInfo);
- pngChunkMeta.ChunkMetadata = metadata;
+ PngMetadataChunk pngChunkMeta = new PngMetadataChunk(pngWriter.ImgInfo)
+ {
+ ChunkMetadata = metadata
+ };
pngWriter.GetChunksList().Queue(pngChunkMeta);
+ pngWriter.CompLevel = 5;// 9 is the maximum compression but thats too high for the small benefit it gives
+ pngWriter.CompressionStrategy = Hjg.Pngcs.Zlib.EDeflateCompressStrategy.Huffman;
return pngWriter;
}
/// <summary>
- /// Does the heavy lifting of Scanning columns of chunks - creates Heightmap and Processes POIs, Entities, and stats...
+ /// Does the heavy lifting of Scanning columns of chunks - scans for BlockEntity, creates Heightmap and stats...
/// </summary>
/// <param name="key">Chunk Coordinate</param>
/// <param name="mapChunk">Map chunk.</param>
/// <param name="chunkMeta">Chunk metadata</param>
- private void ProcessChunkBlocks(Vec2i key, IMapChunk mapChunk, ColumnMeta chunkMeta)
+ private void ProcessChunkBlocks(Vec2i key, IMapChunk mapChunk, ref ColumnMeta chunkMeta)
{
int targetChunkY = mapChunk.YMax / chunkSize;//Surface ...
#if DEBUG
Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
#endif
+ nullChunkCount++;
continue;
}
foreach (var blockEnt in chunkData.BlockEntities)
{
-
if (blockEnt != null && blockEnt.Block != null && BlockID_Designators.ContainsKey(blockEnt.Block.BlockId))
{
var designator = BlockID_Designators[blockEnt.Block.BlockId];
designator.SpecialAction(ClientAPI, POIs, blockEnt.Pos.Copy(), blockEnt.Block);
}
}
-
}
/********************* Chunk/Column BLOCKs scanning ****************/
//Heightmap, Stats, block tally
chunkData.Unpack();
- int X_index, Y_index, Z_index;
- X_index = Y_index = Z_index = 0;
-
- do
- {
- do
- {
- do
- {
- /* Encode packed indicie
- (y * chunksize + z) * chunksize + x
- */
- var indicie = Helpers.ChunkBlockIndicie16(X_index, Y_index, Z_index);
- int aBlockId = chunkData.Blocks[indicie];
-
- if (aBlockId == 0)
- {//Air
- chunkMeta.AirBlocks++;
- continue;
- }
-
- if (RockIdCodes.ContainsKey(aBlockId))
- {
- if (chunkMeta.RockRatio.ContainsKey(aBlockId)) { chunkMeta.RockRatio[aBlockId]++; } else { chunkMeta.RockRatio.Add(aBlockId, 1); }
- }
-
- chunkMeta.NonAirBlocks++;
-
- //Heightmap
- if (chunkMeta.HeightMap[X_index, Z_index] == 0)
- { chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize)); }
-
- }
- while (X_index++ < (chunkSize - 1));
- X_index = 0;
- }
- while (Z_index++ < (chunkSize - 1));
- Z_index = 0;
- }
- while (Y_index++ < (chunkSize - 1));
+ //int X_index, Y_index, Z_index;
+
+ //Ensure ChunkData Metadata fields arn't null...due to being tossed out
+ //if (chunkMeta.HeightMap == null) { chunkMeta.HeightMap = new ushort[chunkSize, chunkSize]; }
+ //if (chunkMeta.RockRatio == null) { chunkMeta.RockRatio = new Dictionary<int, uint>(10); }
+
+ //for (Y_index = 0; Y_index < chunkSize - 1; Y_index++)
+ //{
+ // for (Z_index = 0; Z_index < chunkSize - 1; Z_index++)
+ // {
+ // for (X_index = 0; X_index < chunkSize - 1; X_index++)
+ // {
+ // /* Encode packed indicie
+ // (y * chunksize + z) * chunksize + x
+ // */
+ // var indicie = Helpers.ChunkBlockIndicie16(X_index, Y_index, Z_index);
+ // int aBlockId = chunkData.Blocks[indicie];
+
+ // if (aBlockId == 0)
+ // {//Air
+ // chunkMeta.AirBlocks++;
+ // continue;
+ // }
+
+ // if (RockIdCodes.ContainsKey(aBlockId))
+ // {
+ // if (chunkMeta.RockRatio.ContainsKey(aBlockId))
+ // chunkMeta.RockRatio[aBlockId]++;
+ // else
+ // chunkMeta.RockRatio.Add(aBlockId, 1);
+ // }
+
+ // chunkMeta.NonAirBlocks++;
+
+ // //Heightmap
+ // //if (chunkMeta.HeightMap[X_index, Z_index] == 0)
+ // //{
+
+ // // chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize));
+ // //}
+ // }
+ // }
+
+ //}
}
}
{
Logger.Debug("Presently {0} Entities", ClientAPI.World.LoadedEntities.Count);
//Mabey scan only for 'new' entities by tracking ID in set?
- foreach (var loadedEntity in ClientAPI.World.LoadedEntities.ToList())
+ foreach (var loadedEntity in ClientAPI.World.LoadedEntities.ToArray())
{
#if DEBUG
{
var playerNodePoi = new PointOfInterest()
{
+ Name = "Note",
Location = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy(),
Notes = notation,
- Timestamp = DateTimeOffset.UtcNow,
+ Timestamp = DateTime.UtcNow,
};
this.POIs.AddReplace(playerNodePoi);
private void CommandListener(string eventName, ref EnumHandling handling, IAttribute data)
{
- Logger.VerboseDebug("MsgBus RX: AutomapCommandMsg: {0}", data.ToJsonToken());
+ //Logger.VerboseDebug("MsgBus RX: AutomapCommandMsg: {0}", data.ToJsonToken());
CommandData cmdData = data as CommandData;
-
- if (CurrentState != RunState.Snapshot)
+ switch (cmdData.State)
{
- switch (cmdData.State)
- {
- case RunState.Run:
+ case CommandType.Run:
+ case CommandType.Stop:
+ case CommandType.Snapshot:
+ if (CurrentState != cmdData.State)
+ {
CurrentState = cmdData.State;
AwakenCartographer(0.0f);
- break;
-
- case RunState.Stop:
- CurrentState = cmdData.State;
- break;
-
- case RunState.Snapshot:
- CurrentState = RunState.Stop;
- //Snapshot starts a second thread/process...
-
- break;
-
- case RunState.Notation:
- //Add to POI list where player location
- AddNote(cmdData.Notation);
- break;
- }
+ }
+ break;
+ case CommandType.Notation:
+ //Add to POI list where player location
+ AddNote(cmdData.Notation);
+ break;
}
-
- if (CurrentState != cmdData.State)
- {
- CurrentState = cmdData.State;
- AwakenCartographer(0.0f);
- }
-
#if DEBUG
ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} ");
#endif
-
}
-
-
#endregion
-
-
}
-}
\ No newline at end of file
+}