Skip to content

Commit

Permalink
Player icons are off by default
Browse files Browse the repository at this point in the history
  • Loading branch information
mjungnickel18 committed Jun 7, 2020
1 parent 6273b53 commit d9dce32
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
6 changes: 2 additions & 4 deletions PapyrusAlgorithms/Strategies/Dataflow/DataFlowStrategy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<TImage>(TextureDictionary, TexturePath, World.ChunkPool, RenderSettings, graphics, ChunkSize, ChunksPerDimension, bitmapOptions);

var createAndRender = new CreateChunkAndRenderBlock<TImage>(World, TextureDictionary, TexturePath, RenderSettings, graphics, ChunkSize, ChunksPerDimension, bitmapOptions);

var saveBitmapBlock = new SaveBitmapBlock<TImage>(isUpdate ? pathToMapUpdate : pathToMap, NewInitialZoomLevel, FileFormat, saveOptions, graphics);

var batchBlock = new BatchBlock<IEnumerable<SubChunkData>>(128, new GroupingDataflowBlockOptions() {BoundedCapacity = 128*8, EnsureOrdered = false});

// Todo, put in own class
Expand Down
2 changes: 0 additions & 2 deletions PapyrusAlgorithms/Strategies/Dataflow/GetDataBlock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ namespace PapyrusAlgorithms.Strategies.Dataflow
{
public class GetDataBlock : ITplBlock
{
private bool forceOverwrite;
public TransformManyBlock<IEnumerable<GroupedChunkSubKeys>, IEnumerable<ChunkData>> Block { get; }

public GetDataBlock(World world, ImmutableDictionary<LevelDbWorldKey2, KeyAndCrc> renderedSubChunks, ExecutionDataflowBlockOptions options, bool forceOverwrite)
{
this.forceOverwrite = forceOverwrite;
Block = new TransformManyBlock<IEnumerable<GroupedChunkSubKeys>, IEnumerable<ChunkData>>(
groupedChunkSubKeys =>
{
Expand Down
2 changes: 1 addition & 1 deletion PapyrusCs/Options.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.")]
Expand Down

0 comments on commit d9dce32

Please sign in to comment.