X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=Automap%2FSubsystems%2FAutomapSystem.cs;h=04db4c2079c4d1870e70c331ea41dca16f0fc253;hb=e751755c9002158215c5dac72a804a94ebe6faf2;hp=8cbfc20528304978fe1c9af86ecb27060a11cf32;hpb=616ccfe0975a1ed4bd75cfc7ef276eca05bf2080;p=automap%2Fautomap.git diff --git a/Automap/Subsystems/AutomapSystem.cs b/Automap/Subsystems/AutomapSystem.cs index 8cbfc20..04db4c2 100644 --- a/Automap/Subsystems/AutomapSystem.cs +++ b/Automap/Subsystems/AutomapSystem.cs @@ -1,17 +1,14 @@ using System; +using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using System.Text; using System.Text.RegularExpressions; using System.Threading; using Hjg.Pngcs; -using Hjg.Pngcs.Chunks; - -using Newtonsoft.Json; using ProtoBuf; @@ -27,33 +24,36 @@ namespace Automap 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 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 = 1; private const string _domain = @"automap"; private const string chunkFile_filter = @"*_*.png"; 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(@"(?[\d]+)_(?[\d]+).png", RegexOptions.Singleline); + 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(); - private string jsonPreBuilt; 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; @@ -64,23 +64,22 @@ 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) { CurrentState = CommandType.Run; @@ -95,6 +94,8 @@ 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"); @@ -105,9 +106,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(); @@ -120,14 +120,27 @@ namespace Automap 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 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) @@ -135,9 +148,9 @@ namespace Automap if (CurrentState == CommandType.Run && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true)) { - #if DEBUG +#if DEBUG Logger.VerboseDebug("Cartographer re-trigger from [{0}]", cartographer_thread.ThreadState); - #endif +#endif if (cartographer_thread.ThreadState.HasFlag(ThreadState.Unstarted)) { @@ -154,7 +167,13 @@ namespace Automap } 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(); + } } } @@ -167,14 +186,14 @@ 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); + var tempSet = columnCounters.ToArray().Where(cks => cks.Value.WeightedSum > editThreshold) .OrderByDescending(kvp => kvp.Value.WeightedSum); UpdateEntityMetadata(); foreach (var mostActiveCol in tempSet) @@ -183,9 +202,10 @@ namespace Automap if (mapChunk == null) { + //TODO: REVISIT THIS CHUNK! Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key); - nullChunkCount++; - columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem); + nullMapCount++; + columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem); continue; } @@ -193,33 +213,38 @@ namespace Automap 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); + #if DEBUG + Logger.VerboseDebug("Created meta-chunk {0}", mostActiveCol.Key); + #endif } - ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta); - 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 } - } } @@ -231,31 +256,69 @@ namespace Automap updatedChunksTotal += updatedChunks; 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); - PersistPointsData( ); +#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; } } @@ -273,8 +336,15 @@ 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 + select airyBlock; + //^^ 'Solid' phase - 'Plant' Blocks without any boundg box ? Except water... + this.AiryIdCodes = airBlocksQuery.ToDictionary(aBlk => aBlk.BlockId, aBlk => aBlk.Code.Path); + //Add special marker types for BlockID's of "Interest", overwrite colour, and method Reload_POI_Designators(); } @@ -305,8 +375,6 @@ namespace Automap this.Entity_Designators.Add(match.Code, designator); } - - //EntityProperties props = ClientAPI.World.GetEntityType(designator.Pattern); } @@ -318,54 +386,70 @@ namespace Automap /// /// Store Points/Entity of Interest /// - private void PersistPointsData( ) + 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); - - if (this.POIs.Count > 0) { - using (var poiFile = File.OpenWrite(poiPath)) { - Serializer.Serialize(poiFile, this.POIs); - } - } + //POI and EOI raw dump files ~ WRITE em! + //var poiRawFile = File. + string poiPath = Path.Combine(path, poiFileName); + string eoiPath = Path.Combine(path, eoiFileName); - if (this.EOIs.Count > 0) { - using (var eoiFile = File.OpenWrite(eoiPath)) { - Serializer.Serialize(eoiFile, this.EOIs); - } - } + if (this.POIs.Count > 0) + { + using (var poiFile = File.OpenWrite(poiPath)) + { + Serializer.Serialize(poiFile, this.POIs); + } + } + + if (this.EOIs.Count > 0) + { + using (var eoiFile = File.OpenWrite(eoiPath)) + { + Serializer.Serialize(eoiFile, this.EOIs); + } + } - //Create Easy to Parse TSV file for tool/human use.... - string pointsTsvPath = Path.Combine(path, pointsTsvFileName); + //Create Easy to Parse TSV file for tool/human use.... + string pointsTsvPath = Path.Combine(path, pointsTsvFileName); - using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8)) - { - tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\t"); - foreach (var point in this.POIs) { + using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8)) + { + tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination"); + foreach (var point in this.POIs) + { tsvWriter.Write(point.Name + "\t"); - tsvWriter.Write(point.Notes + "\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.Write(point.Timestamp.ToString("u") + "\t"); + tsvWriter.Write((point.Destination != null ? point.Destination.PrettyCoords(ClientAPI) : "---") +"\t"); tsvWriter.WriteLine(); - } - foreach (var entity in this.EOIs) { + } + foreach (var entity in this.EOIs) + { tsvWriter.Write(entity.Name + "\t"); - tsvWriter.Write(entity.Notes + "\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( ); + tsvWriter.Write("n/a\t"); + tsvWriter.WriteLine(); + } + tsvWriter.WriteLine(); + tsvWriter.Flush(); } - tsvWriter.WriteLine(); - tsvWriter.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); @@ -382,105 +466,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); - } - - } - catch (PngjException someEx) - { - Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx); - continue; - } + 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 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... @@ -490,83 +558,109 @@ 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 + + chunkMeta.ResetMetadata(ClientAPI.World.BlockAccessor.MapSizeY); - int targetChunkY = mapChunk.YMax / chunkSize;//Surface ... - for (; targetChunkY > 0; targetChunkY--) + 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; + } + + if (worldChunk.IsPacked()) + { + Logger.VerboseDebug("WORLD chunk: Compressed: X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y); + worldChunk.Unpack( );//RESEARCH: Thread Unsafe? + } /*************** Chunk Entities Scanning *********************/ - if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0) + if (worldChunk.BlockEntities != null && worldChunk.BlockEntities.Count > 0) { - #if DEBUG - Logger.VerboseDebug("Surface@ {0} = BlockEntities: {1}", key, chunkData.BlockEntities.Length); - #endif + #if DEBUG + Logger.VerboseDebug("Scan pos.({0}) for BlockEntities# {1}", key, worldChunk.BlockEntities.Count); + #endif - foreach (var blockEnt in chunkData.BlockEntities) + foreach (var blockEnt in worldChunk.BlockEntities) { - - if (blockEnt != null && blockEnt.Block != null && BlockID_Designators.ContainsKey(blockEnt.Block.BlockId)) + if (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) { + Logger.VerboseDebug("WORLD chunk; Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", key.X, targetChunkY, key.Y); + 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); - if (RockIdCodes.ContainsKey(aBlockId)) - { - if (chunkMeta.RockRatio.ContainsKey(aBlockId)) { chunkMeta.RockRatio[aBlockId]++; } else { chunkMeta.RockRatio.Add(aBlockId, 1); } - } + //'Last' Chance fail-safe; + if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) { + Logger.VerboseDebug("Processing Block: Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", X_index, Y_index, Z_index); + nullChunkCount++; + goto loop_bustout; ; + } - chunkMeta.NonAirBlocks++; + int aBlockId = worldChunk.Blocks[indicie]; - //Heightmap - if (chunkMeta.HeightMap[X_index, Z_index] == 0) - { chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize)); } + if (aBlockId == 0 || AiryIdCodes.ContainsKey(aBlockId)) {//Airy blocks,,, + chunkMeta.AirBlocks++; + continue; + } + if (RockIdCodes.ContainsKey(aBlockId)) { + if (chunkMeta.RockRatio.ContainsKey(aBlockId)) + chunkMeta.RockRatio[aBlockId]++; + else + chunkMeta.RockRatio.Add(aBlockId, 1); + } + + 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:; } + Logger.VerboseDebug("COLUMN X{0} Z{1}: {2}, processed.", key.X , key.Y, chunkTally + 1); } private void UpdateEntityMetadata() @@ -583,7 +677,7 @@ namespace Automap 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); + dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.Pos.AsBlockPos.Copy(), loadedEntity.Value); } } @@ -596,7 +690,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, }; @@ -608,49 +702,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; + } + 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 + #if DEBUG ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} "); -#endif - + #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..."); + } + + return null; + } } }