mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-23 04:12:12 +00:00
Added "Full Brightness" toolbar button and "View" menu item. These call "Toggle Full Brightness" action.
Added "Make Door" menu item to "Sectors" menu. A warning is now displayed when "Make Door" action is called without a selection.
This commit is contained in:
MaxED
parent
7d4ac20b0f
commit
9a50b38f78
18 changed files with 149 additions and 87 deletions
|
|
@ -941,6 +941,7 @@
|
|||
<None Include="Resources\Check.png" />
|
||||
<None Include="Resources\ClearTextures.png" />
|
||||
<None Include="Resources\Cursor.png" />
|
||||
<None Include="Resources\Brightness.png" />
|
||||
<Content Include="Resources\DB2.ico" />
|
||||
<None Include="Resources\GZDB2.ico" />
|
||||
<None Include="Resources\fog.png" />
|
||||
|
|
|
|||
7
Source/Core/Properties/Resources.Designer.cs
generated
7
Source/Core/Properties/Resources.Designer.cs
generated
|
|
@ -88,6 +88,13 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Brightness {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Brightness", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap Check {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Check", resourceCulture);
|
||||
|
|
|
|||
|
|
@ -178,15 +178,15 @@
|
|||
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptPalette" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ScriptHelp" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ScriptHelp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -196,11 +196,17 @@
|
|||
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -283,9 +289,6 @@
|
|||
<data name="ErrorLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MCrash" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MCrash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -295,15 +298,15 @@
|
|||
<data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Model_selected" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="NewScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\NewScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SnapVerts" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SnapVerts.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Unlink" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unlink.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -340,20 +343,23 @@
|
|||
<data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TagStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TagStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Angle" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Angle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -370,20 +376,17 @@
|
|||
<data name="ViewNormal" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewNormal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Monster3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Monster3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -391,8 +394,8 @@
|
|||
<data name="OpenScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\OpenScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Status11" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Status11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
@ -409,7 +412,7 @@
|
|||
<data name="Check" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SnapVerts" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SnapVerts.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Brightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Brightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -37,7 +37,6 @@ namespace CodeImp.DoomBuilder.Rendering
|
|||
float Scale { get; }
|
||||
int VertexSize { get; }
|
||||
ViewMode ViewMode { get; }
|
||||
bool FullBrightness { get; set; } //mxd
|
||||
|
||||
// View methods
|
||||
Vector2D DisplayToMap(Vector2D mousepos);
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
|||
|
||||
// Disposing
|
||||
public bool IsDisposed { get { return isdisposed; } }
|
||||
public static bool FullBrightness { get { return fullbrightness; } set { fullbrightness = value; } } //mxd
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
|||
public ViewMode ViewMode { get { return viewmode; } }
|
||||
public SurfaceManager Surfaces { get { return surfaces; } }
|
||||
public RectangleF Viewport { get { return viewport; } } //mxd
|
||||
public bool FullBrightness { get { return fullbrightness; } set { fullbrightness = value; } } //mxd
|
||||
new public bool FullBrightness { get { return fullbrightness; } set { fullbrightness = value; } } //mxd
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
|||
|
||||
public ProjectedFrustum2D Frustum2D { get { return frustum; } }
|
||||
public bool DrawThingCages { get { return renderthingcages; } set { renderthingcages = value; } }
|
||||
public bool FullBrightness { get { return fullbrightness; } set { fullbrightness = value; } }
|
||||
new public bool FullBrightness { get { return fullbrightness; } set { fullbrightness = value; } }
|
||||
public bool ShowSelection { get { return showselection; } set { showselection = value; } }
|
||||
public bool ShowHighlight { get { return showhighlight; } set { showhighlight = value; } }
|
||||
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ namespace CodeImp.DoomBuilder.Rendering
|
|||
{
|
||||
if(!resourcesunloaded)
|
||||
{
|
||||
int pass = General.Map.Renderer2D.FullBrightness ? 2 : 1; //mxd
|
||||
int pass = Renderer.FullBrightness ? 2 : 1; //mxd
|
||||
graphics.Shaders.Display2D.Begin();
|
||||
foreach(KeyValuePair<ImageData, List<SurfaceEntry>> imgsurfaces in surfaces)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -971,6 +971,17 @@ viewmodeceilings
|
|||
allowscroll = false;
|
||||
}
|
||||
|
||||
togglebrightness //mxd
|
||||
{
|
||||
title = "Toggle Full Brightness";
|
||||
category = "view";
|
||||
description = "Toggles the use of sector brightness on and off. When sector brightness is off, the world is displayed fully bright, without lighting effects.";
|
||||
allowkeys = true;
|
||||
allowmouse = true;
|
||||
allowscroll = true;
|
||||
default = 66; //B
|
||||
}
|
||||
|
||||
visualselect
|
||||
{
|
||||
title = "Select";
|
||||
|
|
|
|||
BIN
Source/Core/Resources/Brightness.png
Normal file
BIN
Source/Core/Resources/Brightness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
54
Source/Core/Windows/MainForm.Designer.cs
generated
54
Source/Core/Windows/MainForm.Designer.cs
generated
|
|
@ -120,6 +120,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.itemviewfloors = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.itemviewceilings = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.seperatorviewviews = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.menufullbrightness = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.menuzoom = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.item2zoom200 = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.item2zoom100 = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
|
@ -185,6 +187,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.buttoninsertpreviousprefab = new System.Windows.Forms.ToolStripButton();
|
||||
this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton();
|
||||
this.thingfilters = new System.Windows.Forms.ToolStripComboBox();
|
||||
this.buttonfullbrightness = new System.Windows.Forms.ToolStripButton();
|
||||
this.separatorfullbrightness = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.buttonviewnormal = new System.Windows.Forms.ToolStripButton();
|
||||
this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton();
|
||||
this.buttonviewfloors = new System.Windows.Forms.ToolStripButton();
|
||||
|
|
@ -254,6 +258,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.dockerscollapser = new System.Windows.Forms.Timer(this.components);
|
||||
this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.modecontrolsloolbar = new System.Windows.Forms.ToolStrip();
|
||||
this.separatorfilters = new System.Windows.Forms.ToolStripSeparator();
|
||||
toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||
toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
|
||||
toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
|
||||
|
|
@ -971,6 +976,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.itemviewfloors,
|
||||
this.itemviewceilings,
|
||||
this.seperatorviewviews,
|
||||
this.menufullbrightness,
|
||||
this.toolStripSeparator4,
|
||||
this.menuzoom,
|
||||
this.menugotocoords,
|
||||
this.itemfittoscreen,
|
||||
|
|
@ -1037,6 +1044,21 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.seperatorviewviews.Name = "seperatorviewviews";
|
||||
this.seperatorviewviews.Size = new System.Drawing.Size(206, 6);
|
||||
//
|
||||
// menufullbrightness
|
||||
//
|
||||
this.menufullbrightness.CheckOnClick = true;
|
||||
this.menufullbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.Brightness;
|
||||
this.menufullbrightness.Name = "menufullbrightness";
|
||||
this.menufullbrightness.Size = new System.Drawing.Size(209, 22);
|
||||
this.menufullbrightness.Tag = "builder_togglebrightness";
|
||||
this.menufullbrightness.Text = "Full Brightness";
|
||||
this.menufullbrightness.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// toolStripSeparator4
|
||||
//
|
||||
this.toolStripSeparator4.Name = "toolStripSeparator4";
|
||||
this.toolStripSeparator4.Size = new System.Drawing.Size(206, 6);
|
||||
//
|
||||
// menuzoom
|
||||
//
|
||||
this.menuzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
|
|
@ -1391,6 +1413,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.seperatorprefabs,
|
||||
this.buttonthingsfilter,
|
||||
this.thingfilters,
|
||||
this.separatorfilters,
|
||||
this.buttonfullbrightness,
|
||||
this.separatorfullbrightness,
|
||||
this.buttonviewnormal,
|
||||
this.buttonviewbrightness,
|
||||
this.buttonviewfloors,
|
||||
|
|
@ -1655,6 +1680,23 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.thingfilters.SelectedIndexChanged += new System.EventHandler(this.thingfilters_SelectedIndexChanged);
|
||||
this.thingfilters.DropDownClosed += new System.EventHandler(this.LoseFocus);
|
||||
//
|
||||
// buttonfullbrightness
|
||||
//
|
||||
this.buttonfullbrightness.CheckOnClick = true;
|
||||
this.buttonfullbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.buttonfullbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.Brightness;
|
||||
this.buttonfullbrightness.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.buttonfullbrightness.Name = "buttonfullbrightness";
|
||||
this.buttonfullbrightness.Size = new System.Drawing.Size(23, 22);
|
||||
this.buttonfullbrightness.Tag = "builder_togglebrightness";
|
||||
this.buttonfullbrightness.Text = "Full Brightness";
|
||||
this.buttonfullbrightness.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// separatorfullbrightness
|
||||
//
|
||||
this.separatorfullbrightness.Name = "separatorfullbrightness";
|
||||
this.separatorfullbrightness.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// buttonviewnormal
|
||||
//
|
||||
this.buttonviewnormal.CheckOnClick = true;
|
||||
|
|
@ -2331,7 +2373,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
// dockersspace
|
||||
//
|
||||
this.dockersspace.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
this.dockersspace.Location = new System.Drawing.Point(32, 49);
|
||||
this.dockersspace.Location = new System.Drawing.Point(0, 49);
|
||||
this.dockersspace.Name = "dockersspace";
|
||||
this.dockersspace.Size = new System.Drawing.Size(26, 515);
|
||||
this.dockersspace.TabIndex = 6;
|
||||
|
|
@ -2383,6 +2425,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.modecontrolsloolbar.Text = "toolStrip1";
|
||||
this.modecontrolsloolbar.Visible = false;
|
||||
//
|
||||
// separatorfilters
|
||||
//
|
||||
this.separatorfilters.Name = "separatorfilters";
|
||||
this.separatorfilters.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
|
|
@ -2647,5 +2694,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
private System.Windows.Forms.ToolStrip modestoolbar;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
|
||||
private System.Windows.Forms.ToolStrip modecontrolsloolbar;
|
||||
private System.Windows.Forms.ToolStripMenuItem menufullbrightness;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
|
||||
private System.Windows.Forms.ToolStripButton buttonfullbrightness;
|
||||
private System.Windows.Forms.ToolStripSeparator separatorfullbrightness;
|
||||
private System.Windows.Forms.ToolStripSeparator separatorfilters;
|
||||
}
|
||||
}
|
||||
|
|
@ -1791,6 +1791,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
buttoninsertpreviousprefab.Visible = General.Settings.ToolbarPrefabs;
|
||||
buttonthingsfilter.Visible = General.Settings.ToolbarFilter;
|
||||
thingfilters.Visible = General.Settings.ToolbarFilter;
|
||||
separatorfilters.Visible = General.Settings.ToolbarViewModes; //mxd
|
||||
buttonfullbrightness.Visible = General.Settings.ToolbarViewModes; //mxd
|
||||
separatorfullbrightness.Visible = General.Settings.ToolbarViewModes; //mxd
|
||||
buttonviewbrightness.Visible = General.Settings.ToolbarViewModes;
|
||||
buttonviewceilings.Visible = General.Settings.ToolbarViewModes;
|
||||
buttonviewfloors.Visible = General.Settings.ToolbarViewModes;
|
||||
|
|
@ -2509,6 +2512,18 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
DisplayStatus(StatusType.Action, "Snap to geometry is " + (buttonautomerge.Checked ? "ENABLED" : "DISABLED"));
|
||||
}
|
||||
|
||||
//mxd
|
||||
[BeginAction("togglebrightness")]
|
||||
internal void ToggleBrightness() {
|
||||
Renderer.FullBrightness = !Renderer.FullBrightness;
|
||||
buttonfullbrightness.Checked = Renderer.FullBrightness;
|
||||
menufullbrightness.Checked = Renderer.FullBrightness;
|
||||
General.Interface.DisplayStatus(StatusType.Action, "Full Brightness is now " + (Renderer.FullBrightness ? "ON" : "OFF"));
|
||||
|
||||
// Redraw display to show changes
|
||||
General.Interface.RedrawDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
[BeginAction("toggleautoclearsidetextures")]
|
||||
internal void ToggleAutoClearSideTextures() {
|
||||
|
|
@ -2538,6 +2553,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
itemfittoscreen.Enabled = (General.Map != null);
|
||||
menuzoom.Enabled = (General.Map != null);
|
||||
menugotocoords.Enabled = (General.Map != null); //mxd
|
||||
menufullbrightness.Enabled = (General.Map != null); //mxd
|
||||
itemtoggleinfo.Checked = IsInfoPanelExpanded;
|
||||
|
||||
// View mode items
|
||||
|
|
@ -2564,6 +2580,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
thingfilters.Enabled = (General.Map != null);
|
||||
buttonthingsfilter.Enabled = (General.Map != null);
|
||||
buttonscripteditor.Enabled = (General.Map != null);
|
||||
buttonfullbrightness.Enabled = (General.Map != null); //mxd
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
|
|||
|
|
@ -186,27 +186,6 @@
|
|||
<metadata name="sectorinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="heightpanel1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="labelcollapsedinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="modename.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="buttontoggleinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="linedefinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="thinginfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="sectorinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="redrawtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>433, 17</value>
|
||||
</metadata>
|
||||
|
|
@ -237,9 +216,6 @@
|
|||
<metadata name="modecontrolsloolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>452, 56</value>
|
||||
</metadata>
|
||||
<metadata name="modecontrolsloolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>452, 56</value>
|
||||
</metadata>
|
||||
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
|
|||
|
|
@ -308,17 +308,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
paintselectpressed = false;
|
||||
}
|
||||
|
||||
//mxd
|
||||
[BeginAction("togglebrightness")]
|
||||
protected virtual void ToggleBrightness() {
|
||||
renderer.FullBrightness = !renderer.FullBrightness;
|
||||
string onoff = renderer.FullBrightness ? "ON" : "OFF";
|
||||
General.Interface.DisplayStatus(StatusType.Action, "Full Brightness is now " + onoff + ".");
|
||||
|
||||
// Redraw display to show changes
|
||||
General.Interface.RedrawDisplay();
|
||||
}
|
||||
|
||||
//mxd
|
||||
[BeginAction("togglehighlight")]
|
||||
public void ToggleHighlight() {
|
||||
|
|
|
|||
|
|
@ -1428,6 +1428,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
form.Dispose();
|
||||
General.Interface.RedrawDisplay();
|
||||
}
|
||||
else //mxd
|
||||
{
|
||||
General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection!");
|
||||
}
|
||||
}
|
||||
|
||||
[BeginAction("deleteitem", BaseAction = true)]
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.joinsectorsitem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mergesectorsitem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.makedooritem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.thingsmenu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.selectInSectorsItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
|
|
@ -80,6 +81,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.buttonAlignThingsToWall = new System.Windows.Forms.ToolStripButton();
|
||||
this.buttonTextureOffsetLock = new System.Windows.Forms.ToolStripButton();
|
||||
this.buttonMakeDoor = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.menustrip.SuspendLayout();
|
||||
this.manualstrip.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
|
|
@ -253,7 +255,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.toolStripSeparator1,
|
||||
this.joinsectorsitem,
|
||||
this.mergesectorsitem,
|
||||
this.toolStripMenuItem2});
|
||||
this.toolStripMenuItem2,
|
||||
this.makedooritem,
|
||||
this.toolStripSeparator4});
|
||||
this.sectorsmenu.Name = "sectorsmenu";
|
||||
this.sectorsmenu.Size = new System.Drawing.Size(57, 20);
|
||||
this.sectorsmenu.Text = "&Sectors";
|
||||
|
|
@ -299,7 +303,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
//
|
||||
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
|
||||
this.toolStripMenuItem2.Size = new System.Drawing.Size(242, 6);
|
||||
this.toolStripMenuItem2.Visible = false;
|
||||
//
|
||||
// makedooritem
|
||||
//
|
||||
this.makedooritem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Door;
|
||||
this.makedooritem.Name = "makedooritem";
|
||||
this.makedooritem.Size = new System.Drawing.Size(245, 22);
|
||||
this.makedooritem.Tag = "makedoor";
|
||||
this.makedooritem.Text = "Make &Door";
|
||||
this.makedooritem.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// thingsmenu
|
||||
//
|
||||
|
|
@ -573,6 +585,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
this.buttonMakeDoor.Text = "Make Door From Selection";
|
||||
this.buttonMakeDoor.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// toolStripSeparator4
|
||||
//
|
||||
this.toolStripSeparator4.Name = "toolStripSeparator4";
|
||||
this.toolStripSeparator4.Size = new System.Drawing.Size(242, 6);
|
||||
this.toolStripSeparator4.Visible = false;
|
||||
//
|
||||
// MenusForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
|
|
@ -653,5 +671,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
private System.Windows.Forms.ToolStripMenuItem selectInSectorsItem2;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
|
||||
private System.Windows.Forms.ToolStripButton buttonMakeDoor;
|
||||
private System.Windows.Forms.ToolStripMenuItem makedooritem;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
|
||||
}
|
||||
}
|
||||
|
|
@ -949,16 +949,6 @@ togglegravity
|
|||
allowscroll = true;
|
||||
}
|
||||
|
||||
togglebrightness
|
||||
{
|
||||
title = "Toggle Full Brightness";
|
||||
category = "tools";
|
||||
description = "Toggles the use of sector brightness on and off. When sector brightness is off, the world is displayed fully bright, without lighting effects.";
|
||||
allowkeys = true;
|
||||
allowmouse = true;
|
||||
allowscroll = true;
|
||||
}
|
||||
|
||||
togglehighlight
|
||||
{
|
||||
title = "Toggle Highlight";
|
||||
|
|
|
|||
|
|
@ -2585,14 +2585,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
|
|||
General.Interface.DisplayStatus(StatusType.Action, "Gravity is now " + onoff + ".");
|
||||
}
|
||||
|
||||
[BeginAction("togglebrightness")]
|
||||
public void ToggleBrightness()
|
||||
{
|
||||
renderer.FullBrightness = !renderer.FullBrightness;
|
||||
string onoff = renderer.FullBrightness ? "ON" : "OFF";
|
||||
General.Interface.DisplayStatus(StatusType.Action, "Full Brightness is now " + onoff + ".");
|
||||
}
|
||||
|
||||
[BeginAction("togglehighlight")]
|
||||
public void ToggleHighlight()
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue