From d9dce322eb1a98647e0b47a511e378f8b21c75ce Mon Sep 17 00:00:00 2001 From: Markus Jungnickel Date: Sun, 7 Jun 2020 13:11:12 +0200 Subject: [PATCH] Player icons are off by default --- PapyrusAlgorithms/Strategies/Dataflow/DataFlowStrategy.cs | 6 ++---- PapyrusAlgorithms/Strategies/Dataflow/GetDataBlock.cs | 2 -- PapyrusCs/Options.cs | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/PapyrusAlgorithms/Strategies/Dataflow/DataFlowStrategy.cs b/PapyrusAlgorithms/Strategies/Dataflow/DataFlowStrategy.cs index e9db0b2..63f17c0 100644 --- a/PapyrusAlgorithms/Strategies/Dataflow/DataFlowStrategy.cs +++ b/PapyrusAlgorithms/Strategies/Dataflow/DataFlowStrategy.cs @@ -111,13 +111,11 @@ public void RenderInitialLevel() Console.WriteLine($"Average of {average:0.0} chunks per tile"); var getDataBlock = new GetDataBlock(World, renderedSubchunks, getOptions, ForceOverwrite); - //var createChunkBlock = new CreateDataBlock(World, chunkCreatorOptions); - //var bitmapBlock = new BitmapRenderBlock(TextureDictionary, TexturePath, World.ChunkPool, RenderSettings, graphics, ChunkSize, ChunksPerDimension, bitmapOptions); var createAndRender = new CreateChunkAndRenderBlock(World, TextureDictionary, TexturePath, RenderSettings, graphics, ChunkSize, ChunksPerDimension, bitmapOptions); - + var saveBitmapBlock = new SaveBitmapBlock(isUpdate ? pathToMapUpdate : pathToMap, NewInitialZoomLevel, FileFormat, saveOptions, graphics); - + var batchBlock = new BatchBlock>(128, new GroupingDataflowBlockOptions() {BoundedCapacity = 128*8, EnsureOrdered = false}); // Todo, put in own class diff --git a/PapyrusAlgorithms/Strategies/Dataflow/GetDataBlock.cs b/PapyrusAlgorithms/Strategies/Dataflow/GetDataBlock.cs index 299916e..57cf8db 100644 --- a/PapyrusAlgorithms/Strategies/Dataflow/GetDataBlock.cs +++ b/PapyrusAlgorithms/Strategies/Dataflow/GetDataBlock.cs @@ -9,12 +9,10 @@ namespace PapyrusAlgorithms.Strategies.Dataflow { public class GetDataBlock : ITplBlock { - private bool forceOverwrite; public TransformManyBlock, IEnumerable> Block { get; } public GetDataBlock(World world, ImmutableDictionary renderedSubChunks, ExecutionDataflowBlockOptions options, bool forceOverwrite) { - this.forceOverwrite = forceOverwrite; Block = new TransformManyBlock, IEnumerable>( groupedChunkSubKeys => { diff --git a/PapyrusCs/Options.cs b/PapyrusCs/Options.cs index a9d155e..6a8bbca 100644 --- a/PapyrusCs/Options.cs +++ b/PapyrusCs/Options.cs @@ -113,7 +113,7 @@ public class Options [Option("chunksperdimension", Required = false, Default = 2, HelpText = "Sets the chunks per X and Y dimension for the generated tiles. 1 => 1 chunk per tile, 2 => 4 chunks per tile and so on")] public int ChunksPerDimension { get; set; } - [Option("playericons", Required = false, Default = true, HelpText = "Renders player markers on the map. Player names must be manually entered. After running, edit '/map/playersData.js' text file to modify player names and colors.")] + [Option("playericons", Required = false, Default = false, HelpText = "Renders player markers on the map. Player names must be manually entered. After running, edit '/map/playersData.js' text file to modify player names and colors.")] public bool ShowPlayerIcons { get; set; } [Option("render_map", Required = false, Default = true, HelpText = "Renders the map. This is the main feature of this program. Only disable this in special circumstances, such as if you want to quickly update player markers without updating the map.")]