stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2025-01-31 05:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added Preferences -> Appearance -> "Things transparency" slider. It controls Things transparency in all classic modes except Things mode.

Browse source 
Added Preferences -> Appearance -> "Hidden Things transparency" slider. It controls transparency of Things hidden by Things filter in Things mode, of all things :)
This commit is contained in:
MaxED 2016-03-30 11:29:39 +00:00 committed by spherallic
parent 9972816a3e
commit d09000dc71
19 changed files with 2667 additions and 2544 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/Config/ProgramConfiguration.cs
View file

@ -50,6 +50,8 @@ namespace CodeImp.DoomBuilder.Config
private float visualmousesensy;
private int imagebrightness;
private float doublesidedalpha;
private float inactivethingsalpha; //mxd
private float hiddenthingsalpha; //mxd
private byte doublesidedalphabyte;
private int nightscircleprecision;
private float backgroundalpha;
@ -162,6 +164,8 @@ namespace CodeImp.DoomBuilder.Config
public float DoubleSidedAlpha { get { return doublesidedalpha; } internal set { doublesidedalpha = value; doublesidedalphabyte = (byte)(doublesidedalpha * 255f); } }
public byte DoubleSidedAlphaByte { get { return doublesidedalphabyte; } }
public int NiGHTSCirclePrecision { get { return nightscircleprecision; } internal set { nightscircleprecision = value; } }
public float InactiveThingsAlpha { get { return inactivethingsalpha; } internal set { inactivethingsalpha = value; } } //mxd
public float HiddenThingsAlpha { get { return hiddenthingsalpha; } internal set { hiddenthingsalpha = value; } } //mxd
public float BackgroundAlpha { get { return backgroundalpha; } internal set { backgroundalpha = value; } }
public float VisualMouseSensX { get { return visualmousesensx; } internal set { visualmousesensx = value; } }
public float VisualMouseSensY { get { return visualmousesensy; } internal set { visualmousesensy = value; } }
@ -299,6 +303,8 @@ namespace CodeImp.DoomBuilder.Config
doublesidedalpha = cfg.ReadSetting("doublesidedalpha", 0.4f);
doublesidedalphabyte = (byte)(doublesidedalpha * 255f);
nightscircleprecision = cfg.ReadSetting("nightscircleprecision", 360);
inactivethingsalpha = cfg.ReadSetting("inactivethingsalpha", Presentation.THINGS_BACK_ALPHA); //mxd
hiddenthingsalpha = cfg.ReadSetting("hiddenthingsalpha", Presentation.THINGS_HIDDEN_ALPHA); //mxd
backgroundalpha = cfg.ReadSetting("backgroundalpha", 1.0f);
qualitydisplay = cfg.ReadSetting("qualitydisplay", true);
testmonsters = cfg.ReadSetting("testmonsters", true);
@ -415,6 +421,8 @@ namespace CodeImp.DoomBuilder.Config
cfg.WriteSetting("testmonsters", testmonsters);
cfg.WriteSetting("doublesidedalpha", doublesidedalpha);
cfg.WriteSetting("nightscircleprecision", nightscircleprecision);
cfg.WriteSetting("inactivethingsalpha", inactivethingsalpha); //mxd
cfg.WriteSetting("hiddenthingsalpha", hiddenthingsalpha); //mxd
cfg.WriteSetting("backgroundalpha", backgroundalpha);
cfg.WriteSetting("defaultviewmode", defaultviewmode);
cfg.WriteSetting("classicbilinear", classicbilinear);

2
Source/Core/Rendering/Presentation.cs
View file

