stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-16 17:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added, Automap mode: added "Show hidden lines" top menu button.

Browse source 
Added, Automap mode: added "Show secrets" top menu button.
Added, Automap mode: added "Color preset" top menu drop-down.
This commit is contained in:
MaxED 2016-06-18 00:10:35 +00:00
parent ac68ec0bb8
commit af4f40389f
16 changed files with 760 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/Builder.csproj
View file

@ -708,6 +708,7 @@
<Compile Include="Config\ModelAndLightRenderModes.cs" />
<Compile Include="Config\PasteOptions.cs" />
<Compile Include="Config\ScriptDocumentSettings.cs" />
<Compile Include="Config\SectorEffectData.cs" />
<Compile Include="Config\ThingsFlagsCompare.cs" />
<Compile Include="Controls\ActionSpecialHelpButton.cs">
<SubType>UserControl</SubType>

10
Source/Core/Config/GameConfiguration.cs
View file

@ -1068,10 +1068,10 @@ namespace CodeImp.DoomBuilder.Config
}
//mxd
public static HashSet<int> GetGeneralizedSectorEffectBits(int effect) { return GetGeneralizedSectorEffectBits(effect, General.Map.Config.GenEffectOptions); }
public static HashSet<int> GetGeneralizedSectorEffectBits(int effect, List<GeneralizedOption> options)
public SectorEffectData GetSectorEffectData(int effect) { return GetSectorEffectData(effect, General.Map.Config.GenEffectOptions); }
public SectorEffectData GetSectorEffectData(int effect, List<GeneralizedOption> options)
{
HashSet<int> result = new HashSet<int>();
SectorEffectData result = new SectorEffectData();
if(effect > 0)
{
int cureffect = effect;
@ -1083,12 +1083,12 @@ namespace CodeImp.DoomBuilder.Config
if(bit.Index > 0 && (cureffect & bit.Index) == bit.Index)
{
cureffect -= bit.Index;
result.Add(bit.Index);
result.GeneralizedBits.Add(bit.Index);
}
}
}
if(cureffect > 0) result.Add(cureffect);
if(cureffect > 0) result.Effect = cureffect;
}
return result;

15
Source/Core/Config/SectorEffectData.cs Normal file
View file

@ -0,0 +1,15 @@
using System.Collections.Generic;
namespace CodeImp.DoomBuilder.Config
{
public class SectorEffectData
{
public int Effect;
public HashSet<int> GeneralizedBits;
public SectorEffectData()
{
GeneralizedBits = new HashSet<int>();
}
}
}

3
Source/Core/General/MapManager.cs
View file

@ -672,7 +672,8 @@ namespace CodeImp.DoomBuilder
// Problem! Can't save the map like this!
General.ShowErrorMessage("Unable to save the map: there are too many unique sidedefs!" + Environment.NewLine + Environment.NewLine
+ "Sidedefs before compresion: " + initialsidescount + Environment.NewLine
+ "Sidedefs after compresion: " + outputset.Sidedefs.Count, MessageBoxButtons.OK);
+ "Sidedefs after compresion: " + outputset.Sidedefs.Count
+ " (" + (outputset.Sidedefs.Count - io.MaxSidedefs) + " sidedefs above the limit)", MessageBoxButtons.OK);
General.MainWindow.DisplayStatus(oldstatus);
return false;
}

225
Source/Plugins/AutomapMode/AutomapMode.cs
View file

@ -18,7 +18,9 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Editing;
@ -32,11 +34,21 @@ namespace CodeImp.DoomBuilder.AutomapMode
ButtonImage = "automap.png", // Image resource name for the button
ButtonOrder = int.MinValue + 503, // Position of the button (lower is more to the bottom)
ButtonGroup = "000_editing",
UseByDefault = true,
SafeStartMode = true)]
UseByDefault = true)]
public class AutomapMode : ClassicMode
{
public class AutomapMode : ClassicMode
{
#region ================== Enums
internal enum ColorPreset
{
DOOM,
HEXEN,
STRIFE,
}
#endregion
#region ================== Constants
private const float LINE_LENGTH_SCALER = 0.001f; //mxd
@ -46,10 +58,24 @@ namespace CodeImp.DoomBuilder.AutomapMode
#region ================== Variables
private CustomPresentation automappresentation;
private List<Linedef> validlinedefs;
private List<Linedef> validlinedefs;
private HashSet<Sector> secretsectors; //mxd
// Highlighted item
private Linedef highlighted;
private Linedef highlighted;
//mxd. UI
private MenusForm menusform;
//mxd. Colors
private PixelColor ColorSingleSided;
private PixelColor ColorSecret;
private PixelColor ColorFloorDiff;
private PixelColor ColorCeilDiff;
private PixelColor ColorMatchingHeight;
private PixelColor ColorHiddenFlag;
private PixelColor ColorInvisible;
private PixelColor ColorBackground;
#endregion
@ -61,6 +87,37 @@ namespace CodeImp.DoomBuilder.AutomapMode
#region ================== Constructor / Disposer
//mxd
public AutomapMode()
{
// Create and setup menu
menusform = new MenusForm();
menusform.ShowHiddenLines = General.Settings.ReadPluginSetting("automapmode.showhiddenlines", false);
menusform.ShowSecretSectors = General.Settings.ReadPluginSetting("automapmode.showsecretsectors", false);
menusform.ColorPreset = (ColorPreset)General.Settings.ReadPluginSetting("automapmode.colorpreset", (int)ColorPreset.DOOM);
// Handle events
menusform.OnShowHiddenLinesChanged += delegate
{
UpdateValidLinedefs();
General.Interface.RedrawDisplay();
};
menusform.OnShowSecretSectorsChanged += delegate
{
General.Interface.RedrawDisplay();
};
menusform.OnColorPresetChanged += delegate
{
ApplyColorPreset(menusform.ColorPreset);
General.Interface.RedrawDisplay();
};
// Apply color preset
ApplyColorPreset(menusform.ColorPreset);
}
#endregion
#region ================== Methods
@ -74,7 +131,7 @@ namespace CodeImp.DoomBuilder.AutomapMode
// Undraw previous highlight
if((highlighted != null) && !highlighted.IsDisposed)
{
PixelColor c = LinedefIsValid(highlighted) ? DetermineLinedefColor(highlighted) : new PixelColor(255, 0, 0, 0);
PixelColor c = LinedefIsValid(highlighted) ? DetermineLinedefColor(highlighted) : PixelColor.Transparent;
renderer.PlotLine(highlighted.Start.Position, highlighted.End.Position, c, LINE_LENGTH_SCALER);
}
@ -105,34 +162,39 @@ namespace CodeImp.DoomBuilder.AutomapMode
validlinedefs = new List<Linedef>();
foreach(Linedef ld in General.Map.Map.Linedefs)
if(LinedefIsValid(ld)) validlinedefs.Add(ld);
}
//mxd
internal void UpdateSecretSectors()
{
secretsectors = new HashSet<Sector>();
foreach(Sector s in General.Map.Map.Sectors)
if(SectorIsSecret(s)) secretsectors.Add(s);
}
private static PixelColor DetermineLinedefColor(Linedef ld)
{
if(ld.IsFlagSet(BuilderPlug.Me.HiddenFlag))
return new PixelColor(255, 192, 192, 192);
if(ld.Back == null || ld.IsFlagSet(BuilderPlug.Me.SecretFlag))
return new PixelColor(255, 252, 0, 0);
if(ld.Front.Sector.FloorHeight != ld.Back.Sector.FloorHeight)
return new PixelColor(255, 188, 120, 72);
if(ld.Front.Sector.CeilHeight != ld.Back.Sector.CeilHeight)
return new PixelColor(255, 252, 252, 0);
if(ld.Front.Sector.CeilHeight == ld.Back.Sector.CeilHeight && ld.Front.Sector.FloorHeight == ld.Back.Sector.FloorHeight)
return new PixelColor(255, 128, 128, 128);
if(General.Interface.CtrlState)
return new PixelColor(255, 192, 192, 192);
private PixelColor DetermineLinedefColor(Linedef ld)
{
//mxd
if(menusform.ShowSecretSectors &&
(ld.Front != null && secretsectors.Contains(ld.Front.Sector) || ld.Back != null && secretsectors.Contains(ld.Back.Sector)))
return ColorSecret;
if(ld.IsFlagSet(BuilderPlug.Me.HiddenFlag)) return ColorHiddenFlag;
if(ld.Back == null || ld.IsFlagSet(BuilderPlug.Me.SecretFlag)) return ColorSingleSided;
if(ld.Front.Sector.FloorHeight != ld.Back.Sector.FloorHeight) return ColorFloorDiff;
if(ld.Front.Sector.CeilHeight != ld.Back.Sector.CeilHeight) return ColorCeilDiff;
if(ld.Front.Sector.CeilHeight == ld.Back.Sector.CeilHeight && ld.Front.Sector.FloorHeight == ld.Back.Sector.FloorHeight)
return ColorMatchingHeight;
if(menusform.ShowHiddenLines ^ General.Interface.CtrlState) return ColorInvisible;
return new PixelColor(255, 255, 255, 255);
}
private static bool LinedefIsValid(Linedef ld)
private bool LinedefIsValid(Linedef ld)
{
if(General.Interface.CtrlState) return true;
if(menusform.ShowHiddenLines ^ General.Interface.CtrlState) return true;
if(ld.IsFlagSet(BuilderPlug.Me.HiddenFlag)) return false;
if(ld.Back == null || ld.IsFlagSet(BuilderPlug.Me.SecretFlag)) return true;
if(ld.Back != null && (ld.Front.Sector.FloorHeight != ld.Back.Sector.FloorHeight || ld.Front.Sector.CeilHeight != ld.Back.Sector.CeilHeight)) return true;
@ -140,6 +202,65 @@ namespace CodeImp.DoomBuilder.AutomapMode
return false;
}
//mxd
private static bool SectorIsSecret(Sector s)
{
SectorEffectData data = General.Map.Config.GetSectorEffectData(s.Effect);
if(General.Map.DOOM)
{
// Sector is secret when it's Special is 9 or it has generalized flag 128
if(data.Effect == 9 || data.GeneralizedBits.Contains(128)) return true;
}
else
{
//Hexen/UDMF: sector is secret when it has generalized flag 1024
if(data.GeneralizedBits.Contains(1024)) return true;
}
return false;
}
//mxd
private void ApplyColorPreset(ColorPreset preset)
{
switch(preset)
{
case ColorPreset.DOOM:
ColorSingleSided = new PixelColor(255, 252, 0, 0);
ColorSecret = new PixelColor(255, 255, 0, 255);
ColorFloorDiff = new PixelColor(255, 188, 120, 72);
ColorCeilDiff = new PixelColor(255, 252, 252, 0);
ColorHiddenFlag = new PixelColor(255, 192, 192, 192);
ColorInvisible = new PixelColor(255, 192, 192, 192);
ColorMatchingHeight = new PixelColor(255, 108, 108, 108);
ColorBackground = new PixelColor(255, 0, 0, 0);
break;
case ColorPreset.HEXEN:
ColorSingleSided = new PixelColor(255, 89, 64, 27);
ColorSecret = new PixelColor(255, 255, 0, 255);
ColorFloorDiff = new PixelColor(255, 208, 176, 133);
ColorCeilDiff = new PixelColor(255, 103, 59, 31);
ColorHiddenFlag = new PixelColor(255, 192, 192, 192);
ColorInvisible = new PixelColor(255, 108, 108, 108);
ColorMatchingHeight = new PixelColor(255, 108, 108, 108);
ColorBackground = new PixelColor(255, 163, 129, 84);
break;
case ColorPreset.STRIFE:
ColorSingleSided = new PixelColor(255, 199, 195, 195);
ColorSecret = new PixelColor(255, 255, 0, 255);
ColorFloorDiff = new PixelColor(255, 55, 59, 91);
ColorCeilDiff = new PixelColor(255, 108, 108, 108);
ColorHiddenFlag = new PixelColor(255, 0, 87, 130);
ColorInvisible = new PixelColor(255, 192, 192, 192);
ColorMatchingHeight = new PixelColor(255, 112, 112, 160);
ColorBackground = new PixelColor(255, 0, 0, 0);
break;
}
}
#endregion
#region ================== Events
@ -166,23 +287,53 @@ namespace CodeImp.DoomBuilder.AutomapMode
// Automap presentation without the surfaces
automappresentation = new CustomPresentation();
automappresentation.AddLayer(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
automappresentation.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Mask));
automappresentation.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
automappresentation.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
renderer.SetPresentation(automappresentation);
UpdateValidLinedefs();
UpdateSecretSectors(); //mxd
//mxd. Show UI
menusform.Register();
}
// Mode disengages
public override void OnDisengage()
{
base.OnDisengage();
//mxd. Store settings
General.Settings.WritePluginSetting("automapmode.showhiddenlines", menusform.ShowHiddenLines);
General.Settings.WritePluginSetting("automapmode.showsecretsectors", menusform.ShowSecretSectors);
General.Settings.WritePluginSetting("automapmode.colorpreset", (int)menusform.ColorPreset);
//mxd. Hide UI
menusform.Unregister();
// Hide highlight info
General.Interface.HideInfo();
}
//mxd
public override void OnUndoEnd()
{
UpdateValidLinedefs();
UpdateSecretSectors();
base.OnUndoEnd();
}
//mxd
public override void OnRedoEnd()
{
UpdateValidLinedefs();
UpdateSecretSectors();
base.OnRedoEnd();
}
// This redraws the display
public override void OnRedrawDisplay()
{
@ -205,6 +356,14 @@ namespace CodeImp.DoomBuilder.AutomapMode
renderer.Finish();
}
//mxd. Render background
if(renderer.StartOverlay(true))
{
RectangleF screenrect = new RectangleF(0, 0, General.Interface.Display.Width, General.Interface.Display.Height);
renderer.RenderRectangleFilled(screenrect, ColorBackground, false);
renderer.Finish();
}
renderer.Present();
}
@ -212,8 +371,8 @@ namespace CodeImp.DoomBuilder.AutomapMode
{
// Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed)
{
General.Map.UndoRedo.CreateUndo("Toggle linedef show as 1-sided on automap flag");
{
General.Map.UndoRedo.CreateUndo("Toggle \"Shown as 1-sided on automap\" linedef flag");
// Toggle flag
highlighted.SetFlag(BuilderPlug.Me.SecretFlag, !highlighted.IsFlagSet(BuilderPlug.Me.SecretFlag));
@ -227,8 +386,8 @@ namespace CodeImp.DoomBuilder.AutomapMode
{
// Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed)
{
General.Map.UndoRedo.CreateUndo("Toggle linedef not shown on automap flag");
{
General.Map.UndoRedo.CreateUndo("Toggle \"Not shown on automap\" linedef flag");
// Toggle flag
highlighted.SetFlag(BuilderPlug.Me.HiddenFlag, !highlighted.IsFlagSet(BuilderPlug.Me.HiddenFlag));

27
Source/Plugins/AutomapMode/AutomapMode.csproj
View file

@ -42,7 +42,18 @@
<ItemGroup>
<Compile Include="BuilderPlug.cs" />
<Compile Include="AutomapMode.cs" />
<Compile Include="Interface\MenusForm.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Interface\MenusForm.Designer.cs">
<DependentUpon>MenusForm.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Core\Builder.csproj">
@ -56,7 +67,10 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\automap.png" />
@ -65,6 +79,19 @@
<EmbeddedResource Include="Resources\Actions.cfg" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Interface\MenusForm.resx">
<DependentUpon>MenusForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Hints.cfg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ShowHiddenLines.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ShowSecrets.png" />
</ItemGroup>
</Project>

14
Source/Plugins/AutomapMode/BuilderPlug.cs
View file

@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.AutomapMode
// Static instance. We can't use a real static class, because BuilderPlug must
// be instantiated by the core, so we keep a static reference. (this technique
// should be familiar to object-oriented programmers)
private static BuilderPlug me;
private static BuilderPlug me;
#endregion
@ -85,7 +85,11 @@ namespace CodeImp.DoomBuilder.AutomapMode
public override void OnMapOpenEnd()
{
AutomapMode mode = General.Editing.Mode as AutomapMode;
if(mode != null) mode.UpdateValidLinedefs();
if(mode != null)
{
mode.UpdateValidLinedefs();
mode.UpdateSecretSectors();
}
base.OnMapOpenEnd();
}
@ -94,7 +98,11 @@ namespace CodeImp.DoomBuilder.AutomapMode
public override void OnMapNewEnd()
{
AutomapMode mode = General.Editing.Mode as AutomapMode;
if(mode != null) mode.UpdateValidLinedefs();
if(mode != null)
{
mode.UpdateValidLinedefs();
mode.UpdateSecretSectors();
}
base.OnMapNewEnd();
}

120
Source/Plugins/AutomapMode/Interface/MenusForm.Designer.cs generated Normal file
View file

@ -0,0 +1,120 @@
namespace CodeImp.DoomBuilder.AutomapMode
{
partial class MenusForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if(disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.showhiddenlines = new System.Windows.Forms.ToolStripButton();
this.showsecretsectors = new System.Windows.Forms.ToolStripButton();
this.colorpresetseparator = new System.Windows.Forms.ToolStripSeparator();
this.colorpresetlabel = new System.Windows.Forms.ToolStripLabel();
this.colorpreset = new System.Windows.Forms.ToolStripComboBox();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.showhiddenlines,
this.showsecretsectors,
this.colorpresetseparator,
this.colorpresetlabel,
this.colorpreset});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(731, 25);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
//
// showhiddenlines
//
this.showhiddenlines.CheckOnClick = true;
this.showhiddenlines.Image = global::CodeImp.DoomBuilder.AutomapMode.Properties.Resources.ShowHiddenLines;
this.showhiddenlines.ImageTransparentColor = System.Drawing.Color.Magenta;
this.showhiddenlines.Margin = new System.Windows.Forms.Padding(0, 1, 2, 2);
this.showhiddenlines.Name = "showhiddenlines";
this.showhiddenlines.Size = new System.Drawing.Size(123, 22);
this.showhiddenlines.Text = "Show hidden lines";
this.showhiddenlines.CheckedChanged += new System.EventHandler(this.showhiddenlines_CheckedChanged);
//
// showsecretsectors
//
this.showsecretsectors.CheckOnClick = true;
this.showsecretsectors.Image = global::CodeImp.DoomBuilder.AutomapMode.Properties.Resources.ShowSecrets;
this.showsecretsectors.Name = "showsecretsectors";
this.showsecretsectors.Size = new System.Drawing.Size(95, 22);
this.showsecretsectors.Text = "Show secrets";
this.showsecretsectors.CheckedChanged += new System.EventHandler(this.showsecretsectors_CheckedChanged);
//
// colorpresetseparator
//
this.colorpresetseparator.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.colorpresetseparator.Name = "colorpresetseparator";
this.colorpresetseparator.Size = new System.Drawing.Size(6, 25);
//
// colorpresetlabel
//
this.colorpresetlabel.Name = "colorpresetlabel";
this.colorpresetlabel.Size = new System.Drawing.Size(74, 22);
this.colorpresetlabel.Text = "Color preset:";
//
// colorpreset
//
this.colorpreset.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.colorpreset.Items.AddRange(new object[] {
"Doom",
"Hexen",
"Strife"});
this.colorpreset.Name = "colorpreset";
this.colorpreset.Size = new System.Drawing.Size(121, 25);
this.colorpreset.SelectedIndexChanged += new System.EventHandler(this.colorpreset_SelectedIndexChanged);
//
// MenusForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.toolStrip1);
this.Name = "MenusForm";
this.Size = new System.Drawing.Size(731, 65);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton showhiddenlines;
private System.Windows.Forms.ToolStripButton showsecretsectors;
private System.Windows.Forms.ToolStripSeparator colorpresetseparator;
private System.Windows.Forms.ToolStripLabel colorpresetlabel;
private System.Windows.Forms.ToolStripComboBox colorpreset;
}
}

54
Source/Plugins/AutomapMode/Interface/MenusForm.cs Normal file
View file

@ -0,0 +1,54 @@
using System;
using System.Windows.Forms;
namespace CodeImp.DoomBuilder.AutomapMode
{
public partial class MenusForm : UserControl
{
public event EventHandler OnShowHiddenLinesChanged;
public event EventHandler OnShowSecretSectorsChanged;
internal event EventHandler OnColorPresetChanged;
public bool ShowHiddenLines { get { return showhiddenlines.Checked; } set { showhiddenlines.Checked = value; } }
public bool ShowSecretSectors { get { return showsecretsectors.Checked; } set { showsecretsectors.Checked = value; } }
internal AutomapMode.ColorPreset ColorPreset { get { return (AutomapMode.ColorPreset)colorpreset.SelectedIndex; } set { colorpreset.SelectedIndex = (int)value; } }
public MenusForm()
{
InitializeComponent();
}
public void Register()
{
General.Interface.AddButton(showhiddenlines);
General.Interface.AddButton(showsecretsectors);
General.Interface.AddButton(colorpresetseparator);
General.Interface.AddButton(colorpresetlabel);
General.Interface.AddButton(colorpreset);
}
public void Unregister()
{
General.Interface.RemoveButton(colorpreset);
General.Interface.RemoveButton(colorpresetlabel);
General.Interface.RemoveButton(colorpresetseparator);
General.Interface.RemoveButton(showsecretsectors);
General.Interface.RemoveButton(showhiddenlines);
}
private void showhiddenlines_CheckedChanged(object sender, EventArgs e)
{
if(OnShowHiddenLinesChanged != null) OnShowHiddenLinesChanged(showhiddenlines.Checked, EventArgs.Empty);
}
private void showsecretsectors_CheckedChanged(object sender, EventArgs e)
{
if(OnShowSecretSectorsChanged != null) OnShowSecretSectorsChanged(showsecretsectors.Checked, EventArgs.Empty);
}
private void colorpreset_SelectedIndexChanged(object sender, EventArgs e)
{
if(OnColorPresetChanged != null) OnColorPresetChanged(colorpreset.SelectedIndex, EventArgs.Empty);
}
}
}

123
Source/Plugins/AutomapMode/Interface/MenusForm.resx Normal file
View file

@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

77
Source/Plugins/AutomapMode/Properties/Resources.Designer.cs generated Normal file
View file

@ -0,0 +1,77 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.5485
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace CodeImp.DoomBuilder.AutomapMode.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.AutomapMode.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
internal static System.Drawing.Bitmap ShowHiddenLines {
get {
object obj = ResourceManager.GetObject("ShowHiddenLines", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap ShowSecrets {
get {
object obj = ResourceManager.GetObject("ShowSecrets", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

127
Source/Plugins/AutomapMode/Properties/Resources.resx Normal file
View file

@ -0,0 +1,127 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ShowHiddenLines" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowHiddenLines.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShowSecrets" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShowSecrets.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

2
Source/Plugins/AutomapMode/Resources/Hints.cfg
View file

@ -8,4 +8,4 @@ class AutomapMode
group general
"<b>Left click</b> on a line to toggle the <b>'Shown as 1-sided on automap'</b> flag."
"<b>Right click</b> on a line to toggle the <b>'Not shown on automap'</b> flag."
"Hold <b>Ctrl</b> to show lines that are not drawn, either because there was no height change (gray) or the <b>'Not shown on automap'</b> flag is set (light gray)."
"Hold <b>Ctrl</b> to toggle the display of the lines that are not drawn, either because there was no height change (gray) or the <b>'Not shown on automap'</b> flag is set (light gray)."

BIN
Source/Plugins/AutomapMode/Resources/ShowHiddenLines.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Source/Plugins/AutomapMode/Resources/ShowSecrets.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

8
Source/Plugins/BuilderModes/General/CopyStructures.cs
View file

@ -810,11 +810,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(!General.Map.Config.GeneralizedEffects || source.Effect == 0 || target.Effect == 0) return false;
// Get effect bits...
HashSet<int> sourcebits = GameConfiguration.GetGeneralizedSectorEffectBits(source.Effect);
HashSet<int> targetbits = GameConfiguration.GetGeneralizedSectorEffectBits(target.Effect);
SectorEffectData sourcedata = General.Map.Config.GetSectorEffectData(source.Effect);
SectorEffectData targetdata = General.Map.Config.GetSectorEffectData(target.Effect);
// No bits match when at least one effect is not generalized, or when bits don't overlap
if(sourcebits.Count == 0 || targetbits.Count == 0 || !sourcebits.Overlaps(targetbits)) return false;
if(sourcedata.Effect != targetdata.Effect
|| sourcedata.GeneralizedBits.Count != targetdata.GeneralizedBits.Count
|| !sourcedata.GeneralizedBits.Overlaps(targetdata.GeneralizedBits)) return false;
}
if(!General.Map.UDMF) return true;