X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=Automap%2FSubsystems%2FAutomapSystem.cs;h=32cda383711866c677e55b9120e486ac8f0a6232;hb=1c8849af29a916822885541c010ffc4b7bb90d5a;hp=7af9a94d29aa2b26e327cda4642fdb42d874dc3b;hpb=4c55246e4e1705b8f88683d1e8b585005635a1ad;p=automap%2Fautomap.git diff --git a/Automap/Subsystems/AutomapSystem.cs b/Automap/Subsystems/AutomapSystem.cs index 7af9a94..32cda38 100644 --- a/Automap/Subsystems/AutomapSystem.cs +++ b/Automap/Subsystems/AutomapSystem.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; @@ -8,14 +9,12 @@ using System.Text.RegularExpressions; using System.Threading; using Hjg.Pngcs; -using Hjg.Pngcs.Chunks; - -using Newtonsoft.Json; - +using Mono.Collections.Generic; 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; @@ -26,30 +25,37 @@ namespace Automap public class AutomapSystem { private Thread cartographer_thread; + + private Snapshotter snapshot; private ICoreClientAPI ClientAPI { get; set; } private ILogger Logger { get; set; } - private IChunkRenderer ChunkRenderer { get; set; } + private AChunkRenderer 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"; + internal const uint editThreshold = 9; private const string _domain = @"automap"; private const string chunkFile_filter = @"*_*.png"; private const string poiFileName = @"poi_binary"; private const string eoiFileName = @"eoi_binary"; - private static Regex chunkShardRegex = new Regex(@"(?[\d]+)_(?[\d]+).png", RegexOptions.Singleline); + private const string pointsTsvFileName = @"points_of_interest.tsv"; + private const string plainMetadataFileName = @"map_metadata.txt"; + private static Regex chunkShardRegex = new Regex(@"(?[\d]+)_(?[\d]+)\.png", RegexOptions.Singleline); - private ConcurrentDictionary columnCounter = new ConcurrentDictionary(3, 150); + private ConcurrentDictionary columnCounters = new ConcurrentDictionary(3, 150); private ColumnsMetadata chunkTopMetadata; - private PointsOfInterest POIs = new PointsOfInterest(); - private EntitiesOfInterest EOIs = new EntitiesOfInterest(); + internal PointsOfInterest POIs = new PointsOfInterest(); + internal EntitiesOfInterest EOIs = new EntitiesOfInterest(); internal Dictionary BlockID_Designators { get; private set; } internal Dictionary Entity_Designators { get; private set; } internal Dictionary RockIdCodes { get; private set; } + internal Dictionary AiryIdCodes { get; private 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; @@ -60,28 +66,26 @@ namespace Automap public static string AutomapStatusEventKey = @"AutomapStatus"; public static string AutomapCommandEventKey = @"AutomapCommand"; - PersistedConfiguration cachedConfiguration; 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; - + configuration = config; + ClientAPI.Event.LevelFinalize += EngageAutomap; - //TODO:Choose which one from GUI - this.ChunkRenderer = new StandardRenderer(clientAPI, logger); + this.ChunkRenderer = InstantiateChosenRenderer(config.RendererName); //Listen on bus for commands ClientAPI.Event.RegisterEventBusListener(CommandListener, 1.0, AutomapSystem.AutomapCommandEventKey); - if (configuration.Autostart) + + if (configuration.Autostart) { CurrentState = CommandType.Run; - Logger.Debug("Autostart is Enabled."); + Logger.Notification("Autostart is Enabled."); } } @@ -92,7 +96,9 @@ namespace Automap { 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); string mapFilename = Path.Combine(path, "automap.html"); StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)); @@ -102,9 +108,8 @@ namespace Automap outputText.Flush(); Prefill_POI_Designators(); - startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Z / chunkSize)); + startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.Pos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.Pos.AsBlockPos.Z / chunkSize)); chunkTopMetadata = new ColumnsMetadata(startChunkColumn); - Logger.Notification("AUTOMAP Start {0}", startChunkColumn); Reload_Metadata(); @@ -117,23 +122,32 @@ namespace Automap IsBackground = true }; - ClientAPI.Event.RegisterGameTickListener(AwakenCartographer, 6000); + ClientAPI.Event.RegisterGameTickListener(ThreadDecider, 6000); } private void ChunkAChanging(Vec3i chunkCoord, IWorldChunk chunk, EnumChunkDirtyReason reason) { - Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z); - - columnCounter.AddOrUpdate(topPosition, 1, (key, colAct) => colAct + 1); + Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z); + bool newOrEdit = (reason == EnumChunkDirtyReason.NewlyCreated || reason == EnumChunkDirtyReason.NewlyLoaded); + + columnCounters.AddOrUpdate(topPosition, + new ColumnCounter(chunkSize, newOrEdit, chunkCoord), + (chkPos, chkChng) => chkChng.Update(chunkCoord, chunkSize, newOrEdit) + ); + } - private void AwakenCartographer(float delayed) + /// + /// Cartographer Thread 'decider' + /// + /// called delay offset + private void ThreadDecider(float delayed) { if (CurrentState == CommandType.Run && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true)) { #if DEBUG - Logger.VerboseDebug("Cartographer re-trigger from [{0}]", cartographer_thread.ThreadState); + Logger.VerboseDebug("ThreadDecider re-trigger from [{0}]", cartographer_thread.ThreadState); #endif if (cartographer_thread.ThreadState.HasFlag(ThreadState.Unstarted)) @@ -151,9 +165,22 @@ namespace Automap } else if (CurrentState == CommandType.Snapshot) { - //TODO: Snapshot generator second thread... + //Prepare for taking a snopshot + if (snapshot == null) { + snapshot = new Snapshotter(path, chunkTopMetadata, chunkSize, ClientAPI.World.Seed); + #if DEBUG + Logger.VerboseDebug("Starting new Snapshot: {0} Wx{1} Hx{2}", snapshot.fileName, snapshot.Width, snapshot.Height); + #endif + snapshot.Take( ); + } + else if (snapshot != null && snapshot.Finished) { + #if DEBUG + Logger.VerboseDebug("COMPLETED Snapshot: {0} Wx{1} Hx{2}, taking {3}", snapshot.fileName, snapshot.Width, snapshot.Height, snapshot.Timer.Elapsed); + #endif + snapshot = null; + CurrentState = CommandType.Run; + } } - } @@ -164,15 +191,15 @@ namespace Automap try { - uint ejectedItem = 0; + ColumnCounter ejectedItem ; uint updatedChunks = 0; uint updatedPixels = 0; //-- Should dodge enumerator changing underfoot....at a cost. - if (!columnCounter.IsEmpty) + if (!columnCounters.IsEmpty) { - var tempSet = columnCounter.ToArray().OrderByDescending(kvp => kvp.Value); - UpdateEntityMetadata( ); + var tempSet = columnCounters.ToArray().Where(cks => cks.Value.WeightedSum > editThreshold) .OrderByDescending(kvp => kvp.Value.WeightedSum); + UpdateEntityMetadata(); foreach (var mostActiveCol in tempSet) { @@ -180,41 +207,52 @@ namespace Automap if (mapChunk == null) { + //TODO: REVISIT THIS CHUNK! + #if DEBUG Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key); - nullChunkCount++; - columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem); + #endif + nullMapCount++; + columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem); continue; } ColumnMeta chunkMeta; - if (chunkTopMetadata.Contains(mostActiveCol.Key)) { - chunkMeta = chunkTopMetadata[mostActiveCol.Key]; + if (chunkTopMetadata.Contains(mostActiveCol.Key)) + { + chunkMeta = chunkTopMetadata[mostActiveCol.Key]; + #if DEBUG + Logger.VerboseDebug("Loaded meta-chunk {0}", mostActiveCol.Key); + #endif } - else { - chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk); + else + { + chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk); + #if DEBUG + Logger.VerboseDebug("Created meta-chunk {0}", mostActiveCol.Key); + #endif } - ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta); + mostActiveCol.Value.SetCutoff(chunkMeta.YMax / chunkSize); - PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, chunkMeta); - ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, pngWriter, out updatedPixels); + ChunkRenderer.SetupPngImage(mostActiveCol.Key, path, _chunkPath, ref chunkMeta); + ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, ref chunkTopMetadata, out updatedPixels); if (updatedPixels > 0) { - #if DEBUG - Logger.VerboseDebug("Wrote chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels); + Logger.VerboseDebug("Wrote top-chunk shard: ({0}) - Weight:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels); #endif updatedChunks++; chunkTopMetadata.Update(chunkMeta); - columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem); + columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem); } else { - columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem); - Logger.VerboseDebug("Un-painted chunk: ({0}) ", mostActiveCol.Key); + columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem); + #if DEBUG + Logger.VerboseDebug("Un-painted chunk shard: ({0}) ", mostActiveCol.Key); + #endif } - } } @@ -224,33 +262,72 @@ namespace Automap { //What about chunk updates themselves; a update bitmap isn't kept... updatedChunksTotal += updatedChunks; - GenerateJSONMetadata(); - PersistPointsData( ); + JsonGenerator.GenerateJSONMetadata(chunkTopMetadata, startChunkColumn, POIs, EOIs, RockIdCodes); updatedChunks = 0; + + //Cleanup in-memory Metadata... + chunkTopMetadata.ClearMetadata( ); } - //Then sleep until interupted again, and repeat + #if DEBUG + Logger.VerboseDebug("Clearing Column Counters of: {0} non-written shards", columnCounters.Count); + #endif - Logger.VerboseDebug("Thread '{0}' about to sleep indefinitely.", Thread.CurrentThread.Name); + columnCounters.Clear( ); + //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(); + Write_PlainMetadata( ); + } + } + + 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; } } @@ -268,291 +345,163 @@ namespace Automap this.Entity_Designators = new Dictionary(); 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 + var airBlocksQuery = from airyBlock in ClientAPI.World.Blocks + where airyBlock.MatterState == EnumMatterState.Solid + where airyBlock.BlockMaterial == EnumBlockMaterial.Plant || airyBlock.BlockMaterial == EnumBlockMaterial.Leaves + where airyBlock.CollisionBoxes == null || airyBlock.CollisionBoxes.Length == 0 || airyBlock.RainPermeable == true + select airyBlock; + //^^ 'Solid' phase - 'Plant' Blocks without any bounding-box; OR 'Invisible' shapes... + var invisibleBlocksQuery = from novisBlock in ClientAPI.World.Blocks + where novisBlock.Shape == null || novisBlock.Shape.Base.EndsWith(GlobalConstants.DefaultDomain, @"invisible") //Whaat! [ base: "block/basic/invisible" ] + select novisBlock; + this.AiryIdCodes = airBlocksQuery.Union(invisibleBlocksQuery).ToDictionary(aBlk => aBlk.BlockId, aBlk => aBlk.Code.Path); + + #if DEBUG + foreach (var fluffBlock in AiryIdCodes) { + Logger.VerboseDebug("ID#\t{0}:\t{1} IGNORED", fluffBlock.Key, fluffBlock.Value); + } + Logger.VerboseDebug("Ignoring {0} blocks", AiryIdCodes.Count); + #endif - Reload_POI_Designators(); + //Add special marker types for BlockID's of "Interest", overwrite colour, and method + Reload_POI_Designators(); } private void Reload_POI_Designators() - { - Logger.VerboseDebug("Connecting {0} Configured Block-Designators", configuration.BlockDesignators.Count); + { + uint poisSetup =0, eoiSetup = 0; foreach (var designator in configuration.BlockDesignators) { + if (designator.Enabled == false) continue; 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); } foreach (var entry in blockIDs) { BlockID_Designators.Add(entry.Key, designator); + poisSetup++; } } this.ChunkRenderer.BlockID_Designators = BlockID_Designators; + Logger.VerboseDebug("Connected {0} IDs from {1} Block-Designators", poisSetup, configuration.BlockDesignators.Count ); - Logger.VerboseDebug("Connecting {0} Configured Entity-Designators", configuration.EntityDesignators.Count); foreach (var designator in configuration.EntityDesignators) { + if (designator.Enabled == false) continue; //Get Variants first, from EntityTypes...better be populated! var matched = ClientAPI.World.EntityTypes.FindAll(entp => entp.Code.BeginsWith(designator.Pattern.Domain, designator.Pattern.Path)); foreach (var match in matched) - { + { Logger.VerboseDebug("Linked Entity: {0} Designator: {1}", match.Code, designator); this.Entity_Designators.Add(match.Code, designator); + eoiSetup++; } - - - - //EntityProperties props = ClientAPI.World.GetEntityType(designator.Pattern); } - + Logger.VerboseDebug("Connected {0} IDs from {1} Entity-Designators", eoiSetup, configuration.EntityDesignators.Count); } + /// - /// Generates the JSON Metadata. (in Map object format ) + /// Store Points/Entity of Interest /// - private void GenerateJSONMetadata() + private void PersistPointsData() { - string jsonFilename = Path.Combine(path, "Metadata.js"); - - StreamWriter stream = new StreamWriter(jsonFilename, false, Encoding.UTF8); - - using (stream) { - JsonTextWriter jsonWriter = new JsonTextWriter(stream); - - jsonWriter.Formatting = Formatting.None; - jsonWriter.StringEscapeHandling = StringEscapeHandling.EscapeHtml; - jsonWriter.Indentation = 0; - //jsonWriter.AutoCompleteOnClose = true; - jsonWriter.QuoteChar = '\''; - jsonWriter.DateFormatHandling = DateFormatHandling.IsoDateFormat; - jsonWriter.DateTimeZoneHandling = DateTimeZoneHandling.Utc; + //POI and EOI raw dump files ~ WRITE em! + //var poiRawFile = File. + string poiPath = Path.Combine(path, poiFileName); + string eoiPath = Path.Combine(path, eoiFileName); - using (jsonWriter) + if (this.POIs.Count > 0) { - jsonWriter.WriteRaw("ViewFrame.chunks={};\n"); - jsonWriter.WriteRaw("ViewFrame.chunks.worldSeedNum=" ); - jsonWriter.WriteValue(ClientAPI.World.Seed); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.genTime="); - jsonWriter.WriteValue(DateTimeOffset.UtcNow); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.startCoords="); - jsonWriter.WriteStartArray( ); - jsonWriter.WriteValue(startChunkColumn.X); - jsonWriter.WriteValue(startChunkColumn.Y); - jsonWriter.WriteEndArray( ); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.chunkSize="); - jsonWriter.WriteValue(chunkSize); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.northMostChunk="); - jsonWriter.WriteValue(chunkTopMetadata.North_mostChunk); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.southMostChunk="); - jsonWriter.WriteValue(chunkTopMetadata.South_mostChunk); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.westMostChunk="); - jsonWriter.WriteValue(chunkTopMetadata.West_mostChunk); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.eastMostChunk="); - jsonWriter.WriteValue(chunkTopMetadata.East_mostChunk); - jsonWriter.WriteRaw(";\n"); - - - //MAP object format - [key, value]: key is "x_y" - jsonWriter.WriteRaw("ViewFrame.chunks.chunkMetadata="); - jsonWriter.WriteStartConstructor("Map"); - jsonWriter.WriteStartArray( );//An array of... 2-component arrays - - - foreach (var shard in chunkTopMetadata) + using (var poiFile = File.Open(poiPath, FileMode.Create, FileAccess.Write, FileShare.None)) { - jsonWriter.WriteStartArray( );//Start tuple - jsonWriter.WriteValue($"{shard.Location.X}_{shard.Location.Y}");//Key of Tuple - - jsonWriter.WriteStartObject( ); - jsonWriter.WritePropertyName("prettyCoord"); - jsonWriter.WriteValue( shard.Location.PrettyCoords(ClientAPI)); - - jsonWriter.WritePropertyName("chunkAge"); - jsonWriter.WriteValue(shard.ChunkAge); - - jsonWriter.WritePropertyName("temp"); - jsonWriter.WriteValue(shard.Temperature); - - jsonWriter.WritePropertyName("YMax"); - jsonWriter.WriteValue(shard.YMax); - - jsonWriter.WritePropertyName("fert"); - jsonWriter.WriteValue(shard.Fertility); - - jsonWriter.WritePropertyName("forestDens"); - jsonWriter.WriteValue( shard.ForestDensity); - - jsonWriter.WritePropertyName("rain"); - jsonWriter.WriteValue( shard.Rainfall); - - jsonWriter.WritePropertyName("shrubDens"); - jsonWriter.WriteValue( shard.ShrubDensity); - - jsonWriter.WritePropertyName("airBlocks"); - jsonWriter.WriteValue( shard.AirBlocks); - - jsonWriter.WritePropertyName("nonAirBlocks"); - jsonWriter.WriteValue( shard.NonAirBlocks); - - //TODO: Heightmap ? - //Start rockMap ; FOR a Ratio....on tooltip GUI - jsonWriter.WritePropertyName("rockRatio"); - jsonWriter.WriteStartConstructor("Map"); - jsonWriter.WriteStartArray( ); - foreach (var rockEntry in shard.RockRatio) { - var rockBlock = ClientAPI.World.GetBlock(rockEntry.Key); - jsonWriter.WriteStartArray( ); - jsonWriter.WriteValue(rockBlock.Code.Path); - jsonWriter.WriteValue(rockEntry.Value);//Total per chunk-column - jsonWriter.WriteEndArray( ); - } - jsonWriter.WriteEndArray( ); - jsonWriter.WriteEndConstructor( );//end rock-map - - jsonWriter.WriteEndObject( );//end Map value: {Object} - jsonWriter.WriteEndArray( );//end Tuple + Serializer.Serialize(poiFile, this.POIs); + poiFile.Flush(true); } + } - jsonWriter.WriteEndArray( );//Enclose tuples of chunkMetadata - jsonWriter.WriteEndConstructor( );//Close constructor of Map (chunkMetadata) - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.pointsOfInterest="); - jsonWriter.WriteStartConstructor("Map"); - jsonWriter.WriteStartArray( );//An array of... 2-component arrays - - foreach (var poi in POIs) + if (this.EOIs.Count > 0) + { + using (var eoiFile = File.Open(eoiPath, FileMode.Create, FileAccess.Write, FileShare.None)) { - jsonWriter.WriteStartArray( ); - jsonWriter.WriteValue($"{poi.Location.X}_{poi.Location.Z}"); - - jsonWriter.WriteStartObject(); - jsonWriter.WritePropertyName("Name"); - jsonWriter.WriteValue(poi.Name); - - jsonWriter.WritePropertyName("prettyCoord"); - jsonWriter.WriteValue(poi.Location.PrettyCoords(ClientAPI) ); - - jsonWriter.WritePropertyName("notes"); - jsonWriter.WriteValue(poi.Notes);//Encoded to HTML Entities - - jsonWriter.WritePropertyName("time"); - jsonWriter.WriteValue(poi.Timestamp); - - jsonWriter.WritePropertyName("chunkPos"); - jsonWriter.WriteValue($"{(poi.Location.X / chunkSize)}_{(poi.Location.Z / chunkSize)}"); - - jsonWriter.WriteEndObject( ); - jsonWriter.WriteEndArray( ); + Serializer.Serialize(eoiFile, this.EOIs); + eoiFile.Flush(true); } + } - foreach (var poi in EOIs) - { - jsonWriter.WriteStartArray( ); - jsonWriter.WriteValue($"{poi.Location.X}_{poi.Location.Z}"); - - jsonWriter.WriteStartObject( ); - jsonWriter.WritePropertyName("Name"); - jsonWriter.WriteValue(poi.Name); - - jsonWriter.WritePropertyName("prettyCoord"); - jsonWriter.WriteValue(poi.Location.PrettyCoords(ClientAPI)); - - jsonWriter.WritePropertyName("notes"); - jsonWriter.WriteValue(poi.Notes);//Encoded to HTML Entities - - jsonWriter.WritePropertyName("time"); - jsonWriter.WriteValue(poi.Timestamp); - - jsonWriter.WritePropertyName("chunkPos"); - jsonWriter.WriteValue($"{(poi.Location.X / chunkSize)}_{(poi.Location.Z / chunkSize)}"); + //Create Easy to Parse TSV file for tool/human use.... + string pointsTsvPath = Path.Combine(path, pointsTsvFileName); - jsonWriter.WriteEndObject( ); - jsonWriter.WriteEndArray( ); + using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8)) + { + tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination\tEntity_UID"); + foreach (var point in this.POIs) + { + tsvWriter.Write(point.Name + "\t"); + var notes = point.Notes + .Replace('\n', '\x001f') + .Replace("\t", "\\t") + .Replace("\\", "\\\\"); + tsvWriter.Write(notes + "\t"); + tsvWriter.Write(point.Location.PrettyCoords(ClientAPI) + "\t"); + tsvWriter.Write(point.Timestamp.ToString("u") + "\t"); + tsvWriter.Write((point.Destination != null ? point.Destination.PrettyCoords(ClientAPI) : "---") +"\t"); + tsvWriter.Write("null\t"); + tsvWriter.WriteLine(); } - - jsonWriter.WriteEndArray( ); - jsonWriter.WriteEndConstructor( ); - jsonWriter.WriteRaw(";\n"); - - jsonWriter.WriteWhitespace("\n"); - jsonWriter.WriteComment("============= BlockID's for Rockmap / Rock-ratios ==============="); - jsonWriter.WriteWhitespace("\n"); - - jsonWriter.WriteRaw("ViewFrame.chunks.rock_Lookup ="); - jsonWriter.WriteStartConstructor("Map"); - jsonWriter.WriteStartArray( );//An array of... 2-component arrays - - foreach (var entry in RockIdCodes) { - var block = ClientAPI.World.GetBlock(entry.Key); - - jsonWriter.WriteStartArray( ); - jsonWriter.WriteValue(block.Code.Path); - - jsonWriter.WriteStartObject( ); - jsonWriter.WritePropertyName("assetCode"); - jsonWriter.WriteValue(entry.Value); - - jsonWriter.WritePropertyName("name"); - jsonWriter.WriteValue(Lang.GetUnformatted(block.Code.Path)); - //Color? - - jsonWriter.WriteEndObject( ); - jsonWriter.WriteEndArray( ); + foreach (var entity in this.EOIs) + { + tsvWriter.Write(entity.Name + "\t"); + var notes = entity.Notes + .Replace('\n', '\x001f') + .Replace("\t", "\\t") + .Replace("\\", "\\\\"); + tsvWriter.Write(notes + "\t"); + tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t"); + tsvWriter.Write(entity.Timestamp.ToString("u") + "\t"); + tsvWriter.Write("---\t"); + tsvWriter.Write(entity.EntityId.ToString("D")); + tsvWriter.WriteLine(); } - jsonWriter.WriteEndArray( ); - jsonWriter.WriteEndConstructor(); - - jsonWriter.WriteRaw(";\n"); - - jsonWriter.Flush(); - } + tsvWriter.WriteLine(); + tsvWriter.Flush(); } } - /// - /// Store Points/Entity of Interest - /// - private void PersistPointsData( ) - { - //POI and EOI raw dump files ~ reload em! - //var poiRawFile = File. - string poiPath = Path.Combine(path, poiFileName); - string eoiPath = Path.Combine(path, eoiFileName); - - if (this.POIs.Count > 0) { - using (var poiFile = File.OpenWrite(poiPath)) { - Serializer.Serialize(poiFile, this.POIs); - } - } + private void Write_PlainMetadata( ) + { + string metaPath = Path.Combine(path, plainMetadataFileName); - if (this.EOIs.Count > 0) { - using (var eoiFile = File.OpenWrite(eoiPath)) { - Serializer.Serialize(eoiFile, this.EOIs); - } + using (var metaDataFile = File.Open(metaPath,FileMode.Create)) { + using (var mdWriter = new StreamWriter(metaDataFile, Encoding.ASCII)) + { + mdWriter.WriteLine("WorldSeed {0}", ClientAPI.World.Seed); + mdWriter.WriteLine("PlayerChunkCoords {0:D} {1:D}", startChunkColumn.X, startChunkColumn.Y); + mdWriter.WriteLine("DefaultSpawnPos {0:D} {1:D} {2:D}", ClientAPI.World.DefaultSpawnPosition.AsBlockPos.X,ClientAPI.World.DefaultSpawnPosition.AsBlockPos.Y,ClientAPI.World.DefaultSpawnPosition.AsBlockPos.Z); + //mdWriter.WriteLine("CurrentPlayerSpawn", ClientAPI.World.Player.WorldData.EntityPlayer.); + mdWriter.WriteLine("ChunkSize {0}", chunkSize); + mdWriter.WriteLine("SeaLevel {0:D}", ClientAPI.World.SeaLevel); + mdWriter.WriteLine("WorldSize {0:D} {1:D} {2:D}", ClientAPI.World.BulkBlockAccessor.MapSizeX, ClientAPI.World.BulkBlockAccessor.MapSizeY,ClientAPI.World.BulkBlockAccessor.MapSizeZ); + mdWriter.WriteLine("RegionSize {0:D}", ClientAPI.World.BulkBlockAccessor.RegionSize); + mdWriter.WriteLine("AMVersion '{0}'", ClientAPI.Self().Info.Version); + mdWriter.WriteLine("PlayTime {0:F1}", ClientAPI.InWorldEllapsedMilliseconds / 1000); + mdWriter.WriteLine("GameDate {0}", ClientAPI.World.Calendar.PrettyDate()); + mdWriter.WriteLine("Chunks {0:D}", chunkTopMetadata.Count); + mdWriter.WriteLine("Chunks Updated {0:D}", updatedChunksTotal); + mdWriter.WriteLine("Null Chunks {0:D}", nullChunkCount); + mdWriter.Flush( ); + } } } + - private ColumnMeta CreateColumnMetadata(KeyValuePair mostActiveCol, IMapChunk mapChunk) + private ColumnMeta CreateColumnMetadata(KeyValuePair mostActiveCol, IMapChunk mapChunk) { - ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), ( byte )chunkSize); + ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), ClientAPI, (byte) chunkSize, (ClientAPI.World.BlockAccessor.MapSizeY / chunkSize)); BlockPos equivBP = new BlockPos(mostActiveCol.Key.X * chunkSize, mapChunk.YMax, mostActiveCol.Key.Y * chunkSize); @@ -569,105 +518,89 @@ namespace Automap /// The metadata. 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 shardFiles = worldmapDir.GetFiles(chunkFile_filter); + if (shardFiles.Length > 0) + { + #if DEBUG + Logger.VerboseDebug("Metadata reloading from {0} shards", shardFiles.Length); + #endif - if (shardFiles.Length > 0) + foreach (var shardFile in shardFiles) { - #if DEBUG - Logger.VerboseDebug("Metadata reloading from {0} shards", shardFiles.Length); - #endif - - foreach (var shardFile in shardFiles) { if (shardFile.Length < 1024) continue; var result = chunkShardRegex.Match(shardFile.Name); - if (result.Success) { + if (!result.Success) continue; + int X_chunk_pos = int.Parse(result.Groups["X"].Value); int Z_chunk_pos = int.Parse(result.Groups["Z"].Value); - try + try + { + using (var fileStream = shardFile.OpenRead()) { - using (var fileStream = shardFile.OpenRead( )) { - - PngReader pngRead = new PngReader(fileStream); - pngRead.ReadSkippingAllRows( ); - pngRead.End( ); - //Parse PNG chunks for METADATA in shard - PngMetadataChunk metadataFromPng = pngRead.GetChunksList( ).GetById1(PngMetadataChunk.ID) as PngMetadataChunk; - chunkTopMetadata.Add(metadataFromPng.ChunkMetadata); + PngReader pngRead = new PngReader(fileStream); + pngRead.ReadSkippingAllRows(); + pngRead.End(); + //Parse PNG chunks for METADATA in shard + 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 in file '{0}' - Reason: {1}", shardFile.Name, someEx); - continue; - } } - + catch (PngjException someEx) + { + Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx); + continue; + } + catch (ProtoException protoEx) + { + Logger.Error("ProtoBuf invalid! file:'{0}' - Reason: {1}", shardFile.Name, protoEx); + continue; } } + } - //POI and EOI raw dump files ~ reload em! - //var poiRawFile = File. - string poiPath = Path.Combine(path, poiFileName); - string eoiPath = Path.Combine(path, eoiFileName); + //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)) { - using (var poiFile = File.OpenRead(poiPath)) { + if (File.Exists(poiPath)) + { + using (var poiFile = File.OpenRead(poiPath)) + { this.POIs = Serializer.Deserialize(poiFile); Logger.VerboseDebug("Reloaded {0} POIs from file.", this.POIs.Count); - } } + } - if (File.Exists(eoiPath)) { - using (var eoiFile = File.OpenRead(eoiPath)) { + if (File.Exists(eoiPath)) + { + using (var eoiFile = File.OpenRead(eoiPath)) + { this.EOIs = Serializer.Deserialize(eoiFile); Logger.VerboseDebug("Reloaded {0} EOIs from file.", this.EOIs.Count); - } } - - } - else - { - #if DEBUG - Logger.VerboseDebug("Could not open world map directory"); - #endif } - - } - private PngWriter SetupPngImage(Vec2i coord, ColumnMeta metadata) - { - ImageInfo imageInf = new ImageInfo(chunkSize, chunkSize, 8, false); - - string filename = $"{coord.X}_{coord.Y}.png"; - filename = Path.Combine(path, filename); - - PngWriter pngWriter = FileHelper.CreatePngWriter(filename, imageInf, true); - PngMetadata meta = pngWriter.GetMetadata(); - meta.SetTimeNow(); - 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) - { - ChunkMetadata = metadata - }; - pngWriter.GetChunksList().Queue(pngChunkMeta); - pngWriter.CompLevel = 9;// 9 is the maximum compression - pngWriter.CompressionStrategy = Hjg.Pngcs.Zlib.EDeflateCompressStrategy.Huffman; - return pngWriter; - } /// /// Does the heavy lifting of Scanning columns of chunks - scans for BlockEntity, creates Heightmap and stats... @@ -677,105 +610,145 @@ namespace Automap /// Chunk metadata private void ProcessChunkBlocks(Vec2i key, IMapChunk mapChunk, ref ColumnMeta chunkMeta) { + int targetChunkY = mapChunk.YMax / chunkSize;//Surface ish... + byte chunkTally = 0; + + #if DEBUG + Logger.VerboseDebug("Start col @ X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y); + #endif - int targetChunkY = mapChunk.YMax / chunkSize;//Surface ... - for (; targetChunkY > 0; targetChunkY--) + chunkMeta.ResetMetadata(ClientAPI.World.BlockAccessor.MapSizeY); + + for (; targetChunkY > 0; targetChunkY--) { - WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk; + WorldChunk worldChunk = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk; - if (chunkData == null || chunkData.BlockEntities == null) { - #if DEBUG - Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y); - #endif - continue; - } + if (worldChunk == null || worldChunk.BlockEntities == null) + { + #if DEBUG + Logger.VerboseDebug("WORLD chunk: null or empty X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y); + #endif + nullChunkCount++; + continue; + } - /*************** Chunk Entities Scanning *********************/ - if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0) + if (worldChunk.IsPacked()) { #if DEBUG - Logger.VerboseDebug("Surface@ {0} = BlockEntities: {1}", key, chunkData.BlockEntities.Length); + Logger.VerboseDebug("WORLD chunk: Compressed: X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y); #endif + worldChunk.Unpack( );//RESEARCH: Thread Unsafe? + } - foreach (var blockEnt in chunkData.BlockEntities) - { + /*************** Chunk Entities Scanning *********************/ + if (worldChunk.BlockEntities != null && worldChunk.BlockEntities.Count > 0) + { + #if DEBUG + Logger.VerboseDebug("Scan pos.({0}) for BlockEntities# {1}", key, worldChunk.BlockEntities.Count); + #endif - if (blockEnt != null && blockEnt.Block != null && BlockID_Designators.ContainsKey(blockEnt.Block.BlockId)) + foreach (var blockEnt in worldChunk.BlockEntities) + { + if (blockEnt.Key != null && blockEnt.Value != null && blockEnt.Value.Block != null && BlockID_Designators.ContainsKey(blockEnt.Value.Block.BlockId)) { - var designator = BlockID_Designators[blockEnt.Block.BlockId]; - designator.SpecialAction(ClientAPI, POIs, blockEnt.Pos.Copy(), blockEnt.Block); + var designator = BlockID_Designators[blockEnt.Value.Block.BlockId]; + designator?.SpecialAction(ClientAPI, POIs, blockEnt.Value.Pos.Copy(), blockEnt.Value.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 + //First Chance fail-safe; + if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) { + #if DEBUG + Logger.VerboseDebug("WORLD chunk; Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", key.X, targetChunkY, key.Y); + #endif + nullChunkCount++; + continue; + } + + chunkMeta.ColumnPresense[targetChunkY] = true; + chunkTally++; + for (Y_index = 0; Y_index < chunkSize; Y_index++) { - do + for (Z_index = 0; Z_index < chunkSize; Z_index++) { - do + for (X_index = 0; X_index < chunkSize; 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; - } + var indicie = MapUtil.Index3d(X_index, Y_index, Z_index, chunkSize, chunkSize); + + //'Last' Chance fail-safe; + if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) { + #if DEBUG + Logger.VerboseDebug("Processing Block: Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", X_index, Y_index, Z_index); + #endif + nullChunkCount++; + goto loop_bustout; + } - if (RockIdCodes.ContainsKey(aBlockId)) - { - if (chunkMeta.RockRatio.ContainsKey(aBlockId)) { chunkMeta.RockRatio[aBlockId]++; } else { chunkMeta.RockRatio.Add(aBlockId, 1); } - } + int aBlockId = worldChunk.Blocks[indicie]; + + if (aBlockId == 0 || AiryIdCodes.ContainsKey(aBlockId)) {//Airy blocks,,, + chunkMeta.AirBlocks++; + continue; + } - chunkMeta.NonAirBlocks++; + if (RockIdCodes.ContainsKey(aBlockId)) { + if (chunkMeta.RockRatio.ContainsKey(aBlockId)) + chunkMeta.RockRatio[aBlockId]++; + else + chunkMeta.RockRatio.Add(aBlockId, 1); + } - //Heightmap - if (chunkMeta.HeightMap[X_index, Z_index] == 0) - { chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize)); } + chunkMeta.NonAirBlocks++; + ushort localHeight = ( ushort )(Y_index + (targetChunkY * chunkSize)); + //Heightmap - Need to ignore Grass & Snow + if (localHeight > chunkMeta.HeightMap[X_index, Z_index]) + { + chunkMeta.HeightMap[X_index, Z_index] = localHeight; + if (localHeight > chunkMeta.YMax) chunkMeta.YMax = localHeight; + } } - while (X_index++ < (chunkSize - 1)); - X_index = 0; } - while (Z_index++ < (chunkSize - 1)); - Z_index = 0; } - while (Y_index++ < (chunkSize - 1)); - + loop_bustout:; } + #if DEBUG + Logger.VerboseDebug("COLUMN X{0} Z{1}: {2}, processed.", key.X , key.Y, chunkTally + 1); + #endif } private void UpdateEntityMetadata() { - 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.ToArray()) - { + #if DEBUG + Logger.Debug("Presently {0} Entities", ClientAPI.World.LoadedEntities.Count); + #endif + var keyList = new long[ClientAPI.World.LoadedEntities.Keys.Count]; + ClientAPI.World.LoadedEntities.Keys.CopyTo(keyList, 0); + + //'ElementAt'; worse! instead; walk fixed list... + Entity loadedEntity; + foreach (var key in keyList) + { + if (ClientAPI.World.LoadedEntities.TryGetValue(key, out loadedEntity)) + { #if DEBUG //Logger.VerboseDebug($"ENTITY: ({loadedEntity.Value.Code}) = #{loadedEntity.Value.EntityId} {loadedEntity.Value.State} {loadedEntity.Value.LocalPos} <<<<<<<<<<<<"); #endif - var dMatch = Entity_Designators.SingleOrDefault(se => se.Key.Equals(loadedEntity.Value.Code)); - if (dMatch.Value != null) - { - dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.LocalPos.AsBlockPos.Copy(), loadedEntity.Value); - } - + var dMatch = Entity_Designators.SingleOrDefault(se => se.Key.Equals(loadedEntity.Code)); + if (dMatch.Value != null) + { + dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Pos.AsBlockPos.Copy( ), loadedEntity); + } + } } - - } private void AddNote(string notation) @@ -783,7 +756,7 @@ namespace Automap var playerNodePoi = new PointOfInterest() { Name = "Note", - Location = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy(), + Location = ClientAPI.World.Player.Entity.Pos.AsBlockPos.Copy(), Notes = notation, Timestamp = DateTime.UtcNow, }; @@ -795,47 +768,53 @@ namespace Automap 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 != CommandType.Snapshot) + switch (cmdData.State) { - switch (cmdData.State) - { - case CommandType.Run: - case CommandType.Stop: - if (CurrentState != cmdData.State) { + case CommandType.Run: + case CommandType.Stop: + case CommandType.Snapshot: + if (CurrentState != cmdData.State) + { CurrentState = cmdData.State; - AwakenCartographer(0.0f); - } - break; - - case CommandType.Snapshot: - CurrentState = CommandType.Stop; - //Snapshot starts a second thread/process... - - break; + ThreadDecider(0.0f); + } + break; - case CommandType.Notation: - //Add to POI list where player location - AddNote(cmdData.Notation); - break; - } + case CommandType.Notation: + //Add to POI list where player location + AddNote(cmdData.Notation); + break; } - - -#if DEBUG ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} "); -#endif } +#endregion + private AChunkRenderer InstantiateChosenRenderer(string rendererName ) + { + Logger.VerboseDebug("Using '{0}' style Shard Renderer", rendererName); + switch (rendererName) + { + case StandardRenderer.Name: + return new StandardRenderer(ClientAPI, Logger, this.configuration.SeasonalColors); + + case AlternateRenderer.Name: + return new AlternateRenderer(ClientAPI, Logger, this.configuration.SeasonalColors); + + case FlatRenderer.Name: + return new FlatRenderer(ClientAPI, Logger, this.configuration.SeasonalColors); + + default: + throw new ArgumentOutOfRangeException("rendererName",rendererName,"That value isn't supported or known..."); + } - #endregion - + return null; + } } -} \ No newline at end of file +}