@ -63,7 +63,7 @@ namespace CodeImp.DoomBuilder.Rendering
standard = new Presentation();
standard.layers.Add(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
standard.layers.Add(new PresentLayer(RendererLayer.Surface, BlendingMode.Mask));
standard.layers.Add(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, THINGS_BACK_ALPHA));
standard.layers.Add(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, General.Settings.InactiveThingsAlpha));
standard.layers.Add(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
standard.layers.Add(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
standard.layers.Add(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));

123
Source/Core/Windows/PreferencesForm.Designer.cs generated
View file

@ -40,6 +40,8 @@ namespace CodeImp.DoomBuilder.Windows
System.Windows.Forms.Label label21;
System.Windows.Forms.Label label29;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PreferencesForm));
System.Windows.Forms.Label label30;
System.Windows.Forms.Label label31;
this.keepfilterfocused = new System.Windows.Forms.CheckBox();
this.maxBackups = new System.Windows.Forms.TrackBar();
this.labelBackups = new System.Windows.Forms.Label();
@ -220,6 +222,10 @@ namespace CodeImp.DoomBuilder.Windows
this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog();
this.hiddenthingsalpha = new System.Windows.Forms.TrackBar();
this.inactivethingsalpha = new System.Windows.Forms.TrackBar();
this.hiddenthingsalphalabel = new System.Windows.Forms.Label();
this.inactivethingsalphalabel = new System.Windows.Forms.Label();
label7 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label();
@ -229,6 +235,8 @@ namespace CodeImp.DoomBuilder.Windows
label20 = new System.Windows.Forms.Label();
label21 = new System.Windows.Forms.Label();
label29 = new System.Windows.Forms.Label();
label30 = new System.Windows.Forms.Label();
label31 = new System.Windows.Forms.Label();
groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.maxBackups)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.recentFiles)).BeginInit();
@ -266,6 +274,8 @@ namespace CodeImp.DoomBuilder.Windows
this.groupBox7.SuspendLayout();
this.groupBox6.SuspendLayout();
this.tabpasting.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.hiddenthingsalpha)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.inactivethingsalpha)).BeginInit();
this.SuspendLayout();
//
// label7
@ -619,7 +629,7 @@ namespace CodeImp.DoomBuilder.Windows
// label18
//
label18.AutoSize = true;
label18.Location = new System.Drawing.Point(22, 63);
label18.Location = new System.Drawing.Point(22, 62);
label18.Name = "label18";
label18.Size = new System.Drawing.Size(147, 13);
label18.TabIndex = 25;
@ -631,7 +641,7 @@ namespace CodeImp.DoomBuilder.Windows
// label20
//
label20.AutoSize = true;
label20.Location = new System.Drawing.Point(76, 97);
label20.Location = new System.Drawing.Point(72, 95);
label20.Name = "label20";
label20.Size = new System.Drawing.Size(94, 13);
label20.TabIndex = 28;
@ -641,7 +651,7 @@ namespace CodeImp.DoomBuilder.Windows
// label21
//
label21.AutoSize = true;
label21.Location = new System.Drawing.Point(55, 131);
label21.Location = new System.Drawing.Point(55, 128);
label21.Name = "label21";
label21.Size = new System.Drawing.Size(114, 13);
label21.TabIndex = 31;
@ -848,7 +858,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbStretchView
//
this.cbStretchView.AutoSize = true;
this.cbStretchView.Location = new System.Drawing.Point(25, 311);
this.cbStretchView.Location = new System.Drawing.Point(25, 365);
this.cbStretchView.Name = "cbStretchView";
this.cbStretchView.Size = new System.Drawing.Size(172, 17);
this.cbStretchView.TabIndex = 18;
@ -860,7 +870,7 @@ namespace CodeImp.DoomBuilder.Windows
// qualitydisplay
//
this.qualitydisplay.AutoSize = true;
this.qualitydisplay.Location = new System.Drawing.Point(25, 227);
this.qualitydisplay.Location = new System.Drawing.Point(25, 281);
this.qualitydisplay.Name = "qualitydisplay";
this.qualitydisplay.Size = new System.Drawing.Size(128, 17);
this.qualitydisplay.TabIndex = 7;
@ -1527,6 +1537,12 @@ namespace CodeImp.DoomBuilder.Windows
this.appearancegroup1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.appearancegroup1.Controls.Add(this.inactivethingsalphalabel);
this.appearancegroup1.Controls.Add(this.hiddenthingsalphalabel);
this.appearancegroup1.Controls.Add(label31);
this.appearancegroup1.Controls.Add(label30);
this.appearancegroup1.Controls.Add(this.inactivethingsalpha);
this.appearancegroup1.Controls.Add(this.hiddenthingsalpha);
this.appearancegroup1.Controls.Add(label29);
this.appearancegroup1.Controls.Add(this.labelDefaultThingSize);
this.appearancegroup1.Controls.Add(this.tbDefaultThingSize);
@ -1574,7 +1590,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.tbDefaultThingSize.BackColor = System.Drawing.SystemColors.Window;
this.tbDefaultThingSize.LargeChange = 4;
this.tbDefaultThingSize.Location = new System.Drawing.Point(176, 151);
this.tbDefaultThingSize.Location = new System.Drawing.Point(176, 150);
this.tbDefaultThingSize.Maximum = 64;
this.tbDefaultThingSize.Minimum = 1;
this.tbDefaultThingSize.Name = "tbDefaultThingSize";
@ -1588,7 +1604,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbDrawThingsFixedSize
//
this.cbDrawThingsFixedSize.AutoSize = true;
this.cbDrawThingsFixedSize.Location = new System.Drawing.Point(237, 311);
this.cbDrawThingsFixedSize.Location = new System.Drawing.Point(237, 365);
this.cbDrawThingsFixedSize.Name = "cbDrawThingsFixedSize";
this.cbDrawThingsFixedSize.Size = new System.Drawing.Size(172, 17);
this.cbDrawThingsFixedSize.TabIndex = 39;
@ -1600,7 +1616,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbDrawCrosshair
//
this.cbDrawCrosshair.AutoSize = true;
this.cbDrawCrosshair.Location = new System.Drawing.Point(237, 269);
this.cbDrawCrosshair.Location = new System.Drawing.Point(237, 323);
this.cbDrawCrosshair.Name = "cbDrawCrosshair";
this.cbDrawCrosshair.Size = new System.Drawing.Size(176, 17);
this.cbDrawCrosshair.TabIndex = 38;
@ -1611,7 +1627,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbDrawFullCrosshair
//
this.cbDrawFullCrosshair.AutoSize = true;
this.cbDrawFullCrosshair.Location = new System.Drawing.Point(237, 290);
this.cbDrawFullCrosshair.Location = new System.Drawing.Point(237, 344);
this.cbDrawFullCrosshair.Name = "cbDrawFullCrosshair";
this.cbDrawFullCrosshair.Size = new System.Drawing.Size(192, 17);
this.cbDrawFullCrosshair.TabIndex = 37;
@ -1623,7 +1639,7 @@ namespace CodeImp.DoomBuilder.Windows
// capitalizetexturenames
//
this.capitalizetexturenames.AutoSize = true;
this.capitalizetexturenames.Location = new System.Drawing.Point(237, 206);
this.capitalizetexturenames.Location = new System.Drawing.Point(237, 260);
this.capitalizetexturenames.Name = "capitalizetexturenames";
this.capitalizetexturenames.Size = new System.Drawing.Size(140, 17);
this.capitalizetexturenames.TabIndex = 36;
@ -1635,7 +1651,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbMarkExtraFloors
//
this.cbMarkExtraFloors.AutoSize = true;
this.cbMarkExtraFloors.Location = new System.Drawing.Point(25, 290);
this.cbMarkExtraFloors.Location = new System.Drawing.Point(25, 344);
this.cbMarkExtraFloors.Name = "cbMarkExtraFloors";
this.cbMarkExtraFloors.Size = new System.Drawing.Size(175, 17);
this.cbMarkExtraFloors.TabIndex = 35;
@ -1647,7 +1663,7 @@ namespace CodeImp.DoomBuilder.Windows
// cbOldHighlightMode
//
this.cbOldHighlightMode.AutoSize = true;
this.cbOldHighlightMode.Location = new System.Drawing.Point(237, 248);
this.cbOldHighlightMode.Location = new System.Drawing.Point(237, 302);
this.cbOldHighlightMode.Name = "cbOldHighlightMode";
this.cbOldHighlightMode.Size = new System.Drawing.Size(207, 17);
this.cbOldHighlightMode.TabIndex = 33;
@ -1669,7 +1685,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.tbDynLightIntensity.BackColor = System.Drawing.SystemColors.Window;
this.tbDynLightIntensity.LargeChange = 1;
this.tbDynLightIntensity.Location = new System.Drawing.Point(176, 119);
this.tbDynLightIntensity.Location = new System.Drawing.Point(176, 117);
this.tbDynLightIntensity.Minimum = 1;
this.tbDynLightIntensity.Name = "tbDynLightIntensity";
this.tbDynLightIntensity.Size = new System.Drawing.Size(154, 45);
@ -1691,7 +1707,7 @@ namespace CodeImp.DoomBuilder.Windows
//
this.tbDynLightSize.BackColor = System.Drawing.SystemColors.Window;
this.tbDynLightSize.LargeChange = 1;
this.tbDynLightSize.Location = new System.Drawing.Point(176, 85);
this.tbDynLightSize.Location = new System.Drawing.Point(176, 84);
this.tbDynLightSize.Maximum = 20;
this.tbDynLightSize.Minimum = 1;
this.tbDynLightSize.Name = "tbDynLightSize";
@ -1728,7 +1744,7 @@ namespace CodeImp.DoomBuilder.Windows
// animatevisualselection
//
this.animatevisualselection.AutoSize = true;
this.animatevisualselection.Location = new System.Drawing.Point(237, 227);
this.animatevisualselection.Location = new System.Drawing.Point(237, 281);
this.animatevisualselection.Name = "animatevisualselection";
this.animatevisualselection.Size = new System.Drawing.Size(184, 17);
this.animatevisualselection.TabIndex = 23;
@ -1738,7 +1754,7 @@ namespace CodeImp.DoomBuilder.Windows
// blackbrowsers
//
this.blackbrowsers.AutoSize = true;
this.blackbrowsers.Location = new System.Drawing.Point(25, 206);
this.blackbrowsers.Location = new System.Drawing.Point(25, 260);
this.blackbrowsers.Name = "blackbrowsers";
this.blackbrowsers.Size = new System.Drawing.Size(195, 17);
this.blackbrowsers.TabIndex = 4;
@ -1748,7 +1764,7 @@ namespace CodeImp.DoomBuilder.Windows
// visualbilinear
//
this.visualbilinear.AutoSize = true;
this.visualbilinear.Location = new System.Drawing.Point(25, 269);
this.visualbilinear.Location = new System.Drawing.Point(25, 323);
this.visualbilinear.Name = "visualbilinear";
this.visualbilinear.Size = new System.Drawing.Size(171, 17);
this.visualbilinear.TabIndex = 6;
@ -1758,7 +1774,7 @@ namespace CodeImp.DoomBuilder.Windows
// classicbilinear
//
this.classicbilinear.AutoSize = true;
this.classicbilinear.Location = new System.Drawing.Point(25, 248);
this.classicbilinear.Location = new System.Drawing.Point(25, 302);
this.classicbilinear.Name = "classicbilinear";
this.classicbilinear.Size = new System.Drawing.Size(176, 17);
this.classicbilinear.TabIndex = 5;
@ -2510,6 +2526,71 @@ namespace CodeImp.DoomBuilder.Windows
//
this.browseScreenshotsFolderDialog.Description = "Select a Folder to Save Screenshots Into";
//
// hiddenthingsalpha
//
this.hiddenthingsalpha.BackColor = System.Drawing.SystemColors.Window;
this.hiddenthingsalpha.LargeChange = 3;
this.hiddenthingsalpha.Location = new System.Drawing.Point(176, 216);
this.hiddenthingsalpha.Name = "hiddenthingsalpha";
this.hiddenthingsalpha.Size = new System.Drawing.Size(154, 45);
this.hiddenthingsalpha.TabIndex = 43;
this.hiddenthingsalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.hiddenthingsalpha.Minimum = 0;
this.hiddenthingsalpha.Maximum = 10;
this.hiddenthingsalpha.ValueChanged += new System.EventHandler(this.hiddenthingsalpha_ValueChanged);
//
// inactivethingsalpha
//
this.inactivethingsalpha.BackColor = System.Drawing.SystemColors.Window;
this.inactivethingsalpha.LargeChange = 3;
this.inactivethingsalpha.Location = new System.Drawing.Point(176, 183);
this.inactivethingsalpha.Name = "inactivethingsalpha";
this.inactivethingsalpha.Size = new System.Drawing.Size(154, 45);
this.inactivethingsalpha.TabIndex = 44;
this.inactivethingsalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.inactivethingsalpha.Minimum = 0;
this.inactivethingsalpha.Maximum = 10;
this.inactivethingsalpha.ValueChanged += new System.EventHandler(this.inactivethingsalpha_ValueChanged);
//
// label30
//
label30.AutoSize = true;
label30.Location = new System.Drawing.Point(60, 194);
label30.Name = "label30";
label30.Size = new System.Drawing.Size(106, 13);
label30.TabIndex = 45;
label30.Text = "Things transparency:";
label30.TextAlign = System.Drawing.ContentAlignment.TopRight;
label30.Click += new System.EventHandler(this.label30_Click);
//
// label31
//
label31.AutoSize = true;
label31.Location = new System.Drawing.Point(31, 227);
label31.Name = "label31";
label31.Size = new System.Drawing.Size(139, 13);
label31.TabIndex = 46;
label31.Text = "Hidden things transparency:";
label31.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// hiddenthingsalphalabel
//
this.hiddenthingsalphalabel.AutoSize = true;
this.hiddenthingsalphalabel.Location = new System.Drawing.Point(337, 227);
this.hiddenthingsalphalabel.Name = "hiddenthingsalphalabel";
this.hiddenthingsalphalabel.Size = new System.Drawing.Size(21, 13);
this.hiddenthingsalphalabel.TabIndex = 47;
this.hiddenthingsalphalabel.Text = "0%";
//
// inactivethingsalphalabel
//
this.inactivethingsalphalabel.AutoSize = true;
this.inactivethingsalphalabel.Location = new System.Drawing.Point(337, 194);
this.inactivethingsalphalabel.Name = "inactivethingsalphalabel";
this.inactivethingsalphalabel.Size = new System.Drawing.Size(21, 13);
this.inactivethingsalphalabel.TabIndex = 48;
this.inactivethingsalphalabel.Text = "0%";
//
// PreferencesForm
//
this.AcceptButton = this.apply;
@ -2582,6 +2663,8 @@ namespace CodeImp.DoomBuilder.Windows
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.tabpasting.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.hiddenthingsalpha)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.inactivethingsalpha)).EndInit();
this.ResumeLayout(false);
}
@ -2769,5 +2852,9 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Label labelDefaultThingSize;
private System.Windows.Forms.TrackBar tbDefaultThingSize;
private System.Windows.Forms.CheckBox keepfilterfocused;
private System.Windows.Forms.TrackBar inactivethingsalpha;
private System.Windows.Forms.TrackBar hiddenthingsalpha;
private System.Windows.Forms.Label inactivethingsalphalabel;
private System.Windows.Forms.Label hiddenthingsalphalabel;
}
}

23
Source/Core/Windows/PreferencesForm.cs
View file

@ -64,6 +64,8 @@ namespace CodeImp.DoomBuilder.Windows
imagebrightness.Value = General.Settings.ImageBrightness;
doublesidedalpha.Value = General.Clamp((int)((1.0f - General.Settings.DoubleSidedAlpha) * 10.0f), doublesidedalpha.Minimum, doublesidedalpha.Maximum);
nightscircleprecision.Value = General.Clamp((int)(General.Settings.NiGHTSCirclePrecision)/10, nightscircleprecision.Minimum, nightscircleprecision.Maximum);
inactivethingsalpha.Value = General.Clamp((int)((1.0f - General.Settings.InactiveThingsAlpha) * 10.0f), inactivethingsalpha.Minimum, inactivethingsalpha.Maximum); //mxd
hiddenthingsalpha.Value = General.Clamp((int)((1.0f - General.Settings.HiddenThingsAlpha) * 10.0f), hiddenthingsalpha.Minimum, hiddenthingsalpha.Maximum); //mxd
defaultviewmode.SelectedIndex = General.Settings.DefaultViewMode;
fieldofview.Value = General.Clamp(General.Settings.VisualFOV / 10, fieldofview.Minimum, fieldofview.Maximum);
mousespeed.Value = General.Clamp(General.Settings.MouseSpeed / 100, mousespeed.Minimum, mousespeed.Maximum);
@ -276,6 +278,8 @@ namespace CodeImp.DoomBuilder.Windows
General.Settings.ImageBrightness = imagebrightness.Value;
General.Settings.DoubleSidedAlpha = 1.0f - (doublesidedalpha.Value * 0.1f);
General.Settings.NiGHTSCirclePrecision = nightscircleprecision.Value * 10;
General.Settings.InactiveThingsAlpha = 1.0f - (inactivethingsalpha.Value * 0.1f); //mxd
General.Settings.HiddenThingsAlpha = 1.0f - (hiddenthingsalpha.Value * 0.1f); //mxd
General.Settings.DefaultViewMode = defaultviewmode.SelectedIndex;
General.Settings.VisualFOV = fieldofview.Value * 10;
General.Settings.MouseSpeed = mousespeed.Value * 100;
@ -970,6 +974,20 @@ namespace CodeImp.DoomBuilder.Windows
nightscircleprecisionlabel.Text = value.ToString();
}
//mxd
private void inactivethingsalpha_ValueChanged(object sender, EventArgs e)
{
int percent = inactivethingsalpha.Value * 10;
inactivethingsalphalabel.Text = percent + "%";
}
//mxd
private void hiddenthingsalpha_ValueChanged(object sender, EventArgs e)
{
int percent = hiddenthingsalpha.Value * 10;
hiddenthingsalphalabel.Text = percent + "%";
}
//mxd
private void tbDynLightCount_ValueChanged(object sender, EventArgs e)
{
@ -1247,6 +1265,11 @@ namespace CodeImp.DoomBuilder.Windows
}
}
private void label30_Click(object sender, EventArgs e)
{
}
/*
// This writes all action help files using a template and some basic info from the actions.
// Also writes actioncontents.txt with all files to be inserted into Contents.hhc.

6
Source/Core/Windows/PreferencesForm.resx
View file

@ -147,6 +147,12 @@
<metadata name="label29.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label31.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label30.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<data name="scriptallmanstyle.ToolTip" xml:space="preserve">
<value>When enabled, the opening brace
will be placed on a new line when

2
Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs
View file

@ -160,7 +160,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
//mxd. Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
renderer.RenderNiGHTSPath();

2
Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs
View file

@ -180,7 +180,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
//mxd. Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
renderer.RenderNiGHTSPath();

2
Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs
View file

@ -313,7 +313,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(renderer.StartThings(true))
{
// Render things
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
renderer.RenderNiGHTSPath();

2
Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs
View file

@ -148,7 +148,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
//mxd. Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
renderer.RenderNiGHTSPath();

4
Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
View file

@ -1571,8 +1571,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
if(highlighted is Thing) renderer.RenderThing((Thing)highlighted, General.Colors.Highlight, Presentation.THINGS_ALPHA);
renderer.RenderNiGHTSPath();
renderer.Finish();

4
Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs
View file

@ -875,8 +875,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
renderer.Finish();
}

4
Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
View file

@ -510,8 +510,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
renderer.Finish();
}

6
Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs
View file

@ -308,7 +308,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
p.AddLayer(new PresentLayer(RendererLayer.Surface, BlendingMode.Mask));
p.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
p.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
p.AddLayer(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, Presentation.THINGS_BACK_ALPHA, false));
p.AddLayer(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, General.Settings.InactiveThingsAlpha, false));
p.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
renderer.SetPresentation(p);
General.Map.Map.SelectionType = SelectionType.All;
@ -344,8 +344,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
renderer.Finish();
}

4
Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
View file

@ -763,8 +763,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
renderer.Finish();
}

4
Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
View file

@ -203,8 +203,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
for (int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.RenderAssociations(renderer, association[i], eventlines);

13
Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
View file

@ -167,8 +167,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
renderer.Finish();
}
@ -831,8 +831,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// This creates a new vertex at the mouse position
[BeginAction("insertitem", BaseAction = true)]
public void InsertVertexAction() { VerticesMode.InsertVertex(mousemappos, renderer.Scale); }
public static void InsertVertex(Vector2D mousemappos, float rendererscale)
private void InsertVertex()
{
bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
@ -846,7 +845,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Map.UndoRedo.CreateUndo("Insert vertex");
// Snap to geometry?
Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.SplitLinedefsRange / rendererscale);
Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.SplitLinedefsRange / renderer.Scale);
if(snaptonearest && (l != null))
{
// Snip to grid also?
@ -907,7 +906,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
if(snaptonearest)
{
//mxd. Check if snapped vertex is still on top of a linedef
l = General.Map.Map.NearestLinedefRange(v.Position, BuilderPlug.Me.SplitLinedefsRange / rendererscale);
l = General.Map.Map.NearestLinedefRange(v.Position, BuilderPlug.Me.SplitLinedefsRange / renderer.Scale);
if(l != null)
{
@ -1307,7 +1306,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
dv2.stitch = true;
dv1.pos = start;
dv2.pos = end;
Tools.DrawLines(new List<DrawnVertex>() { dv1, dv2 }, false, false);
Tools.DrawLines(new List<DrawnVertex> { dv1, dv2 }, false, false);
// Update cache values
General.Map.Map.Update();

8
Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs generated
View file

@ -48,7 +48,7 @@
this.buttonOK.Location = new System.Drawing.Point(95, 148);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 23);
this.buttonOK.TabIndex = 4;
this.buttonOK.TabIndex = 7;
this.buttonOK.Text = "OK";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
@ -60,7 +60,7 @@
this.buttonCancel.Location = new System.Drawing.Point(177, 148);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(75, 23);
this.buttonCancel.TabIndex = 5;
this.buttonCancel.TabIndex = 8;
this.buttonCancel.Text = "Cancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
@ -159,7 +159,7 @@
this.cbMirror.Location = new System.Drawing.Point(168, 96);
this.cbMirror.Name = "cbMirror";
this.cbMirror.Size = new System.Drawing.Size(81, 17);
this.cbMirror.TabIndex = 10;
this.cbMirror.TabIndex = 4;
this.cbMirror.Text = "Mirror mode";
this.cbMirror.UseVisualStyleBackColor = true;
this.cbMirror.CheckStateChanged += new System.EventHandler(this.cbMirror_CheckStateChanged);
@ -170,7 +170,7 @@
this.cbCopy.Location = new System.Drawing.Point(168, 119);
this.cbCopy.Name = "cbCopy";
this.cbCopy.Size = new System.Drawing.Size(79, 17);
this.cbCopy.TabIndex = 10;
this.cbCopy.TabIndex = 5;
this.cbCopy.Text = "Copy mode";
this.cbCopy.UseVisualStyleBackColor = true;
this.cbCopy.CheckedChanged += new System.EventHandler(this.cbCopy_CheckedChanged);

4
Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs
View file

@ -306,8 +306,8 @@ namespace CodeImp.DoomBuilder.SoundPropagationMode
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_BACK_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
lock (BuilderPlug.Me.SoundEnvironments)

4
Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs
View file

@ -276,8 +276,8 @@ namespace CodeImp.DoomBuilder.SoundPropagationMode
// Render things
if(renderer.StartThings(true))
{
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_BACK_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_HIDDEN_ALPHA);
renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, General.Settings.HiddenThingsAlpha);
renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, General.Settings.InactiveThingsAlpha);
renderer.RenderNiGHTSPath();
foreach (Thing thing in huntingThings)
{