diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index a8f0331a9e226039d8b0742c757e33755af0b77f..382c009303d71790e3e37463e1a63b43d6e0f6fb 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -815,6 +815,7 @@ <Content Include="Resources\DrawLinesMode.png" /> <Content Include="Resources\DrawRectMode.png" /> <None Include="Resources\GZDB_Logo_small.png" /> + <None Include="Resources\InfoLine.png" /> <Content Include="Resources\Light.png" /> <Content Include="Resources\Light_animate.png" /> <None Include="Resources\MLogo.png" /> diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs index 8d2432f1f3be1297338f56a25eb9fd199faab34b..50c6d22bb17fe2f9aba2cec422d5a8dd176b034a 100644 --- a/Source/Core/GZBuilder/GZGeneral.cs +++ b/Source/Core/GZBuilder/GZGeneral.cs @@ -153,6 +153,8 @@ namespace CodeImp.DoomBuilder.GZBuilder private static void toggleEventLines() { General.Settings.GZShowEventLines = !General.Settings.GZShowEventLines; General.MainWindow.DisplayStatus(StatusType.Action, "Event lines are " + (General.Settings.GZShowEventLines ? "ENABLED" : "DISABLED")); + General.MainWindow.RedrawDisplay(); + General.MainWindow.UpdateGZDoomPannel(); } //main menu actions diff --git a/Source/Core/Properties/Resources.Designer.cs b/Source/Core/Properties/Resources.Designer.cs index 2f2809f0184da7a9b2ae3141515ee47ec12c636b..334b10a16427b1f1a1b8aafb9be9db34c4efffcb 100644 --- a/Source/Core/Properties/Resources.Designer.cs +++ b/Source/Core/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // Ðтот код Ñоздан программой. -// ИÑполнÑÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑиÑ:2.0.50727.4927 +// ИÑполнÑÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑиÑ:2.0.50727.5420 // // Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ñтом файле могут привеÑти к неправильной работе и будут потерÑны в Ñлучае // повторной генерации кода. @@ -200,6 +200,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap InfoLine { + get { + object obj = ResourceManager.GetObject("InfoLine", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap KnownTextureSet { get { object obj = ResourceManager.GetObject("KnownTextureSet", resourceCulture); diff --git a/Source/Core/Properties/Resources.resx b/Source/Core/Properties/Resources.resx index e239fc565c063bc6848aafe306673d27e93156d6..4128af5ab82d0252f2c570e1cb8511da7a6c4bcb 100644 --- a/Source/Core/Properties/Resources.resx +++ b/Source/Core/Properties/Resources.resx @@ -118,44 +118,62 @@ <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="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Grid2.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 name="mergegeometry2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ScriptConstant" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ScriptConstant.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <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="Grid4" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="SaveMap" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\SaveMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="PasteSpecial" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\PasteSpecial.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="SaveScript" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\SaveScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="UnknownImage" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\UnknownImage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ColorPick" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Hourglass" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\NewMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Status10" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="GZDB_Logo_small" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\GZDB_Logo_small.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 name="SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Monster2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Monster2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="ScriptError" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ScriptError.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Grid4" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Status10" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="Script2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Script2.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> + <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="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> <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -163,193 +181,178 @@ <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="List" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="Cut" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="Status12" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Status12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Redo.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="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="OpenMap" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\OpenMap.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="ViewTextureFloor" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ViewTextureFloor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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="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 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> </data> - <data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="List_Images" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Monster2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Monster2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="MLogo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\MLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="UnknownImage" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\UnknownImage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="WarningLarge" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\WarningLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Paste.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> + <data name="ScriptConstant" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ScriptConstant.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\NewMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ViewTextureCeiling" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ViewTextureCeiling.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 name="fx" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fx.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 name="CLogo" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\CLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="NewMap" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\NewMap2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="WarningOff" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <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 name="List" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="CLogo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\CLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="SaveMap" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\SaveMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Question" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Question.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 name="OpenMap" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\OpenMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Prefab" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Prefab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="MLogo" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\MLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="PasteSpecial" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\PasteSpecial.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Failed" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Failed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="NewMap" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\NewMap2.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 name="SearchClear" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\SearchClear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Prefab2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Prefab2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="fog" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="MissingTexture" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\MissingTexture.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 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="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="ScriptCompile" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ScriptCompile.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 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="Text" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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="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 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="ScriptKeyword" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ScriptKeyword.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> <data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Properties.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> - <data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="WarningOff" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="GZDB_Logo_small" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\GZDB_Logo_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Cut" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ViewTextureCeiling" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ViewTextureCeiling.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Prefab" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Prefab.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> + <data name="Hourglass" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Hourglass.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 name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="mergegeometry2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Status12" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Status12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Prefab2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Prefab2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="Question" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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="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> + <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="ScriptKeyword" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ScriptKeyword.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + <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="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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> </data> - <data name="fx" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fx.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ViewTextureFloor" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ViewTextureFloor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ScriptCompile" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ScriptCompile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="SaveScript" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\SaveScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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="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 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="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Paste.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> - <data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Folder.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> - <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 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> </data> - <data name="fog" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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="ColorPick" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ColorPick.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="List_Images" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <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> </data> - <data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Status1.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 name="WarningLarge" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\WarningLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <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 name="Text" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="SearchClear" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\SearchClear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="InfoLine" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\InfoLine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/Source/Core/Rendering/IRenderer2D.cs b/Source/Core/Rendering/IRenderer2D.cs index ff72993431a0a97141563f59c57f9d099ed81355..1881d5c0dd5645ca37ccaa4407aaddc46c26f8e5 100644 --- a/Source/Core/Rendering/IRenderer2D.cs +++ b/Source/Core/Rendering/IRenderer2D.cs @@ -33,6 +33,7 @@ using CodeImp.DoomBuilder.Geometry; using System.Drawing.Imaging; using CodeImp.DoomBuilder.Data; using CodeImp.DoomBuilder.Editing; +using CodeImp.DoomBuilder.GZBuilder.Geometry; #endregion @@ -68,6 +69,8 @@ namespace CodeImp.DoomBuilder.Rendering void Present(); // Drawing methods + void RenderArrows(List<Line3D> lines, PixelColor c); //mxd + void PlotArrows(List<Line3D> lines, PixelColor c); //mxd void PlotLine(Vector2D start, Vector2D end, PixelColor c); void PlotLinedef(Linedef l, PixelColor c); void PlotLinedefSet(ICollection<Linedef> linedefs); diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs index 9bb21dc06c8f86a8ae4bcfa997720bbc8179c3f5..d8b5a169a7ac5b451acc5ac6974fd82baff43e7b 100644 --- a/Source/Core/Rendering/Renderer2D.cs +++ b/Source/Core/Rendering/Renderer2D.cs @@ -38,6 +38,7 @@ using CodeImp.DoomBuilder.Editing; //mxd using CodeImp.DoomBuilder.GZBuilder.Data; using CodeImp.DoomBuilder.GZBuilder.MD3; +using CodeImp.DoomBuilder.GZBuilder.Geometry; #endregion @@ -1444,6 +1445,30 @@ namespace CodeImp.DoomBuilder.Rendering graphics.Shaders.Display2D.End(); } + //mxd + public void RenderArrows(List<Line3D> lines, PixelColor c) { + float scaler = 20f / scale; + foreach(Line3D l in lines) { + RenderLine(l.v1, l.v2, 0.8f, c, true); + float angle = l.GetAngle(); + //arrowhead + RenderLine(l.v2, new Vector2D(l.v2.x - scaler * (float)Math.Sin(angle - 0.46f), l.v2.y + scaler * (float)Math.Cos(angle - 0.46f)), 0.8f, c, true); + RenderLine(l.v2, new Vector2D(l.v2.x - scaler * (float)Math.Sin(angle + 0.46f), l.v2.y + scaler * (float)Math.Cos(angle + 0.46f)), 0.8f, c, true); + } + } + + //mxd + public void PlotArrows(List<Line3D> lines, PixelColor c) { + float scaler = 16f / scale; + foreach(Line3D l in lines) { + PlotLine(l.v1, l.v2, c); + float angle = l.GetAngle(); + //arrowhead + PlotLine(l.v2, new Vector2D(l.v2.x - scaler * (float)Math.Sin(angle - 0.46f), l.v2.y + scaler * (float)Math.Cos(angle - 0.46f)), c); + PlotLine(l.v2, new Vector2D(l.v2.x - scaler * (float)Math.Sin(angle + 0.46f), l.v2.y + scaler * (float)Math.Cos(angle + 0.46f)), c); + } + } + // This renders a line with given color public void RenderLine(Vector2D start, Vector2D end, float thickness, PixelColor c, bool transformcoords) { diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs index 367729d04545b91b4b1d85934e228d82e9ac768e..3e641cf144e7a4bfe9f2d454a957d8f90c458e3d 100644 --- a/Source/Core/Rendering/Renderer3D.cs +++ b/Source/Core/Rendering/Renderer3D.cs @@ -674,15 +674,18 @@ namespace CodeImp.DoomBuilder.Rendering private void renderLinks(List<Line3D> lines) { //create vertices WorldVertex[] verts = new WorldVertex[lines.Count * 6]; + float scaler = 20f; + for (int i = 0; i < lines.Count; i++) { WorldVertex endPoint = new WorldVertex(lines[i].v2); + float nz = lines[i].GetDelta().GetNormal().z * scaler; float angle = lines[i].GetAngle(); verts[i * 6] = new WorldVertex(lines[i].v1); verts[i * 6 + 1] = endPoint; verts[i * 6 + 2] = endPoint; - verts[i * 6 + 3] = new WorldVertex(new Vector3D(lines[i].v2.x - 20f * (float)Math.Sin(angle - 0.52f), lines[i].v2.y + 20f * (float)Math.Cos(angle - 0.52f), lines[i].v2.z)); + verts[i * 6 + 3] = new WorldVertex(new Vector3D(lines[i].v2.x - scaler * (float)Math.Sin(angle - 0.46f), lines[i].v2.y + scaler * (float)Math.Cos(angle - 0.46f), lines[i].v2.z - nz)); verts[i * 6 + 4] = endPoint; - verts[i * 6 + 5] = new WorldVertex(new Vector3D(lines[i].v2.x - 20f * (float)Math.Sin(angle + 0.52f), lines[i].v2.y + 20f * (float)Math.Cos(angle + 0.52f), lines[i].v2.z)); + verts[i * 6 + 5] = new WorldVertex(new Vector3D(lines[i].v2.x - scaler * (float)Math.Sin(angle + 0.46f), lines[i].v2.y + scaler * (float)Math.Cos(angle + 0.46f), lines[i].v2.z - nz)); } VertexBuffer vb = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * verts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default); @@ -715,6 +718,7 @@ namespace CodeImp.DoomBuilder.Rendering graphics.Shaders.World3D.EndPass(); graphics.Shaders.World3D.SetModulateColor(-1); graphics.Device.SetRenderState(RenderState.TextureFactor, -1); + vb.Dispose(); } // This performs a single render pass diff --git a/Source/Core/Resources/InfoLine.png b/Source/Core/Resources/InfoLine.png new file mode 100644 index 0000000000000000000000000000000000000000..13acaee020c9882432539969cd23f50b942158dc Binary files /dev/null and b/Source/Core/Resources/InfoLine.png differ diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs index 038123a1a1df5ccf844f4acfe8bc48ff2ecf70f4..c8d6118eac58d89fee3c03ffd4ea83b4aba15eff 100644 --- a/Source/Core/Windows/MainForm.Designer.cs +++ b/Source/Core/Windows/MainForm.Designer.cs @@ -28,286 +28,287 @@ namespace CodeImp.DoomBuilder.Windows /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - System.Windows.Forms.ToolStripSeparator toolStripSeparator9; - System.Windows.Forms.ToolStripSeparator toolStripSeparator12; - System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; - System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.seperatorfileopen = new System.Windows.Forms.ToolStripSeparator(); - this.seperatorfilerecent = new System.Windows.Forms.ToolStripSeparator(); - this.seperatoreditgrid = new System.Windows.Forms.ToolStripSeparator(); - this.seperatoreditcopypaste = new System.Windows.Forms.ToolStripSeparator(); - this.seperatorfile = new System.Windows.Forms.ToolStripSeparator(); - this.seperatorscript = new System.Windows.Forms.ToolStripSeparator(); - this.seperatorprefabs = new System.Windows.Forms.ToolStripSeparator(); - this.seperatorundo = new System.Windows.Forms.ToolStripSeparator(); - this.seperatorcopypaste = new System.Windows.Forms.ToolStripSeparator(); - this.seperatormodes = new System.Windows.Forms.ToolStripSeparator(); - this.poscommalabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.menumain = new System.Windows.Forms.MenuStrip(); - this.menufile = new System.Windows.Forms.ToolStripMenuItem(); - this.itemnewmap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemopenmap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemclosemap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsavemap = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsavemapas = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsavemapinto = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatorfilesave = new System.Windows.Forms.ToolStripSeparator(); - this.itemnorecent = new System.Windows.Forms.ToolStripMenuItem(); - this.itemexit = new System.Windows.Forms.ToolStripMenuItem(); - this.menuedit = new System.Windows.Forms.ToolStripMenuItem(); - this.itemundo = new System.Windows.Forms.ToolStripMenuItem(); - this.itemredo = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatoreditundo = new System.Windows.Forms.ToolStripSeparator(); - this.itemcut = new System.Windows.Forms.ToolStripMenuItem(); - this.itemcopy = new System.Windows.Forms.ToolStripMenuItem(); - this.itempaste = new System.Windows.Forms.ToolStripMenuItem(); - this.itempastespecial = new System.Windows.Forms.ToolStripMenuItem(); - this.itemsnaptogrid = new System.Windows.Forms.ToolStripMenuItem(); - this.itemautomerge = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatoreditgeometry = new System.Windows.Forms.ToolStripSeparator(); - this.itemgridinc = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgriddec = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgridsetup = new System.Windows.Forms.ToolStripMenuItem(); - this.itemmapoptions = new System.Windows.Forms.ToolStripMenuItem(); - this.menuview = new System.Windows.Forms.ToolStripMenuItem(); - this.itemthingsfilter = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatorviewthings = new System.Windows.Forms.ToolStripSeparator(); - this.itemviewnormal = new System.Windows.Forms.ToolStripMenuItem(); - this.itemviewbrightness = new System.Windows.Forms.ToolStripMenuItem(); - this.itemviewfloors = new System.Windows.Forms.ToolStripMenuItem(); - this.itemviewceilings = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatorviewviews = 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(); - this.item2zoom50 = new System.Windows.Forms.ToolStripMenuItem(); - this.item2zoom25 = new System.Windows.Forms.ToolStripMenuItem(); - this.item2zoom10 = new System.Windows.Forms.ToolStripMenuItem(); - this.item2zoom5 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemfittoscreen = new System.Windows.Forms.ToolStripMenuItem(); - this.itemtoggleinfo = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatorviewzoom = new System.Windows.Forms.ToolStripSeparator(); - this.itemscripteditor = new System.Windows.Forms.ToolStripMenuItem(); - this.menumode = new System.Windows.Forms.ToolStripMenuItem(); - this.separatorDrawModes = new System.Windows.Forms.ToolStripSeparator(); - this.menuprefabs = new System.Windows.Forms.ToolStripMenuItem(); - this.iteminsertprefabfile = new System.Windows.Forms.ToolStripMenuItem(); - this.iteminsertpreviousprefab = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatorprefabsinsert = new System.Windows.Forms.ToolStripSeparator(); - this.itemcreateprefab = new System.Windows.Forms.ToolStripMenuItem(); - this.menutools = new System.Windows.Forms.ToolStripMenuItem(); - this.itemreloadresources = new System.Windows.Forms.ToolStripMenuItem(); - this.itemReloadModedef = new System.Windows.Forms.ToolStripMenuItem(); - this.itemReloadGldefs = new System.Windows.Forms.ToolStripMenuItem(); - this.itemReloadMapinfo = new System.Windows.Forms.ToolStripMenuItem(); - this.itemshowerrors = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatortoolsresources = new System.Windows.Forms.ToolStripSeparator(); - this.configurationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatortoolsconfig = new System.Windows.Forms.ToolStripSeparator(); - this.itemtestmap = new System.Windows.Forms.ToolStripMenuItem(); - this.menuhelp = new System.Windows.Forms.ToolStripMenuItem(); - this.itemhelprefmanual = new System.Windows.Forms.ToolStripMenuItem(); - this.itemhelpeditmode = new System.Windows.Forms.ToolStripMenuItem(); - this.seperatorhelpmanual = new System.Windows.Forms.ToolStripSeparator(); - this.itemhelpabout = new System.Windows.Forms.ToolStripMenuItem(); - this.toolbar = new System.Windows.Forms.ToolStrip(); - this.buttonnewmap = new System.Windows.Forms.ToolStripButton(); - this.buttonopenmap = new System.Windows.Forms.ToolStripButton(); - this.buttonsavemap = new System.Windows.Forms.ToolStripButton(); - this.buttonscripteditor = new System.Windows.Forms.ToolStripButton(); - this.buttonundo = new System.Windows.Forms.ToolStripButton(); - this.buttonredo = new System.Windows.Forms.ToolStripButton(); - this.buttoncut = new System.Windows.Forms.ToolStripButton(); - this.buttoncopy = new System.Windows.Forms.ToolStripButton(); - this.buttonpaste = new System.Windows.Forms.ToolStripButton(); - this.buttoninsertprefabfile = new System.Windows.Forms.ToolStripButton(); - this.buttoninsertpreviousprefab = new System.Windows.Forms.ToolStripButton(); - this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton(); - this.thingfilters = new System.Windows.Forms.ToolStripComboBox(); - this.buttonviewnormal = new System.Windows.Forms.ToolStripButton(); - this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton(); - this.buttonviewfloors = new System.Windows.Forms.ToolStripButton(); - this.buttonviewceilings = new System.Windows.Forms.ToolStripButton(); - this.seperatorviews = new System.Windows.Forms.ToolStripSeparator(); - this.buttonsnaptogrid = new System.Windows.Forms.ToolStripButton(); - this.buttonautomerge = new System.Windows.Forms.ToolStripButton(); - this.separatorgzmodes = new System.Windows.Forms.ToolStripSeparator(); - this.buttontogglefx = new System.Windows.Forms.ToolStripButton(); - this.buttontoggledynlight = new System.Windows.Forms.ToolStripButton(); - this.buttontoggleanimatedlight = new System.Windows.Forms.ToolStripButton(); - this.buttontogglemodels = new System.Windows.Forms.ToolStripButton(); - this.buttonselectedmodelsonly = new System.Windows.Forms.ToolStripButton(); - this.buttontogglefog = new System.Windows.Forms.ToolStripButton(); - this.seperatorgeometry = new System.Windows.Forms.ToolStripSeparator(); - this.buttontest = new System.Windows.Forms.ToolStripSplitButton(); - this.seperatortesting = new System.Windows.Forms.ToolStripSeparator(); - this.statusbar = new System.Windows.Forms.StatusStrip(); - this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.configlabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.gridlabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.buttongrid = new System.Windows.Forms.ToolStripDropDownButton(); - this.itemgrid1024 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid512 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid256 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid128 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid64 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid32 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid16 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid8 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgrid4 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemgridcustom = new System.Windows.Forms.ToolStripMenuItem(); - this.zoomlabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.buttonzoom = new System.Windows.Forms.ToolStripDropDownButton(); - this.itemzoom200 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom100 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom50 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom25 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom10 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoom5 = new System.Windows.Forms.ToolStripMenuItem(); - this.itemzoomfittoscreen = new System.Windows.Forms.ToolStripMenuItem(); - this.xposlabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.yposlabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.warnsLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.panelinfo = new System.Windows.Forms.Panel(); - this.heightpanel1 = new System.Windows.Forms.Panel(); - this.vertexinfo = new CodeImp.DoomBuilder.Controls.VertexInfoPanel(); - this.labelcollapsedinfo = new System.Windows.Forms.Label(); - this.buttontoggleinfo = new System.Windows.Forms.Button(); - this.modename = new System.Windows.Forms.Label(); - this.linedefinfo = new CodeImp.DoomBuilder.Controls.LinedefInfoPanel(); - this.thinginfo = new CodeImp.DoomBuilder.Controls.ThingInfoPanel(); - this.sectorinfo = new CodeImp.DoomBuilder.Controls.SectorInfoPanel(); - this.redrawtimer = new System.Windows.Forms.Timer(this.components); - this.display = new CodeImp.DoomBuilder.Controls.RenderTargetControl(); - this.processor = new System.Windows.Forms.Timer(this.components); - this.statusflasher = new System.Windows.Forms.Timer(this.components); - this.statusresetter = new System.Windows.Forms.Timer(this.components); - this.dockersspace = new System.Windows.Forms.Panel(); - this.dockerspanel = new CodeImp.DoomBuilder.Controls.DockersControl(); - this.dockerscollapser = new System.Windows.Forms.Timer(this.components); - this.warnsTimer = new System.Windows.Forms.Timer(this.components); - toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); - toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.menumain.SuspendLayout(); - this.toolbar.SuspendLayout(); - this.statusbar.SuspendLayout(); - this.panelinfo.SuspendLayout(); - this.SuspendLayout(); - // - // toolStripSeparator1 - // - toolStripSeparator1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - toolStripSeparator1.Name = "toolStripSeparator1"; - toolStripSeparator1.Size = new System.Drawing.Size(6, 23); - // - // toolStripSeparator9 - // - toolStripSeparator9.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - toolStripSeparator9.Name = "toolStripSeparator9"; - toolStripSeparator9.Size = new System.Drawing.Size(6, 23); - // - // toolStripSeparator12 - // - toolStripSeparator12.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - toolStripSeparator12.Name = "toolStripSeparator12"; - toolStripSeparator12.Size = new System.Drawing.Size(6, 23); - // - // toolStripMenuItem4 - // - toolStripMenuItem4.Name = "toolStripMenuItem4"; - toolStripMenuItem4.Size = new System.Drawing.Size(150, 6); - // - // toolStripSeparator2 - // - toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new System.Drawing.Size(153, 6); - // - // toolStripSeparator3 - // - toolStripSeparator3.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - toolStripSeparator3.Name = "toolStripSeparator3"; - toolStripSeparator3.Size = new System.Drawing.Size(6, 23); - // - // seperatorfileopen - // - this.seperatorfileopen.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorfileopen.Name = "seperatorfileopen"; - this.seperatorfileopen.Size = new System.Drawing.Size(199, 6); - // - // seperatorfilerecent - // - this.seperatorfilerecent.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorfilerecent.Name = "seperatorfilerecent"; - this.seperatorfilerecent.Size = new System.Drawing.Size(199, 6); - // - // seperatoreditgrid - // - this.seperatoreditgrid.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatoreditgrid.Name = "seperatoreditgrid"; - this.seperatoreditgrid.Size = new System.Drawing.Size(160, 6); - // - // seperatoreditcopypaste - // - this.seperatoreditcopypaste.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatoreditcopypaste.Name = "seperatoreditcopypaste"; - this.seperatoreditcopypaste.Size = new System.Drawing.Size(160, 6); - // - // seperatorfile - // - this.seperatorfile.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorfile.Name = "seperatorfile"; - this.seperatorfile.Size = new System.Drawing.Size(6, 25); - // - // seperatorscript - // - this.seperatorscript.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorscript.Name = "seperatorscript"; - this.seperatorscript.Size = new System.Drawing.Size(6, 25); - // - // seperatorprefabs - // - this.seperatorprefabs.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorprefabs.Name = "seperatorprefabs"; - this.seperatorprefabs.Size = new System.Drawing.Size(6, 25); - // - // seperatorundo - // - this.seperatorundo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorundo.Name = "seperatorundo"; - this.seperatorundo.Size = new System.Drawing.Size(6, 25); - // - // seperatorcopypaste - // - this.seperatorcopypaste.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorcopypaste.Name = "seperatorcopypaste"; - this.seperatorcopypaste.Size = new System.Drawing.Size(6, 25); - // - // seperatormodes - // - this.seperatormodes.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatormodes.Name = "seperatormodes"; - this.seperatormodes.Size = new System.Drawing.Size(6, 25); - this.seperatormodes.Visible = false; - // - // poscommalabel - // - this.poscommalabel.Name = "poscommalabel"; - this.poscommalabel.Size = new System.Drawing.Size(11, 18); - this.poscommalabel.Text = ","; - this.poscommalabel.ToolTipText = "Current X, Y coordinates on map"; - // - // menumain - // - this.menumain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + System.Windows.Forms.ToolStripSeparator toolStripSeparator9; + System.Windows.Forms.ToolStripSeparator toolStripSeparator12; + System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; + System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.seperatorfileopen = new System.Windows.Forms.ToolStripSeparator(); + this.seperatorfilerecent = new System.Windows.Forms.ToolStripSeparator(); + this.seperatoreditgrid = new System.Windows.Forms.ToolStripSeparator(); + this.seperatoreditcopypaste = new System.Windows.Forms.ToolStripSeparator(); + this.seperatorfile = new System.Windows.Forms.ToolStripSeparator(); + this.seperatorscript = new System.Windows.Forms.ToolStripSeparator(); + this.seperatorprefabs = new System.Windows.Forms.ToolStripSeparator(); + this.seperatorundo = new System.Windows.Forms.ToolStripSeparator(); + this.seperatorcopypaste = new System.Windows.Forms.ToolStripSeparator(); + this.seperatormodes = new System.Windows.Forms.ToolStripSeparator(); + this.poscommalabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.menumain = new System.Windows.Forms.MenuStrip(); + this.menufile = new System.Windows.Forms.ToolStripMenuItem(); + this.itemnewmap = new System.Windows.Forms.ToolStripMenuItem(); + this.itemopenmap = new System.Windows.Forms.ToolStripMenuItem(); + this.itemclosemap = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsavemap = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsavemapas = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsavemapinto = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatorfilesave = new System.Windows.Forms.ToolStripSeparator(); + this.itemnorecent = new System.Windows.Forms.ToolStripMenuItem(); + this.itemexit = new System.Windows.Forms.ToolStripMenuItem(); + this.menuedit = new System.Windows.Forms.ToolStripMenuItem(); + this.itemundo = new System.Windows.Forms.ToolStripMenuItem(); + this.itemredo = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatoreditundo = new System.Windows.Forms.ToolStripSeparator(); + this.itemcut = new System.Windows.Forms.ToolStripMenuItem(); + this.itemcopy = new System.Windows.Forms.ToolStripMenuItem(); + this.itempaste = new System.Windows.Forms.ToolStripMenuItem(); + this.itempastespecial = new System.Windows.Forms.ToolStripMenuItem(); + this.itemsnaptogrid = new System.Windows.Forms.ToolStripMenuItem(); + this.itemautomerge = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatoreditgeometry = new System.Windows.Forms.ToolStripSeparator(); + this.itemgridinc = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgriddec = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgridsetup = new System.Windows.Forms.ToolStripMenuItem(); + this.itemmapoptions = new System.Windows.Forms.ToolStripMenuItem(); + this.menuview = new System.Windows.Forms.ToolStripMenuItem(); + this.itemthingsfilter = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatorviewthings = new System.Windows.Forms.ToolStripSeparator(); + this.itemviewnormal = new System.Windows.Forms.ToolStripMenuItem(); + this.itemviewbrightness = new System.Windows.Forms.ToolStripMenuItem(); + this.itemviewfloors = new System.Windows.Forms.ToolStripMenuItem(); + this.itemviewceilings = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatorviewviews = 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(); + this.item2zoom50 = new System.Windows.Forms.ToolStripMenuItem(); + this.item2zoom25 = new System.Windows.Forms.ToolStripMenuItem(); + this.item2zoom10 = new System.Windows.Forms.ToolStripMenuItem(); + this.item2zoom5 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemfittoscreen = new System.Windows.Forms.ToolStripMenuItem(); + this.itemtoggleinfo = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatorviewzoom = new System.Windows.Forms.ToolStripSeparator(); + this.itemscripteditor = new System.Windows.Forms.ToolStripMenuItem(); + this.menumode = new System.Windows.Forms.ToolStripMenuItem(); + this.separatorDrawModes = new System.Windows.Forms.ToolStripSeparator(); + this.menuprefabs = new System.Windows.Forms.ToolStripMenuItem(); + this.iteminsertprefabfile = new System.Windows.Forms.ToolStripMenuItem(); + this.iteminsertpreviousprefab = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatorprefabsinsert = new System.Windows.Forms.ToolStripSeparator(); + this.itemcreateprefab = new System.Windows.Forms.ToolStripMenuItem(); + this.menutools = new System.Windows.Forms.ToolStripMenuItem(); + this.itemreloadresources = new System.Windows.Forms.ToolStripMenuItem(); + this.itemReloadModedef = new System.Windows.Forms.ToolStripMenuItem(); + this.itemReloadGldefs = new System.Windows.Forms.ToolStripMenuItem(); + this.itemReloadMapinfo = new System.Windows.Forms.ToolStripMenuItem(); + this.itemshowerrors = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatortoolsresources = new System.Windows.Forms.ToolStripSeparator(); + this.configurationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatortoolsconfig = new System.Windows.Forms.ToolStripSeparator(); + this.itemtestmap = new System.Windows.Forms.ToolStripMenuItem(); + this.menuhelp = new System.Windows.Forms.ToolStripMenuItem(); + this.itemhelprefmanual = new System.Windows.Forms.ToolStripMenuItem(); + this.itemhelpeditmode = new System.Windows.Forms.ToolStripMenuItem(); + this.seperatorhelpmanual = new System.Windows.Forms.ToolStripSeparator(); + this.itemhelpabout = new System.Windows.Forms.ToolStripMenuItem(); + this.toolbar = new System.Windows.Forms.ToolStrip(); + this.buttonnewmap = new System.Windows.Forms.ToolStripButton(); + this.buttonopenmap = new System.Windows.Forms.ToolStripButton(); + this.buttonsavemap = new System.Windows.Forms.ToolStripButton(); + this.buttonscripteditor = new System.Windows.Forms.ToolStripButton(); + this.buttonundo = new System.Windows.Forms.ToolStripButton(); + this.buttonredo = new System.Windows.Forms.ToolStripButton(); + this.buttoncut = new System.Windows.Forms.ToolStripButton(); + this.buttoncopy = new System.Windows.Forms.ToolStripButton(); + this.buttonpaste = new System.Windows.Forms.ToolStripButton(); + this.buttoninsertprefabfile = new System.Windows.Forms.ToolStripButton(); + this.buttoninsertpreviousprefab = new System.Windows.Forms.ToolStripButton(); + this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton(); + this.thingfilters = new System.Windows.Forms.ToolStripComboBox(); + this.buttonviewnormal = new System.Windows.Forms.ToolStripButton(); + this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton(); + this.buttonviewfloors = new System.Windows.Forms.ToolStripButton(); + this.buttonviewceilings = new System.Windows.Forms.ToolStripButton(); + this.seperatorviews = new System.Windows.Forms.ToolStripSeparator(); + this.buttonsnaptogrid = new System.Windows.Forms.ToolStripButton(); + this.buttonautomerge = new System.Windows.Forms.ToolStripButton(); + this.separatorgzmodes = new System.Windows.Forms.ToolStripSeparator(); + this.buttontogglefx = new System.Windows.Forms.ToolStripButton(); + this.buttontoggledynlight = new System.Windows.Forms.ToolStripButton(); + this.buttontoggleanimatedlight = new System.Windows.Forms.ToolStripButton(); + this.buttontogglemodels = new System.Windows.Forms.ToolStripButton(); + this.buttonselectedmodelsonly = new System.Windows.Forms.ToolStripButton(); + this.buttontogglefog = new System.Windows.Forms.ToolStripButton(); + this.buttontoggleeventlines = new System.Windows.Forms.ToolStripButton(); + this.seperatorgeometry = new System.Windows.Forms.ToolStripSeparator(); + this.buttontest = new System.Windows.Forms.ToolStripSplitButton(); + this.seperatortesting = new System.Windows.Forms.ToolStripSeparator(); + this.statusbar = new System.Windows.Forms.StatusStrip(); + this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.configlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.gridlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttongrid = new System.Windows.Forms.ToolStripDropDownButton(); + this.itemgrid1024 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid512 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid256 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid128 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid64 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid32 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid16 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid8 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgrid4 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemgridcustom = new System.Windows.Forms.ToolStripMenuItem(); + this.zoomlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.buttonzoom = new System.Windows.Forms.ToolStripDropDownButton(); + this.itemzoom200 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom100 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom50 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom25 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom10 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoom5 = new System.Windows.Forms.ToolStripMenuItem(); + this.itemzoomfittoscreen = new System.Windows.Forms.ToolStripMenuItem(); + this.xposlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.yposlabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.warnsLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.panelinfo = new System.Windows.Forms.Panel(); + this.heightpanel1 = new System.Windows.Forms.Panel(); + this.vertexinfo = new CodeImp.DoomBuilder.Controls.VertexInfoPanel(); + this.labelcollapsedinfo = new System.Windows.Forms.Label(); + this.buttontoggleinfo = new System.Windows.Forms.Button(); + this.modename = new System.Windows.Forms.Label(); + this.linedefinfo = new CodeImp.DoomBuilder.Controls.LinedefInfoPanel(); + this.thinginfo = new CodeImp.DoomBuilder.Controls.ThingInfoPanel(); + this.sectorinfo = new CodeImp.DoomBuilder.Controls.SectorInfoPanel(); + this.redrawtimer = new System.Windows.Forms.Timer(this.components); + this.display = new CodeImp.DoomBuilder.Controls.RenderTargetControl(); + this.processor = new System.Windows.Forms.Timer(this.components); + this.statusflasher = new System.Windows.Forms.Timer(this.components); + this.statusresetter = new System.Windows.Forms.Timer(this.components); + this.dockersspace = new System.Windows.Forms.Panel(); + this.dockerspanel = new CodeImp.DoomBuilder.Controls.DockersControl(); + this.dockerscollapser = new System.Windows.Forms.Timer(this.components); + this.warnsTimer = new System.Windows.Forms.Timer(this.components); + toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); + toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.menumain.SuspendLayout(); + this.toolbar.SuspendLayout(); + this.statusbar.SuspendLayout(); + this.panelinfo.SuspendLayout(); + this.SuspendLayout(); + // + // toolStripSeparator1 + // + toolStripSeparator1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + toolStripSeparator1.Name = "toolStripSeparator1"; + toolStripSeparator1.Size = new System.Drawing.Size(6, 23); + // + // toolStripSeparator9 + // + toolStripSeparator9.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + toolStripSeparator9.Name = "toolStripSeparator9"; + toolStripSeparator9.Size = new System.Drawing.Size(6, 23); + // + // toolStripSeparator12 + // + toolStripSeparator12.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + toolStripSeparator12.Name = "toolStripSeparator12"; + toolStripSeparator12.Size = new System.Drawing.Size(6, 23); + // + // toolStripMenuItem4 + // + toolStripMenuItem4.Name = "toolStripMenuItem4"; + toolStripMenuItem4.Size = new System.Drawing.Size(150, 6); + // + // toolStripSeparator2 + // + toolStripSeparator2.Name = "toolStripSeparator2"; + toolStripSeparator2.Size = new System.Drawing.Size(153, 6); + // + // toolStripSeparator3 + // + toolStripSeparator3.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + toolStripSeparator3.Name = "toolStripSeparator3"; + toolStripSeparator3.Size = new System.Drawing.Size(6, 23); + // + // seperatorfileopen + // + this.seperatorfileopen.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorfileopen.Name = "seperatorfileopen"; + this.seperatorfileopen.Size = new System.Drawing.Size(199, 6); + // + // seperatorfilerecent + // + this.seperatorfilerecent.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorfilerecent.Name = "seperatorfilerecent"; + this.seperatorfilerecent.Size = new System.Drawing.Size(199, 6); + // + // seperatoreditgrid + // + this.seperatoreditgrid.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatoreditgrid.Name = "seperatoreditgrid"; + this.seperatoreditgrid.Size = new System.Drawing.Size(160, 6); + // + // seperatoreditcopypaste + // + this.seperatoreditcopypaste.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatoreditcopypaste.Name = "seperatoreditcopypaste"; + this.seperatoreditcopypaste.Size = new System.Drawing.Size(160, 6); + // + // seperatorfile + // + this.seperatorfile.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorfile.Name = "seperatorfile"; + this.seperatorfile.Size = new System.Drawing.Size(6, 25); + // + // seperatorscript + // + this.seperatorscript.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorscript.Name = "seperatorscript"; + this.seperatorscript.Size = new System.Drawing.Size(6, 25); + // + // seperatorprefabs + // + this.seperatorprefabs.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorprefabs.Name = "seperatorprefabs"; + this.seperatorprefabs.Size = new System.Drawing.Size(6, 25); + // + // seperatorundo + // + this.seperatorundo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorundo.Name = "seperatorundo"; + this.seperatorundo.Size = new System.Drawing.Size(6, 25); + // + // seperatorcopypaste + // + this.seperatorcopypaste.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorcopypaste.Name = "seperatorcopypaste"; + this.seperatorcopypaste.Size = new System.Drawing.Size(6, 25); + // + // seperatormodes + // + this.seperatormodes.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatormodes.Name = "seperatormodes"; + this.seperatormodes.Size = new System.Drawing.Size(6, 25); + this.seperatormodes.Visible = false; + // + // poscommalabel + // + this.poscommalabel.Name = "poscommalabel"; + this.poscommalabel.Size = new System.Drawing.Size(11, 18); + this.poscommalabel.Text = ","; + this.poscommalabel.ToolTipText = "Current X, Y coordinates on map"; + // + // menumain + // + this.menumain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menufile, this.menuedit, this.menuview, @@ -315,14 +316,14 @@ namespace CodeImp.DoomBuilder.Windows this.menuprefabs, this.menutools, this.menuhelp}); - this.menumain.Location = new System.Drawing.Point(0, 0); - this.menumain.Name = "menumain"; - this.menumain.Size = new System.Drawing.Size(1012, 24); - this.menumain.TabIndex = 0; - // - // menufile - // - this.menufile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menumain.Location = new System.Drawing.Point(0, 0); + this.menumain.Name = "menumain"; + this.menumain.Size = new System.Drawing.Size(1012, 24); + this.menumain.TabIndex = 0; + // + // menufile + // + this.menufile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemnewmap, this.itemopenmap, this.itemclosemap, @@ -334,85 +335,85 @@ namespace CodeImp.DoomBuilder.Windows this.itemnorecent, this.seperatorfilerecent, this.itemexit}); - this.menufile.Name = "menufile"; - this.menufile.Size = new System.Drawing.Size(37, 20); - this.menufile.Text = "&File"; - // - // itemnewmap - // - this.itemnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.File; - this.itemnewmap.Name = "itemnewmap"; - this.itemnewmap.ShortcutKeyDisplayString = ""; - this.itemnewmap.Size = new System.Drawing.Size(202, 22); - this.itemnewmap.Tag = "builder_newmap"; - this.itemnewmap.Text = "&New Map"; - this.itemnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemopenmap - // - this.itemopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; - this.itemopenmap.Name = "itemopenmap"; - this.itemopenmap.Size = new System.Drawing.Size(202, 22); - this.itemopenmap.Tag = "builder_openmap"; - this.itemopenmap.Text = "&Open Map..."; - this.itemopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemclosemap - // - this.itemclosemap.Name = "itemclosemap"; - this.itemclosemap.Size = new System.Drawing.Size(202, 22); - this.itemclosemap.Tag = "builder_closemap"; - this.itemclosemap.Text = "&Close Map"; - this.itemclosemap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemsavemap - // - this.itemsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; - this.itemsavemap.Name = "itemsavemap"; - this.itemsavemap.Size = new System.Drawing.Size(202, 22); - this.itemsavemap.Tag = "builder_savemap"; - this.itemsavemap.Text = "&Save Map"; - this.itemsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemsavemapas - // - this.itemsavemapas.Name = "itemsavemapas"; - this.itemsavemapas.Size = new System.Drawing.Size(202, 22); - this.itemsavemapas.Tag = "builder_savemapas"; - this.itemsavemapas.Text = "Save Map &As..."; - this.itemsavemapas.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemsavemapinto - // - this.itemsavemapinto.Name = "itemsavemapinto"; - this.itemsavemapinto.Size = new System.Drawing.Size(202, 22); - this.itemsavemapinto.Tag = "builder_savemapinto"; - this.itemsavemapinto.Text = "Save Map &Into..."; - this.itemsavemapinto.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorfilesave - // - this.seperatorfilesave.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorfilesave.Name = "seperatorfilesave"; - this.seperatorfilesave.Size = new System.Drawing.Size(199, 6); - // - // itemnorecent - // - this.itemnorecent.Enabled = false; - this.itemnorecent.Name = "itemnorecent"; - this.itemnorecent.Size = new System.Drawing.Size(202, 22); - this.itemnorecent.Text = "No recently opened files"; - // - // itemexit - // - this.itemexit.Name = "itemexit"; - this.itemexit.Size = new System.Drawing.Size(202, 22); - this.itemexit.Text = "E&xit"; - this.itemexit.Click += new System.EventHandler(this.itemexit_Click); - // - // menuedit - // - this.menuedit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menufile.Name = "menufile"; + this.menufile.Size = new System.Drawing.Size(37, 20); + this.menufile.Text = "&File"; + // + // itemnewmap + // + this.itemnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.File; + this.itemnewmap.Name = "itemnewmap"; + this.itemnewmap.ShortcutKeyDisplayString = ""; + this.itemnewmap.Size = new System.Drawing.Size(202, 22); + this.itemnewmap.Tag = "builder_newmap"; + this.itemnewmap.Text = "&New Map"; + this.itemnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemopenmap + // + this.itemopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; + this.itemopenmap.Name = "itemopenmap"; + this.itemopenmap.Size = new System.Drawing.Size(202, 22); + this.itemopenmap.Tag = "builder_openmap"; + this.itemopenmap.Text = "&Open Map..."; + this.itemopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemclosemap + // + this.itemclosemap.Name = "itemclosemap"; + this.itemclosemap.Size = new System.Drawing.Size(202, 22); + this.itemclosemap.Tag = "builder_closemap"; + this.itemclosemap.Text = "&Close Map"; + this.itemclosemap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemsavemap + // + this.itemsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; + this.itemsavemap.Name = "itemsavemap"; + this.itemsavemap.Size = new System.Drawing.Size(202, 22); + this.itemsavemap.Tag = "builder_savemap"; + this.itemsavemap.Text = "&Save Map"; + this.itemsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemsavemapas + // + this.itemsavemapas.Name = "itemsavemapas"; + this.itemsavemapas.Size = new System.Drawing.Size(202, 22); + this.itemsavemapas.Tag = "builder_savemapas"; + this.itemsavemapas.Text = "Save Map &As..."; + this.itemsavemapas.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemsavemapinto + // + this.itemsavemapinto.Name = "itemsavemapinto"; + this.itemsavemapinto.Size = new System.Drawing.Size(202, 22); + this.itemsavemapinto.Tag = "builder_savemapinto"; + this.itemsavemapinto.Text = "Save Map &Into..."; + this.itemsavemapinto.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorfilesave + // + this.seperatorfilesave.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorfilesave.Name = "seperatorfilesave"; + this.seperatorfilesave.Size = new System.Drawing.Size(199, 6); + // + // itemnorecent + // + this.itemnorecent.Enabled = false; + this.itemnorecent.Name = "itemnorecent"; + this.itemnorecent.Size = new System.Drawing.Size(202, 22); + this.itemnorecent.Text = "No recently opened files"; + // + // itemexit + // + this.itemexit.Name = "itemexit"; + this.itemexit.Size = new System.Drawing.Size(202, 22); + this.itemexit.Text = "E&xit"; + this.itemexit.Click += new System.EventHandler(this.itemexit_Click); + // + // menuedit + // + this.menuedit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemundo, this.itemredo, this.seperatoreditundo, @@ -429,135 +430,135 @@ namespace CodeImp.DoomBuilder.Windows this.itemgridsetup, this.seperatoreditgrid, this.itemmapoptions}); - this.menuedit.Name = "menuedit"; - this.menuedit.Size = new System.Drawing.Size(39, 20); - this.menuedit.Text = "&Edit"; - // - // itemundo - // - this.itemundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; - this.itemundo.Name = "itemundo"; - this.itemundo.Size = new System.Drawing.Size(163, 22); - this.itemundo.Tag = "builder_undo"; - this.itemundo.Text = "&Undo"; - this.itemundo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemredo - // - this.itemredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; - this.itemredo.Name = "itemredo"; - this.itemredo.Size = new System.Drawing.Size(163, 22); - this.itemredo.Tag = "builder_redo"; - this.itemredo.Text = "&Redo"; - this.itemredo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatoreditundo - // - this.seperatoreditundo.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatoreditundo.Name = "seperatoreditundo"; - this.seperatoreditundo.Size = new System.Drawing.Size(160, 6); - // - // itemcut - // - this.itemcut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; - this.itemcut.Name = "itemcut"; - this.itemcut.Size = new System.Drawing.Size(163, 22); - this.itemcut.Tag = "builder_cutselection"; - this.itemcut.Text = "Cu&t"; - this.itemcut.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemcopy - // - this.itemcopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; - this.itemcopy.Name = "itemcopy"; - this.itemcopy.Size = new System.Drawing.Size(163, 22); - this.itemcopy.Tag = "builder_copyselection"; - this.itemcopy.Text = "&Copy"; - this.itemcopy.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itempaste - // - this.itempaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; - this.itempaste.Name = "itempaste"; - this.itempaste.Size = new System.Drawing.Size(163, 22); - this.itempaste.Tag = "builder_pasteselection"; - this.itempaste.Text = "&Paste"; - this.itempaste.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itempastespecial - // - this.itempastespecial.Image = global::CodeImp.DoomBuilder.Properties.Resources.PasteSpecial; - this.itempastespecial.Name = "itempastespecial"; - this.itempastespecial.Size = new System.Drawing.Size(163, 22); - this.itempastespecial.Tag = "builder_pasteselectionspecial"; - this.itempastespecial.Text = "Paste Special..."; - this.itempastespecial.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemsnaptogrid - // - this.itemsnaptogrid.Checked = true; - this.itemsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; - this.itemsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; - this.itemsnaptogrid.Name = "itemsnaptogrid"; - this.itemsnaptogrid.Size = new System.Drawing.Size(163, 22); - this.itemsnaptogrid.Tag = "builder_togglesnap"; - this.itemsnaptogrid.Text = "&Snap to Grid"; - this.itemsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemautomerge - // - this.itemautomerge.Checked = true; - this.itemautomerge.CheckState = System.Windows.Forms.CheckState.Checked; - this.itemautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; - this.itemautomerge.Name = "itemautomerge"; - this.itemautomerge.Size = new System.Drawing.Size(163, 22); - this.itemautomerge.Tag = "builder_toggleautomerge"; - this.itemautomerge.Text = "&Merge Geometry"; - this.itemautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatoreditgeometry - // - this.seperatoreditgeometry.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatoreditgeometry.Name = "seperatoreditgeometry"; - this.seperatoreditgeometry.Size = new System.Drawing.Size(160, 6); - // - // itemgridinc - // - this.itemgridinc.Name = "itemgridinc"; - this.itemgridinc.Size = new System.Drawing.Size(163, 22); - this.itemgridinc.Tag = "builder_griddec"; - this.itemgridinc.Text = "&Increase Grid"; - this.itemgridinc.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemgriddec - // - this.itemgriddec.Name = "itemgriddec"; - this.itemgriddec.Size = new System.Drawing.Size(163, 22); - this.itemgriddec.Tag = "builder_gridinc"; - this.itemgriddec.Text = "&Decrease Grid"; - this.itemgriddec.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemgridsetup - // - this.itemgridsetup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2; - this.itemgridsetup.Name = "itemgridsetup"; - this.itemgridsetup.Size = new System.Drawing.Size(163, 22); - this.itemgridsetup.Tag = "builder_gridsetup"; - this.itemgridsetup.Text = "&Grid Setup..."; - this.itemgridsetup.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemmapoptions - // - this.itemmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties; - this.itemmapoptions.Name = "itemmapoptions"; - this.itemmapoptions.Size = new System.Drawing.Size(163, 22); - this.itemmapoptions.Tag = "builder_mapoptions"; - this.itemmapoptions.Text = "Map &Options...."; - this.itemmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // menuview - // - this.menuview.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuedit.Name = "menuedit"; + this.menuedit.Size = new System.Drawing.Size(39, 20); + this.menuedit.Text = "&Edit"; + // + // itemundo + // + this.itemundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; + this.itemundo.Name = "itemundo"; + this.itemundo.Size = new System.Drawing.Size(163, 22); + this.itemundo.Tag = "builder_undo"; + this.itemundo.Text = "&Undo"; + this.itemundo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemredo + // + this.itemredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; + this.itemredo.Name = "itemredo"; + this.itemredo.Size = new System.Drawing.Size(163, 22); + this.itemredo.Tag = "builder_redo"; + this.itemredo.Text = "&Redo"; + this.itemredo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatoreditundo + // + this.seperatoreditundo.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatoreditundo.Name = "seperatoreditundo"; + this.seperatoreditundo.Size = new System.Drawing.Size(160, 6); + // + // itemcut + // + this.itemcut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; + this.itemcut.Name = "itemcut"; + this.itemcut.Size = new System.Drawing.Size(163, 22); + this.itemcut.Tag = "builder_cutselection"; + this.itemcut.Text = "Cu&t"; + this.itemcut.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemcopy + // + this.itemcopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; + this.itemcopy.Name = "itemcopy"; + this.itemcopy.Size = new System.Drawing.Size(163, 22); + this.itemcopy.Tag = "builder_copyselection"; + this.itemcopy.Text = "&Copy"; + this.itemcopy.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itempaste + // + this.itempaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; + this.itempaste.Name = "itempaste"; + this.itempaste.Size = new System.Drawing.Size(163, 22); + this.itempaste.Tag = "builder_pasteselection"; + this.itempaste.Text = "&Paste"; + this.itempaste.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itempastespecial + // + this.itempastespecial.Image = global::CodeImp.DoomBuilder.Properties.Resources.PasteSpecial; + this.itempastespecial.Name = "itempastespecial"; + this.itempastespecial.Size = new System.Drawing.Size(163, 22); + this.itempastespecial.Tag = "builder_pasteselectionspecial"; + this.itempastespecial.Text = "Paste Special..."; + this.itempastespecial.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemsnaptogrid + // + this.itemsnaptogrid.Checked = true; + this.itemsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; + this.itemsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; + this.itemsnaptogrid.Name = "itemsnaptogrid"; + this.itemsnaptogrid.Size = new System.Drawing.Size(163, 22); + this.itemsnaptogrid.Tag = "builder_togglesnap"; + this.itemsnaptogrid.Text = "&Snap to Grid"; + this.itemsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemautomerge + // + this.itemautomerge.Checked = true; + this.itemautomerge.CheckState = System.Windows.Forms.CheckState.Checked; + this.itemautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; + this.itemautomerge.Name = "itemautomerge"; + this.itemautomerge.Size = new System.Drawing.Size(163, 22); + this.itemautomerge.Tag = "builder_toggleautomerge"; + this.itemautomerge.Text = "&Merge Geometry"; + this.itemautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatoreditgeometry + // + this.seperatoreditgeometry.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatoreditgeometry.Name = "seperatoreditgeometry"; + this.seperatoreditgeometry.Size = new System.Drawing.Size(160, 6); + // + // itemgridinc + // + this.itemgridinc.Name = "itemgridinc"; + this.itemgridinc.Size = new System.Drawing.Size(163, 22); + this.itemgridinc.Tag = "builder_griddec"; + this.itemgridinc.Text = "&Increase Grid"; + this.itemgridinc.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemgriddec + // + this.itemgriddec.Name = "itemgriddec"; + this.itemgriddec.Size = new System.Drawing.Size(163, 22); + this.itemgriddec.Tag = "builder_gridinc"; + this.itemgriddec.Text = "&Decrease Grid"; + this.itemgriddec.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemgridsetup + // + this.itemgridsetup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2; + this.itemgridsetup.Name = "itemgridsetup"; + this.itemgridsetup.Size = new System.Drawing.Size(163, 22); + this.itemgridsetup.Tag = "builder_gridsetup"; + this.itemgridsetup.Text = "&Grid Setup..."; + this.itemgridsetup.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemmapoptions + // + this.itemmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties; + this.itemmapoptions.Name = "itemmapoptions"; + this.itemmapoptions.Size = new System.Drawing.Size(163, 22); + this.itemmapoptions.Tag = "builder_mapoptions"; + this.itemmapoptions.Text = "Map &Options...."; + this.itemmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // menuview + // + this.menuview.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemthingsfilter, this.seperatorviewthings, this.itemviewnormal, @@ -570,216 +571,216 @@ namespace CodeImp.DoomBuilder.Windows this.itemtoggleinfo, this.seperatorviewzoom, this.itemscripteditor}); - this.menuview.Name = "menuview"; - this.menuview.Size = new System.Drawing.Size(44, 20); - this.menuview.Text = "&View"; - // - // itemthingsfilter - // - this.itemthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; - this.itemthingsfilter.Name = "itemthingsfilter"; - this.itemthingsfilter.Size = new System.Drawing.Size(209, 22); - this.itemthingsfilter.Tag = "builder_thingsfilterssetup"; - this.itemthingsfilter.Text = "Configure &Things Filters..."; - this.itemthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorviewthings - // - this.seperatorviewthings.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorviewthings.Name = "seperatorviewthings"; - this.seperatorviewthings.Size = new System.Drawing.Size(206, 6); - // - // itemviewnormal - // - this.itemviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal; - this.itemviewnormal.Name = "itemviewnormal"; - this.itemviewnormal.Size = new System.Drawing.Size(209, 22); - this.itemviewnormal.Tag = "builder_viewmodenormal"; - this.itemviewnormal.Text = "&Wireframe"; - this.itemviewnormal.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemviewbrightness - // - this.itemviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness; - this.itemviewbrightness.Name = "itemviewbrightness"; - this.itemviewbrightness.Size = new System.Drawing.Size(209, 22); - this.itemviewbrightness.Tag = "builder_viewmodebrightness"; - this.itemviewbrightness.Text = "&Brightness Levels"; - this.itemviewbrightness.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemviewfloors - // - this.itemviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor; - this.itemviewfloors.Name = "itemviewfloors"; - this.itemviewfloors.Size = new System.Drawing.Size(209, 22); - this.itemviewfloors.Tag = "builder_viewmodefloors"; - this.itemviewfloors.Text = "&Floor Textures"; - this.itemviewfloors.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemviewceilings - // - this.itemviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling; - this.itemviewceilings.Name = "itemviewceilings"; - this.itemviewceilings.Size = new System.Drawing.Size(209, 22); - this.itemviewceilings.Tag = "builder_viewmodeceilings"; - this.itemviewceilings.Text = "&Ceiling Textures"; - this.itemviewceilings.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorviewviews - // - this.seperatorviewviews.Name = "seperatorviewviews"; - this.seperatorviewviews.Size = new System.Drawing.Size(206, 6); - // - // menuzoom - // - this.menuzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuview.Name = "menuview"; + this.menuview.Size = new System.Drawing.Size(44, 20); + this.menuview.Text = "&View"; + // + // itemthingsfilter + // + this.itemthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; + this.itemthingsfilter.Name = "itemthingsfilter"; + this.itemthingsfilter.Size = new System.Drawing.Size(209, 22); + this.itemthingsfilter.Tag = "builder_thingsfilterssetup"; + this.itemthingsfilter.Text = "Configure &Things Filters..."; + this.itemthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorviewthings + // + this.seperatorviewthings.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorviewthings.Name = "seperatorviewthings"; + this.seperatorviewthings.Size = new System.Drawing.Size(206, 6); + // + // itemviewnormal + // + this.itemviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal; + this.itemviewnormal.Name = "itemviewnormal"; + this.itemviewnormal.Size = new System.Drawing.Size(209, 22); + this.itemviewnormal.Tag = "builder_viewmodenormal"; + this.itemviewnormal.Text = "&Wireframe"; + this.itemviewnormal.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemviewbrightness + // + this.itemviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness; + this.itemviewbrightness.Name = "itemviewbrightness"; + this.itemviewbrightness.Size = new System.Drawing.Size(209, 22); + this.itemviewbrightness.Tag = "builder_viewmodebrightness"; + this.itemviewbrightness.Text = "&Brightness Levels"; + this.itemviewbrightness.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemviewfloors + // + this.itemviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor; + this.itemviewfloors.Name = "itemviewfloors"; + this.itemviewfloors.Size = new System.Drawing.Size(209, 22); + this.itemviewfloors.Tag = "builder_viewmodefloors"; + this.itemviewfloors.Text = "&Floor Textures"; + this.itemviewfloors.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemviewceilings + // + this.itemviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling; + this.itemviewceilings.Name = "itemviewceilings"; + this.itemviewceilings.Size = new System.Drawing.Size(209, 22); + this.itemviewceilings.Tag = "builder_viewmodeceilings"; + this.itemviewceilings.Text = "&Ceiling Textures"; + this.itemviewceilings.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorviewviews + // + this.seperatorviewviews.Name = "seperatorviewviews"; + this.seperatorviewviews.Size = new System.Drawing.Size(206, 6); + // + // menuzoom + // + this.menuzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.item2zoom200, this.item2zoom100, this.item2zoom50, this.item2zoom25, this.item2zoom10, this.item2zoom5}); - this.menuzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom; - this.menuzoom.Name = "menuzoom"; - this.menuzoom.Size = new System.Drawing.Size(209, 22); - this.menuzoom.Text = "&Zoom"; - // - // item2zoom200 - // - this.item2zoom200.Name = "item2zoom200"; - this.item2zoom200.Size = new System.Drawing.Size(102, 22); - this.item2zoom200.Tag = "200"; - this.item2zoom200.Text = "200%"; - this.item2zoom200.Click += new System.EventHandler(this.itemzoomto_Click); - // - // item2zoom100 - // - this.item2zoom100.Name = "item2zoom100"; - this.item2zoom100.Size = new System.Drawing.Size(102, 22); - this.item2zoom100.Tag = "100"; - this.item2zoom100.Text = "100%"; - this.item2zoom100.Click += new System.EventHandler(this.itemzoomto_Click); - // - // item2zoom50 - // - this.item2zoom50.Name = "item2zoom50"; - this.item2zoom50.Size = new System.Drawing.Size(102, 22); - this.item2zoom50.Tag = "50"; - this.item2zoom50.Text = "50%"; - this.item2zoom50.Click += new System.EventHandler(this.itemzoomto_Click); - // - // item2zoom25 - // - this.item2zoom25.Name = "item2zoom25"; - this.item2zoom25.Size = new System.Drawing.Size(102, 22); - this.item2zoom25.Tag = "25"; - this.item2zoom25.Text = "25%"; - this.item2zoom25.Click += new System.EventHandler(this.itemzoomto_Click); - // - // item2zoom10 - // - this.item2zoom10.Name = "item2zoom10"; - this.item2zoom10.Size = new System.Drawing.Size(102, 22); - this.item2zoom10.Tag = "10"; - this.item2zoom10.Text = "10%"; - this.item2zoom10.Click += new System.EventHandler(this.itemzoomto_Click); - // - // item2zoom5 - // - this.item2zoom5.Name = "item2zoom5"; - this.item2zoom5.Size = new System.Drawing.Size(102, 22); - this.item2zoom5.Tag = "5"; - this.item2zoom5.Text = "5%"; - this.item2zoom5.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemfittoscreen - // - this.itemfittoscreen.Name = "itemfittoscreen"; - this.itemfittoscreen.Size = new System.Drawing.Size(209, 22); - this.itemfittoscreen.Tag = "builder_centerinscreen"; - this.itemfittoscreen.Text = "Fit to screen"; - this.itemfittoscreen.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemtoggleinfo - // - this.itemtoggleinfo.Name = "itemtoggleinfo"; - this.itemtoggleinfo.Size = new System.Drawing.Size(209, 22); - this.itemtoggleinfo.Tag = "builder_toggleinfopanel"; - this.itemtoggleinfo.Text = "&Expanded Info Panel"; - this.itemtoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorviewzoom - // - this.seperatorviewzoom.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorviewzoom.Name = "seperatorviewzoom"; - this.seperatorviewzoom.Size = new System.Drawing.Size(206, 6); - // - // itemscripteditor - // - this.itemscripteditor.Image = global::CodeImp.DoomBuilder.Properties.Resources.Script2; - this.itemscripteditor.Name = "itemscripteditor"; - this.itemscripteditor.Size = new System.Drawing.Size(209, 22); - this.itemscripteditor.Tag = "builder_openscripteditor"; - this.itemscripteditor.Text = "&Script Editor..."; - this.itemscripteditor.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // menumode - // - this.menumode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom; + this.menuzoom.Name = "menuzoom"; + this.menuzoom.Size = new System.Drawing.Size(209, 22); + this.menuzoom.Text = "&Zoom"; + // + // item2zoom200 + // + this.item2zoom200.Name = "item2zoom200"; + this.item2zoom200.Size = new System.Drawing.Size(102, 22); + this.item2zoom200.Tag = "200"; + this.item2zoom200.Text = "200%"; + this.item2zoom200.Click += new System.EventHandler(this.itemzoomto_Click); + // + // item2zoom100 + // + this.item2zoom100.Name = "item2zoom100"; + this.item2zoom100.Size = new System.Drawing.Size(102, 22); + this.item2zoom100.Tag = "100"; + this.item2zoom100.Text = "100%"; + this.item2zoom100.Click += new System.EventHandler(this.itemzoomto_Click); + // + // item2zoom50 + // + this.item2zoom50.Name = "item2zoom50"; + this.item2zoom50.Size = new System.Drawing.Size(102, 22); + this.item2zoom50.Tag = "50"; + this.item2zoom50.Text = "50%"; + this.item2zoom50.Click += new System.EventHandler(this.itemzoomto_Click); + // + // item2zoom25 + // + this.item2zoom25.Name = "item2zoom25"; + this.item2zoom25.Size = new System.Drawing.Size(102, 22); + this.item2zoom25.Tag = "25"; + this.item2zoom25.Text = "25%"; + this.item2zoom25.Click += new System.EventHandler(this.itemzoomto_Click); + // + // item2zoom10 + // + this.item2zoom10.Name = "item2zoom10"; + this.item2zoom10.Size = new System.Drawing.Size(102, 22); + this.item2zoom10.Tag = "10"; + this.item2zoom10.Text = "10%"; + this.item2zoom10.Click += new System.EventHandler(this.itemzoomto_Click); + // + // item2zoom5 + // + this.item2zoom5.Name = "item2zoom5"; + this.item2zoom5.Size = new System.Drawing.Size(102, 22); + this.item2zoom5.Tag = "5"; + this.item2zoom5.Text = "5%"; + this.item2zoom5.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemfittoscreen + // + this.itemfittoscreen.Name = "itemfittoscreen"; + this.itemfittoscreen.Size = new System.Drawing.Size(209, 22); + this.itemfittoscreen.Tag = "builder_centerinscreen"; + this.itemfittoscreen.Text = "Fit to screen"; + this.itemfittoscreen.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemtoggleinfo + // + this.itemtoggleinfo.Name = "itemtoggleinfo"; + this.itemtoggleinfo.Size = new System.Drawing.Size(209, 22); + this.itemtoggleinfo.Tag = "builder_toggleinfopanel"; + this.itemtoggleinfo.Text = "&Expanded Info Panel"; + this.itemtoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorviewzoom + // + this.seperatorviewzoom.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorviewzoom.Name = "seperatorviewzoom"; + this.seperatorviewzoom.Size = new System.Drawing.Size(206, 6); + // + // itemscripteditor + // + this.itemscripteditor.Image = global::CodeImp.DoomBuilder.Properties.Resources.Script2; + this.itemscripteditor.Name = "itemscripteditor"; + this.itemscripteditor.Size = new System.Drawing.Size(209, 22); + this.itemscripteditor.Tag = "builder_openscripteditor"; + this.itemscripteditor.Text = "&Script Editor..."; + this.itemscripteditor.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // menumode + // + this.menumode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.separatorDrawModes}); - this.menumode.Name = "menumode"; - this.menumode.Size = new System.Drawing.Size(50, 20); - this.menumode.Text = "&Mode"; - // - // separatorDrawModes - // - this.separatorDrawModes.Name = "separatorDrawModes"; - this.separatorDrawModes.Size = new System.Drawing.Size(57, 6); - // - // menuprefabs - // - this.menuprefabs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menumode.Name = "menumode"; + this.menumode.Size = new System.Drawing.Size(50, 20); + this.menumode.Text = "&Mode"; + // + // separatorDrawModes + // + this.separatorDrawModes.Name = "separatorDrawModes"; + this.separatorDrawModes.Size = new System.Drawing.Size(57, 6); + // + // menuprefabs + // + this.menuprefabs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.iteminsertprefabfile, this.iteminsertpreviousprefab, this.seperatorprefabsinsert, this.itemcreateprefab}); - this.menuprefabs.Name = "menuprefabs"; - this.menuprefabs.Size = new System.Drawing.Size(58, 20); - this.menuprefabs.Text = "&Prefabs"; - // - // iteminsertprefabfile - // - this.iteminsertprefabfile.Name = "iteminsertprefabfile"; - this.iteminsertprefabfile.Size = new System.Drawing.Size(199, 22); - this.iteminsertprefabfile.Tag = "builder_insertprefabfile"; - this.iteminsertprefabfile.Text = "&Insert Prefab from File..."; - this.iteminsertprefabfile.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // iteminsertpreviousprefab - // - this.iteminsertpreviousprefab.Name = "iteminsertpreviousprefab"; - this.iteminsertpreviousprefab.Size = new System.Drawing.Size(199, 22); - this.iteminsertpreviousprefab.Tag = "builder_insertpreviousprefab"; - this.iteminsertpreviousprefab.Text = "Insert &Previous Prefab"; - this.iteminsertpreviousprefab.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorprefabsinsert - // - this.seperatorprefabsinsert.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorprefabsinsert.Name = "seperatorprefabsinsert"; - this.seperatorprefabsinsert.Size = new System.Drawing.Size(196, 6); - // - // itemcreateprefab - // - this.itemcreateprefab.Name = "itemcreateprefab"; - this.itemcreateprefab.Size = new System.Drawing.Size(199, 22); - this.itemcreateprefab.Tag = "builder_createprefab"; - this.itemcreateprefab.Text = "&Create From Selection..."; - this.itemcreateprefab.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // menutools - // - this.menutools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuprefabs.Name = "menuprefabs"; + this.menuprefabs.Size = new System.Drawing.Size(58, 20); + this.menuprefabs.Text = "&Prefabs"; + // + // iteminsertprefabfile + // + this.iteminsertprefabfile.Name = "iteminsertprefabfile"; + this.iteminsertprefabfile.Size = new System.Drawing.Size(199, 22); + this.iteminsertprefabfile.Tag = "builder_insertprefabfile"; + this.iteminsertprefabfile.Text = "&Insert Prefab from File..."; + this.iteminsertprefabfile.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // iteminsertpreviousprefab + // + this.iteminsertpreviousprefab.Name = "iteminsertpreviousprefab"; + this.iteminsertpreviousprefab.Size = new System.Drawing.Size(199, 22); + this.iteminsertpreviousprefab.Tag = "builder_insertpreviousprefab"; + this.iteminsertpreviousprefab.Text = "Insert &Previous Prefab"; + this.iteminsertpreviousprefab.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorprefabsinsert + // + this.seperatorprefabsinsert.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorprefabsinsert.Name = "seperatorprefabsinsert"; + this.seperatorprefabsinsert.Size = new System.Drawing.Size(196, 6); + // + // itemcreateprefab + // + this.itemcreateprefab.Name = "itemcreateprefab"; + this.itemcreateprefab.Size = new System.Drawing.Size(199, 22); + this.itemcreateprefab.Tag = "builder_createprefab"; + this.itemcreateprefab.Text = "&Create From Selection..."; + this.itemcreateprefab.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // menutools + // + this.menutools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemreloadresources, this.itemReloadModedef, this.itemReloadGldefs, @@ -790,133 +791,133 @@ namespace CodeImp.DoomBuilder.Windows this.preferencesToolStripMenuItem, this.seperatortoolsconfig, this.itemtestmap}); - this.menutools.Name = "menutools"; - this.menutools.Size = new System.Drawing.Size(48, 20); - this.menutools.Text = "&Tools"; - // - // itemreloadresources - // - this.itemreloadresources.Name = "itemreloadresources"; - this.itemreloadresources.Size = new System.Drawing.Size(196, 22); - this.itemreloadresources.Tag = "builder_reloadresources"; - this.itemreloadresources.Text = "&Reload Resources"; - this.itemreloadresources.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemReloadModedef - // - this.itemReloadModedef.Name = "itemReloadModedef"; - this.itemReloadModedef.Size = new System.Drawing.Size(196, 22); - this.itemReloadModedef.Tag = "builder_gzreloadmodeldef"; - this.itemReloadModedef.Text = "Reload MODELDEF"; - this.itemReloadModedef.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemReloadGldefs - // - this.itemReloadGldefs.Name = "itemReloadGldefs"; - this.itemReloadGldefs.Size = new System.Drawing.Size(196, 22); - this.itemReloadGldefs.Tag = "builder_gzreloadgldefs"; - this.itemReloadGldefs.Text = "Reload GLDEFS"; - this.itemReloadGldefs.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemReloadMapinfo - // - this.itemReloadMapinfo.Name = "itemReloadMapinfo"; - this.itemReloadMapinfo.Size = new System.Drawing.Size(196, 22); - this.itemReloadMapinfo.Tag = "builder_gzreloadmapinfo"; - this.itemReloadMapinfo.Text = "Reload (Z)MAPINFO"; - this.itemReloadMapinfo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // itemshowerrors - // - this.itemshowerrors.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning; - this.itemshowerrors.Name = "itemshowerrors"; - this.itemshowerrors.Size = new System.Drawing.Size(196, 22); - this.itemshowerrors.Tag = "builder_showerrors"; - this.itemshowerrors.Text = "&Errors and Warnings..."; - this.itemshowerrors.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatortoolsresources - // - this.seperatortoolsresources.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatortoolsresources.Name = "seperatortoolsresources"; - this.seperatortoolsresources.Size = new System.Drawing.Size(193, 6); - // - // configurationToolStripMenuItem - // - this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem"; - this.configurationToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.configurationToolStripMenuItem.Tag = "builder_configuration"; - this.configurationToolStripMenuItem.Text = "&Game Configurations..."; - this.configurationToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // preferencesToolStripMenuItem - // - this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; - this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.preferencesToolStripMenuItem.Tag = "builder_preferences"; - this.preferencesToolStripMenuItem.Text = "Preferences..."; - this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatortoolsconfig - // - this.seperatortoolsconfig.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatortoolsconfig.Name = "seperatortoolsconfig"; - this.seperatortoolsconfig.Size = new System.Drawing.Size(193, 6); - // - // itemtestmap - // - this.itemtestmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; - this.itemtestmap.Name = "itemtestmap"; - this.itemtestmap.Size = new System.Drawing.Size(196, 22); - this.itemtestmap.Tag = "builder_testmap"; - this.itemtestmap.Text = "&Test Map"; - this.itemtestmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // menuhelp - // - this.menuhelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menutools.Name = "menutools"; + this.menutools.Size = new System.Drawing.Size(48, 20); + this.menutools.Text = "&Tools"; + // + // itemreloadresources + // + this.itemreloadresources.Name = "itemreloadresources"; + this.itemreloadresources.Size = new System.Drawing.Size(196, 22); + this.itemreloadresources.Tag = "builder_reloadresources"; + this.itemreloadresources.Text = "&Reload Resources"; + this.itemreloadresources.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemReloadModedef + // + this.itemReloadModedef.Name = "itemReloadModedef"; + this.itemReloadModedef.Size = new System.Drawing.Size(196, 22); + this.itemReloadModedef.Tag = "builder_gzreloadmodeldef"; + this.itemReloadModedef.Text = "Reload MODELDEF"; + this.itemReloadModedef.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemReloadGldefs + // + this.itemReloadGldefs.Name = "itemReloadGldefs"; + this.itemReloadGldefs.Size = new System.Drawing.Size(196, 22); + this.itemReloadGldefs.Tag = "builder_gzreloadgldefs"; + this.itemReloadGldefs.Text = "Reload GLDEFS"; + this.itemReloadGldefs.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemReloadMapinfo + // + this.itemReloadMapinfo.Name = "itemReloadMapinfo"; + this.itemReloadMapinfo.Size = new System.Drawing.Size(196, 22); + this.itemReloadMapinfo.Tag = "builder_gzreloadmapinfo"; + this.itemReloadMapinfo.Text = "Reload (Z)MAPINFO"; + this.itemReloadMapinfo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // itemshowerrors + // + this.itemshowerrors.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning; + this.itemshowerrors.Name = "itemshowerrors"; + this.itemshowerrors.Size = new System.Drawing.Size(196, 22); + this.itemshowerrors.Tag = "builder_showerrors"; + this.itemshowerrors.Text = "&Errors and Warnings..."; + this.itemshowerrors.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatortoolsresources + // + this.seperatortoolsresources.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatortoolsresources.Name = "seperatortoolsresources"; + this.seperatortoolsresources.Size = new System.Drawing.Size(193, 6); + // + // configurationToolStripMenuItem + // + this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem"; + this.configurationToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.configurationToolStripMenuItem.Tag = "builder_configuration"; + this.configurationToolStripMenuItem.Text = "&Game Configurations..."; + this.configurationToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // preferencesToolStripMenuItem + // + this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; + this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.preferencesToolStripMenuItem.Tag = "builder_preferences"; + this.preferencesToolStripMenuItem.Text = "Preferences..."; + this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatortoolsconfig + // + this.seperatortoolsconfig.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatortoolsconfig.Name = "seperatortoolsconfig"; + this.seperatortoolsconfig.Size = new System.Drawing.Size(193, 6); + // + // itemtestmap + // + this.itemtestmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; + this.itemtestmap.Name = "itemtestmap"; + this.itemtestmap.Size = new System.Drawing.Size(196, 22); + this.itemtestmap.Tag = "builder_testmap"; + this.itemtestmap.Text = "&Test Map"; + this.itemtestmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // menuhelp + // + this.menuhelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemhelprefmanual, this.itemhelpeditmode, this.seperatorhelpmanual, this.itemhelpabout}); - this.menuhelp.Name = "menuhelp"; - this.menuhelp.Size = new System.Drawing.Size(44, 20); - this.menuhelp.Text = "&Help"; - // - // itemhelprefmanual - // - this.itemhelprefmanual.Image = global::CodeImp.DoomBuilder.Properties.Resources.Help; - this.itemhelprefmanual.Name = "itemhelprefmanual"; - this.itemhelprefmanual.Size = new System.Drawing.Size(203, 22); - this.itemhelprefmanual.Text = "Reference &Manual"; - this.itemhelprefmanual.Click += new System.EventHandler(this.itemhelprefmanual_Click); - // - // itemhelpeditmode - // - this.itemhelpeditmode.Image = global::CodeImp.DoomBuilder.Properties.Resources.Question; - this.itemhelpeditmode.Name = "itemhelpeditmode"; - this.itemhelpeditmode.Size = new System.Drawing.Size(203, 22); - this.itemhelpeditmode.Text = "About this &Editing Mode"; - this.itemhelpeditmode.Click += new System.EventHandler(this.itemhelpeditmode_Click); - // - // seperatorhelpmanual - // - this.seperatorhelpmanual.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.seperatorhelpmanual.Name = "seperatorhelpmanual"; - this.seperatorhelpmanual.Size = new System.Drawing.Size(200, 6); - // - // itemhelpabout - // - this.itemhelpabout.Name = "itemhelpabout"; - this.itemhelpabout.Size = new System.Drawing.Size(203, 22); - this.itemhelpabout.Text = "&About Doom Builder..."; - this.itemhelpabout.Click += new System.EventHandler(this.itemhelpabout_Click); - // - // toolbar - // - this.toolbar.AutoSize = false; - this.toolbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuhelp.Name = "menuhelp"; + this.menuhelp.Size = new System.Drawing.Size(44, 20); + this.menuhelp.Text = "&Help"; + // + // itemhelprefmanual + // + this.itemhelprefmanual.Image = global::CodeImp.DoomBuilder.Properties.Resources.Help; + this.itemhelprefmanual.Name = "itemhelprefmanual"; + this.itemhelprefmanual.Size = new System.Drawing.Size(203, 22); + this.itemhelprefmanual.Text = "Reference &Manual"; + this.itemhelprefmanual.Click += new System.EventHandler(this.itemhelprefmanual_Click); + // + // itemhelpeditmode + // + this.itemhelpeditmode.Image = global::CodeImp.DoomBuilder.Properties.Resources.Question; + this.itemhelpeditmode.Name = "itemhelpeditmode"; + this.itemhelpeditmode.Size = new System.Drawing.Size(203, 22); + this.itemhelpeditmode.Text = "About this &Editing Mode"; + this.itemhelpeditmode.Click += new System.EventHandler(this.itemhelpeditmode_Click); + // + // seperatorhelpmanual + // + this.seperatorhelpmanual.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.seperatorhelpmanual.Name = "seperatorhelpmanual"; + this.seperatorhelpmanual.Size = new System.Drawing.Size(200, 6); + // + // itemhelpabout + // + this.itemhelpabout.Name = "itemhelpabout"; + this.itemhelpabout.Size = new System.Drawing.Size(203, 22); + this.itemhelpabout.Text = "&About Doom Builder..."; + this.itemhelpabout.Click += new System.EventHandler(this.itemhelpabout_Click); + // + // toolbar + // + this.toolbar.AutoSize = false; + this.toolbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buttonnewmap, this.buttonopenmap, this.buttonsavemap, @@ -950,355 +951,368 @@ namespace CodeImp.DoomBuilder.Windows this.buttontogglemodels, this.buttonselectedmodelsonly, this.buttontogglefog, + this.buttontoggleeventlines, this.seperatorgeometry, this.buttontest, this.seperatortesting}); - this.toolbar.Location = new System.Drawing.Point(0, 24); - this.toolbar.Name = "toolbar"; - this.toolbar.Size = new System.Drawing.Size(1012, 25); - this.toolbar.TabIndex = 1; - // - // buttonnewmap - // - this.buttonnewmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap; - this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonnewmap.Margin = new System.Windows.Forms.Padding(6, 1, 0, 2); - this.buttonnewmap.Name = "buttonnewmap"; - this.buttonnewmap.Size = new System.Drawing.Size(23, 22); - this.buttonnewmap.Tag = "builder_newmap"; - this.buttonnewmap.Text = "New Map"; - this.buttonnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonopenmap - // - this.buttonopenmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; - this.buttonopenmap.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonopenmap.Name = "buttonopenmap"; - this.buttonopenmap.Size = new System.Drawing.Size(23, 22); - this.buttonopenmap.Tag = "builder_openmap"; - this.buttonopenmap.Text = "Open Map"; - this.buttonopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonsavemap - // - this.buttonsavemap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; - this.buttonsavemap.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonsavemap.Name = "buttonsavemap"; - this.buttonsavemap.Size = new System.Drawing.Size(23, 22); - this.buttonsavemap.Tag = "builder_savemap"; - this.buttonsavemap.Text = "Save Map"; - this.buttonsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonscripteditor - // - this.buttonscripteditor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonscripteditor.Image = global::CodeImp.DoomBuilder.Properties.Resources.Script2; - this.buttonscripteditor.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonscripteditor.Name = "buttonscripteditor"; - this.buttonscripteditor.Size = new System.Drawing.Size(23, 22); - this.buttonscripteditor.Tag = "builder_openscripteditor"; - this.buttonscripteditor.Text = "Open Script Editor"; - this.buttonscripteditor.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonundo - // - this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; - this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonundo.Name = "buttonundo"; - this.buttonundo.Size = new System.Drawing.Size(23, 22); - this.buttonundo.Tag = "builder_undo"; - this.buttonundo.Text = "Undo"; - this.buttonundo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonredo - // - this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; - this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonredo.Name = "buttonredo"; - this.buttonredo.Size = new System.Drawing.Size(23, 22); - this.buttonredo.Tag = "builder_redo"; - this.buttonredo.Text = "Redo"; - this.buttonredo.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttoncut - // - this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; - this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttoncut.Name = "buttoncut"; - this.buttoncut.Size = new System.Drawing.Size(23, 22); - this.buttoncut.Tag = "builder_cutselection"; - this.buttoncut.Text = "Cut Selection"; - this.buttoncut.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttoncopy - // - this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; - this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttoncopy.Name = "buttoncopy"; - this.buttoncopy.Size = new System.Drawing.Size(23, 22); - this.buttoncopy.Tag = "builder_copyselection"; - this.buttoncopy.Text = "Copy Selection"; - this.buttoncopy.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonpaste - // - this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; - this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonpaste.Name = "buttonpaste"; - this.buttonpaste.Size = new System.Drawing.Size(23, 22); - this.buttonpaste.Tag = "builder_pasteselection"; - this.buttonpaste.Text = "Paste Selection"; - this.buttonpaste.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttoninsertprefabfile - // - this.buttoninsertprefabfile.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttoninsertprefabfile.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab; - this.buttoninsertprefabfile.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttoninsertprefabfile.Name = "buttoninsertprefabfile"; - this.buttoninsertprefabfile.Size = new System.Drawing.Size(23, 22); - this.buttoninsertprefabfile.Tag = "builder_insertprefabfile"; - this.buttoninsertprefabfile.Text = "Insert Prefab from File"; - this.buttoninsertprefabfile.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttoninsertpreviousprefab - // - this.buttoninsertpreviousprefab.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttoninsertpreviousprefab.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab2; - this.buttoninsertpreviousprefab.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttoninsertpreviousprefab.Name = "buttoninsertpreviousprefab"; - this.buttoninsertpreviousprefab.Size = new System.Drawing.Size(23, 22); - this.buttoninsertpreviousprefab.Tag = "builder_insertpreviousprefab"; - this.buttoninsertpreviousprefab.Text = "Insert Previous Prefab"; - this.buttoninsertpreviousprefab.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonthingsfilter - // - this.buttonthingsfilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonthingsfilter.Enabled = false; - this.buttonthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; - this.buttonthingsfilter.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonthingsfilter.Name = "buttonthingsfilter"; - this.buttonthingsfilter.Size = new System.Drawing.Size(23, 22); - this.buttonthingsfilter.Tag = "builder_thingsfilterssetup"; - this.buttonthingsfilter.Text = "Configure Things Filters"; - this.buttonthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // thingfilters - // - this.thingfilters.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.thingfilters.Enabled = false; - this.thingfilters.Items.AddRange(new object[] { + this.toolbar.Location = new System.Drawing.Point(0, 24); + this.toolbar.Name = "toolbar"; + this.toolbar.Size = new System.Drawing.Size(1012, 25); + this.toolbar.TabIndex = 1; + // + // buttonnewmap + // + this.buttonnewmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap; + this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonnewmap.Margin = new System.Windows.Forms.Padding(6, 1, 0, 2); + this.buttonnewmap.Name = "buttonnewmap"; + this.buttonnewmap.Size = new System.Drawing.Size(23, 22); + this.buttonnewmap.Tag = "builder_newmap"; + this.buttonnewmap.Text = "New Map"; + this.buttonnewmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonopenmap + // + this.buttonopenmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; + this.buttonopenmap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonopenmap.Name = "buttonopenmap"; + this.buttonopenmap.Size = new System.Drawing.Size(23, 22); + this.buttonopenmap.Tag = "builder_openmap"; + this.buttonopenmap.Text = "Open Map"; + this.buttonopenmap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonsavemap + // + this.buttonsavemap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap; + this.buttonsavemap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonsavemap.Name = "buttonsavemap"; + this.buttonsavemap.Size = new System.Drawing.Size(23, 22); + this.buttonsavemap.Tag = "builder_savemap"; + this.buttonsavemap.Text = "Save Map"; + this.buttonsavemap.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonscripteditor + // + this.buttonscripteditor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonscripteditor.Image = global::CodeImp.DoomBuilder.Properties.Resources.Script2; + this.buttonscripteditor.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonscripteditor.Name = "buttonscripteditor"; + this.buttonscripteditor.Size = new System.Drawing.Size(23, 22); + this.buttonscripteditor.Tag = "builder_openscripteditor"; + this.buttonscripteditor.Text = "Open Script Editor"; + this.buttonscripteditor.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonundo + // + this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; + this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonundo.Name = "buttonundo"; + this.buttonundo.Size = new System.Drawing.Size(23, 22); + this.buttonundo.Tag = "builder_undo"; + this.buttonundo.Text = "Undo"; + this.buttonundo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonredo + // + this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; + this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonredo.Name = "buttonredo"; + this.buttonredo.Size = new System.Drawing.Size(23, 22); + this.buttonredo.Tag = "builder_redo"; + this.buttonredo.Text = "Redo"; + this.buttonredo.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttoncut + // + this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; + this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncut.Name = "buttoncut"; + this.buttoncut.Size = new System.Drawing.Size(23, 22); + this.buttoncut.Tag = "builder_cutselection"; + this.buttoncut.Text = "Cut Selection"; + this.buttoncut.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttoncopy + // + this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; + this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncopy.Name = "buttoncopy"; + this.buttoncopy.Size = new System.Drawing.Size(23, 22); + this.buttoncopy.Tag = "builder_copyselection"; + this.buttoncopy.Text = "Copy Selection"; + this.buttoncopy.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonpaste + // + this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; + this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonpaste.Name = "buttonpaste"; + this.buttonpaste.Size = new System.Drawing.Size(23, 22); + this.buttonpaste.Tag = "builder_pasteselection"; + this.buttonpaste.Text = "Paste Selection"; + this.buttonpaste.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttoninsertprefabfile + // + this.buttoninsertprefabfile.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoninsertprefabfile.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab; + this.buttoninsertprefabfile.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoninsertprefabfile.Name = "buttoninsertprefabfile"; + this.buttoninsertprefabfile.Size = new System.Drawing.Size(23, 22); + this.buttoninsertprefabfile.Tag = "builder_insertprefabfile"; + this.buttoninsertprefabfile.Text = "Insert Prefab from File"; + this.buttoninsertprefabfile.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttoninsertpreviousprefab + // + this.buttoninsertpreviousprefab.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoninsertpreviousprefab.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab2; + this.buttoninsertpreviousprefab.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoninsertpreviousprefab.Name = "buttoninsertpreviousprefab"; + this.buttoninsertpreviousprefab.Size = new System.Drawing.Size(23, 22); + this.buttoninsertpreviousprefab.Tag = "builder_insertpreviousprefab"; + this.buttoninsertpreviousprefab.Text = "Insert Previous Prefab"; + this.buttoninsertpreviousprefab.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonthingsfilter + // + this.buttonthingsfilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonthingsfilter.Enabled = false; + this.buttonthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; + this.buttonthingsfilter.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonthingsfilter.Name = "buttonthingsfilter"; + this.buttonthingsfilter.Size = new System.Drawing.Size(23, 22); + this.buttonthingsfilter.Tag = "builder_thingsfilterssetup"; + this.buttonthingsfilter.Text = "Configure Things Filters"; + this.buttonthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // thingfilters + // + this.thingfilters.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.thingfilters.Enabled = false; + this.thingfilters.Items.AddRange(new object[] { "(none)", "(custom)", "Easy skill items only", "Medium skill items only", "Hard skill items only"}); - this.thingfilters.Margin = new System.Windows.Forms.Padding(1, 0, 6, 0); - this.thingfilters.Name = "thingfilters"; - this.thingfilters.Size = new System.Drawing.Size(130, 25); - this.thingfilters.ToolTipText = "Things Filter"; - this.thingfilters.SelectedIndexChanged += new System.EventHandler(this.thingfilters_SelectedIndexChanged); - this.thingfilters.DropDownClosed += new System.EventHandler(this.LoseFocus); - // - // buttonviewnormal - // - this.buttonviewnormal.CheckOnClick = true; - this.buttonviewnormal.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal; - this.buttonviewnormal.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewnormal.Name = "buttonviewnormal"; - this.buttonviewnormal.Size = new System.Drawing.Size(23, 22); - this.buttonviewnormal.Tag = "builder_viewmodenormal"; - this.buttonviewnormal.Text = "View Wireframe"; - this.buttonviewnormal.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonviewbrightness - // - this.buttonviewbrightness.CheckOnClick = true; - this.buttonviewbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness; - this.buttonviewbrightness.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewbrightness.Name = "buttonviewbrightness"; - this.buttonviewbrightness.Size = new System.Drawing.Size(23, 22); - this.buttonviewbrightness.Tag = "builder_viewmodebrightness"; - this.buttonviewbrightness.Text = "View Brightness Levels"; - this.buttonviewbrightness.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonviewfloors - // - this.buttonviewfloors.CheckOnClick = true; - this.buttonviewfloors.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor; - this.buttonviewfloors.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewfloors.Name = "buttonviewfloors"; - this.buttonviewfloors.Size = new System.Drawing.Size(23, 22); - this.buttonviewfloors.Tag = "builder_viewmodefloors"; - this.buttonviewfloors.Text = "View Floor Textures"; - this.buttonviewfloors.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonviewceilings - // - this.buttonviewceilings.CheckOnClick = true; - this.buttonviewceilings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling; - this.buttonviewceilings.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonviewceilings.Name = "buttonviewceilings"; - this.buttonviewceilings.Size = new System.Drawing.Size(23, 22); - this.buttonviewceilings.Tag = "builder_viewmodeceilings"; - this.buttonviewceilings.Text = "View Ceiling Textures"; - this.buttonviewceilings.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorviews - // - this.seperatorviews.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorviews.Name = "seperatorviews"; - this.seperatorviews.Size = new System.Drawing.Size(6, 25); - // - // buttonsnaptogrid - // - this.buttonsnaptogrid.Checked = true; - this.buttonsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonsnaptogrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; - this.buttonsnaptogrid.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonsnaptogrid.Name = "buttonsnaptogrid"; - this.buttonsnaptogrid.Size = new System.Drawing.Size(23, 22); - this.buttonsnaptogrid.Tag = "builder_togglesnap"; - this.buttonsnaptogrid.Text = "Snap to Grid"; - this.buttonsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonautomerge - // - this.buttonautomerge.Checked = true; - this.buttonautomerge.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonautomerge.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; - this.buttonautomerge.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonautomerge.Name = "buttonautomerge"; - this.buttonautomerge.Size = new System.Drawing.Size(23, 22); - this.buttonautomerge.Tag = "builder_toggleautomerge"; - this.buttonautomerge.Text = "Merge Geometry"; - this.buttonautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // separatorgzmodes - // - this.separatorgzmodes.Name = "separatorgzmodes"; - this.separatorgzmodes.Size = new System.Drawing.Size(6, 25); - // - // buttontogglefx - // - this.buttontogglefx.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontogglefx.Enabled = false; - this.buttontogglefx.Image = global::CodeImp.DoomBuilder.Properties.Resources.fx; - this.buttontogglefx.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontogglefx.Name = "buttontogglefx"; - this.buttontogglefx.Size = new System.Drawing.Size(23, 22); - this.buttontogglefx.Tag = "builder_gztogglefx"; - this.buttontogglefx.Text = "Toggle GZDoom Effects"; - this.buttontogglefx.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttontoggledynlight - // - this.buttontoggledynlight.CheckOnClick = true; - this.buttontoggledynlight.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontoggledynlight.Enabled = false; - this.buttontoggledynlight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light; - this.buttontoggledynlight.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontoggledynlight.Name = "buttontoggledynlight"; - this.buttontoggledynlight.Size = new System.Drawing.Size(23, 22); - this.buttontoggledynlight.Tag = "builder_gztogglelights"; - this.buttontoggledynlight.Text = "Toggle Dynamic Lights"; - this.buttontoggledynlight.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttontoggleanimatedlight - // - this.buttontoggleanimatedlight.CheckOnClick = true; - this.buttontoggleanimatedlight.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontoggleanimatedlight.Enabled = false; - this.buttontoggleanimatedlight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light_animate; - this.buttontoggleanimatedlight.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontoggleanimatedlight.Name = "buttontoggleanimatedlight"; - this.buttontoggleanimatedlight.Size = new System.Drawing.Size(23, 22); - this.buttontoggleanimatedlight.Tag = "builder_gztogglelightsanimation"; - this.buttontoggleanimatedlight.Text = "Toggle Dynamic Light Animation"; - this.buttontoggleanimatedlight.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttontogglemodels - // - this.buttontogglemodels.CheckOnClick = true; - this.buttontogglemodels.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontogglemodels.Enabled = false; - this.buttontogglemodels.Image = ((System.Drawing.Image)(resources.GetObject("buttontogglemodels.Image"))); - this.buttontogglemodels.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontogglemodels.Name = "buttontogglemodels"; - this.buttontogglemodels.Size = new System.Drawing.Size(23, 22); - this.buttontogglemodels.Tag = "builder_gztogglemodels"; - this.buttontogglemodels.Text = "Toggle Models Rendering"; - this.buttontogglemodels.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttonselectedmodelsonly - // - this.buttonselectedmodelsonly.CheckOnClick = true; - this.buttonselectedmodelsonly.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonselectedmodelsonly.Enabled = false; - this.buttonselectedmodelsonly.Image = ((System.Drawing.Image)(resources.GetObject("buttonselectedmodelsonly.Image"))); - this.buttonselectedmodelsonly.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonselectedmodelsonly.Name = "buttonselectedmodelsonly"; - this.buttonselectedmodelsonly.Size = new System.Drawing.Size(23, 22); - this.buttonselectedmodelsonly.Tag = "builder_gzdrawselectedmodelsonly"; - this.buttonselectedmodelsonly.Text = "Render models for selected things only"; - this.buttonselectedmodelsonly.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttontogglefog - // - this.buttontogglefog.CheckOnClick = true; - this.buttontogglefog.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontogglefog.Enabled = false; - this.buttontogglefog.Image = global::CodeImp.DoomBuilder.Properties.Resources.fog; - this.buttontogglefog.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontogglefog.Name = "buttontogglefog"; - this.buttontogglefog.Size = new System.Drawing.Size(23, 22); - this.buttontogglefog.Tag = "builder_gztogglefog"; - this.buttontogglefog.Text = "Toggle Fog Rendering"; - this.buttontogglefog.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatorgeometry - // - this.seperatorgeometry.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatorgeometry.Name = "seperatorgeometry"; - this.seperatorgeometry.Size = new System.Drawing.Size(6, 25); - // - // buttontest - // - this.buttontest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttontest.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; - this.buttontest.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttontest.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttontest.Name = "buttontest"; - this.buttontest.Size = new System.Drawing.Size(32, 22); - this.buttontest.Tag = "builder_testmap"; - this.buttontest.Text = "Test Map"; - this.buttontest.ButtonClick += new System.EventHandler(this.InvokeTaggedAction); - // - // seperatortesting - // - this.seperatortesting.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); - this.seperatortesting.Name = "seperatortesting"; - this.seperatortesting.Size = new System.Drawing.Size(6, 25); - // - // statusbar - // - this.statusbar.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.statusbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.thingfilters.Margin = new System.Windows.Forms.Padding(1, 0, 6, 0); + this.thingfilters.Name = "thingfilters"; + this.thingfilters.Size = new System.Drawing.Size(130, 25); + this.thingfilters.ToolTipText = "Things Filter"; + this.thingfilters.SelectedIndexChanged += new System.EventHandler(this.thingfilters_SelectedIndexChanged); + this.thingfilters.DropDownClosed += new System.EventHandler(this.LoseFocus); + // + // buttonviewnormal + // + this.buttonviewnormal.CheckOnClick = true; + this.buttonviewnormal.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal; + this.buttonviewnormal.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewnormal.Name = "buttonviewnormal"; + this.buttonviewnormal.Size = new System.Drawing.Size(23, 22); + this.buttonviewnormal.Tag = "builder_viewmodenormal"; + this.buttonviewnormal.Text = "View Wireframe"; + this.buttonviewnormal.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonviewbrightness + // + this.buttonviewbrightness.CheckOnClick = true; + this.buttonviewbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness; + this.buttonviewbrightness.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewbrightness.Name = "buttonviewbrightness"; + this.buttonviewbrightness.Size = new System.Drawing.Size(23, 22); + this.buttonviewbrightness.Tag = "builder_viewmodebrightness"; + this.buttonviewbrightness.Text = "View Brightness Levels"; + this.buttonviewbrightness.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonviewfloors + // + this.buttonviewfloors.CheckOnClick = true; + this.buttonviewfloors.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor; + this.buttonviewfloors.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewfloors.Name = "buttonviewfloors"; + this.buttonviewfloors.Size = new System.Drawing.Size(23, 22); + this.buttonviewfloors.Tag = "builder_viewmodefloors"; + this.buttonviewfloors.Text = "View Floor Textures"; + this.buttonviewfloors.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonviewceilings + // + this.buttonviewceilings.CheckOnClick = true; + this.buttonviewceilings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling; + this.buttonviewceilings.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonviewceilings.Name = "buttonviewceilings"; + this.buttonviewceilings.Size = new System.Drawing.Size(23, 22); + this.buttonviewceilings.Tag = "builder_viewmodeceilings"; + this.buttonviewceilings.Text = "View Ceiling Textures"; + this.buttonviewceilings.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorviews + // + this.seperatorviews.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorviews.Name = "seperatorviews"; + this.seperatorviews.Size = new System.Drawing.Size(6, 25); + // + // buttonsnaptogrid + // + this.buttonsnaptogrid.Checked = true; + this.buttonsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked; + this.buttonsnaptogrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4; + this.buttonsnaptogrid.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonsnaptogrid.Name = "buttonsnaptogrid"; + this.buttonsnaptogrid.Size = new System.Drawing.Size(23, 22); + this.buttonsnaptogrid.Tag = "builder_togglesnap"; + this.buttonsnaptogrid.Text = "Snap to Grid"; + this.buttonsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonautomerge + // + this.buttonautomerge.Checked = true; + this.buttonautomerge.CheckState = System.Windows.Forms.CheckState.Checked; + this.buttonautomerge.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2; + this.buttonautomerge.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonautomerge.Name = "buttonautomerge"; + this.buttonautomerge.Size = new System.Drawing.Size(23, 22); + this.buttonautomerge.Tag = "builder_toggleautomerge"; + this.buttonautomerge.Text = "Merge Geometry"; + this.buttonautomerge.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // separatorgzmodes + // + this.separatorgzmodes.Name = "separatorgzmodes"; + this.separatorgzmodes.Size = new System.Drawing.Size(6, 25); + // + // buttontogglefx + // + this.buttontogglefx.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontogglefx.Enabled = false; + this.buttontogglefx.Image = global::CodeImp.DoomBuilder.Properties.Resources.fx; + this.buttontogglefx.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontogglefx.Name = "buttontogglefx"; + this.buttontogglefx.Size = new System.Drawing.Size(23, 22); + this.buttontogglefx.Tag = "builder_gztogglefx"; + this.buttontogglefx.Text = "Toggle GZDoom Effects"; + this.buttontogglefx.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttontoggledynlight + // + this.buttontoggledynlight.CheckOnClick = true; + this.buttontoggledynlight.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontoggledynlight.Enabled = false; + this.buttontoggledynlight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light; + this.buttontoggledynlight.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontoggledynlight.Name = "buttontoggledynlight"; + this.buttontoggledynlight.Size = new System.Drawing.Size(23, 22); + this.buttontoggledynlight.Tag = "builder_gztogglelights"; + this.buttontoggledynlight.Text = "Toggle Dynamic Lights"; + this.buttontoggledynlight.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttontoggleanimatedlight + // + this.buttontoggleanimatedlight.CheckOnClick = true; + this.buttontoggleanimatedlight.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontoggleanimatedlight.Enabled = false; + this.buttontoggleanimatedlight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light_animate; + this.buttontoggleanimatedlight.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontoggleanimatedlight.Name = "buttontoggleanimatedlight"; + this.buttontoggleanimatedlight.Size = new System.Drawing.Size(23, 22); + this.buttontoggleanimatedlight.Tag = "builder_gztogglelightsanimation"; + this.buttontoggleanimatedlight.Text = "Toggle Dynamic Light Animation"; + this.buttontoggleanimatedlight.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttontogglemodels + // + this.buttontogglemodels.CheckOnClick = true; + this.buttontogglemodels.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontogglemodels.Enabled = false; + this.buttontogglemodels.Image = ((System.Drawing.Image)(resources.GetObject("buttontogglemodels.Image"))); + this.buttontogglemodels.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontogglemodels.Name = "buttontogglemodels"; + this.buttontogglemodels.Size = new System.Drawing.Size(23, 22); + this.buttontogglemodels.Tag = "builder_gztogglemodels"; + this.buttontogglemodels.Text = "Toggle Models Rendering"; + this.buttontogglemodels.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttonselectedmodelsonly + // + this.buttonselectedmodelsonly.CheckOnClick = true; + this.buttonselectedmodelsonly.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonselectedmodelsonly.Enabled = false; + this.buttonselectedmodelsonly.Image = ((System.Drawing.Image)(resources.GetObject("buttonselectedmodelsonly.Image"))); + this.buttonselectedmodelsonly.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonselectedmodelsonly.Name = "buttonselectedmodelsonly"; + this.buttonselectedmodelsonly.Size = new System.Drawing.Size(23, 22); + this.buttonselectedmodelsonly.Tag = "builder_gzdrawselectedmodelsonly"; + this.buttonselectedmodelsonly.Text = "Render models for selected things only"; + this.buttonselectedmodelsonly.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttontogglefog + // + this.buttontogglefog.CheckOnClick = true; + this.buttontogglefog.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontogglefog.Enabled = false; + this.buttontogglefog.Image = global::CodeImp.DoomBuilder.Properties.Resources.fog; + this.buttontogglefog.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontogglefog.Name = "buttontogglefog"; + this.buttontogglefog.Size = new System.Drawing.Size(23, 22); + this.buttontogglefog.Tag = "builder_gztogglefog"; + this.buttontogglefog.Text = "Toggle Fog Rendering"; + this.buttontogglefog.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // buttontoggleeventlines + // + this.buttontoggleeventlines.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontoggleeventlines.Enabled = false; + this.buttontoggleeventlines.Image = global::CodeImp.DoomBuilder.Properties.Resources.InfoLine; + this.buttontoggleeventlines.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontoggleeventlines.Name = "buttontoggleeventlines"; + this.buttontoggleeventlines.Size = new System.Drawing.Size(23, 22); + this.buttontoggleeventlines.Tag = "builder_gztoggleeventlines"; + this.buttontoggleeventlines.Text = "Toggle Event Lines"; + this.buttontoggleeventlines.Click += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatorgeometry + // + this.seperatorgeometry.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatorgeometry.Name = "seperatorgeometry"; + this.seperatorgeometry.Size = new System.Drawing.Size(6, 25); + // + // buttontest + // + this.buttontest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttontest.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test; + this.buttontest.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttontest.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttontest.Name = "buttontest"; + this.buttontest.Size = new System.Drawing.Size(32, 22); + this.buttontest.Tag = "builder_testmap"; + this.buttontest.Text = "Test Map"; + this.buttontest.ButtonClick += new System.EventHandler(this.InvokeTaggedAction); + // + // seperatortesting + // + this.seperatortesting.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.seperatortesting.Name = "seperatortesting"; + this.seperatortesting.Size = new System.Drawing.Size(6, 25); + // + // statusbar + // + this.statusbar.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.statusbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statuslabel, this.configlabel, toolStripSeparator12, @@ -1313,49 +1327,49 @@ namespace CodeImp.DoomBuilder.Windows this.yposlabel, toolStripSeparator9, this.warnsLabel}); - this.statusbar.Location = new System.Drawing.Point(0, 670); - this.statusbar.Name = "statusbar"; - this.statusbar.ShowItemToolTips = true; - this.statusbar.Size = new System.Drawing.Size(1012, 23); - this.statusbar.TabIndex = 2; - // - // statuslabel - // - this.statuslabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.Status2; - this.statuslabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.statuslabel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.statuslabel.Name = "statuslabel"; - this.statuslabel.Size = new System.Drawing.Size(340, 18); - this.statuslabel.Spring = true; - this.statuslabel.Text = "Initializing user interface..."; - this.statuslabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // configlabel - // - this.configlabel.AutoSize = false; - this.configlabel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.configlabel.Name = "configlabel"; - this.configlabel.Size = new System.Drawing.Size(280, 18); - this.configlabel.Text = "ZDoom (Doom in Hexen Format)"; - this.configlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.configlabel.ToolTipText = "Current Game Configuration"; - // - // gridlabel - // - this.gridlabel.AutoSize = false; - this.gridlabel.AutoToolTip = true; - this.gridlabel.Name = "gridlabel"; - this.gridlabel.Size = new System.Drawing.Size(62, 18); - this.gridlabel.Text = "32 mp"; - this.gridlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.gridlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay; - this.gridlabel.ToolTipText = "Grid size"; - // - // buttongrid - // - this.buttongrid.AutoToolTip = false; - this.buttongrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttongrid.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusbar.Location = new System.Drawing.Point(0, 670); + this.statusbar.Name = "statusbar"; + this.statusbar.ShowItemToolTips = true; + this.statusbar.Size = new System.Drawing.Size(1012, 23); + this.statusbar.TabIndex = 2; + // + // statuslabel + // + this.statuslabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.Status2; + this.statuslabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.statuslabel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.statuslabel.Name = "statuslabel"; + this.statuslabel.Size = new System.Drawing.Size(340, 18); + this.statuslabel.Spring = true; + this.statuslabel.Text = "Initializing user interface..."; + this.statuslabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // configlabel + // + this.configlabel.AutoSize = false; + this.configlabel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.configlabel.Name = "configlabel"; + this.configlabel.Size = new System.Drawing.Size(280, 18); + this.configlabel.Text = "ZDoom (Doom in Hexen Format)"; + this.configlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.configlabel.ToolTipText = "Current Game Configuration"; + // + // gridlabel + // + this.gridlabel.AutoSize = false; + this.gridlabel.AutoToolTip = true; + this.gridlabel.Name = "gridlabel"; + this.gridlabel.Size = new System.Drawing.Size(62, 18); + this.gridlabel.Text = "32 mp"; + this.gridlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.gridlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay; + this.gridlabel.ToolTipText = "Grid size"; + // + // buttongrid + // + this.buttongrid.AutoToolTip = false; + this.buttongrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttongrid.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemgrid1024, this.itemgrid512, this.itemgrid256, @@ -1367,109 +1381,109 @@ namespace CodeImp.DoomBuilder.Windows this.itemgrid4, toolStripMenuItem4, this.itemgridcustom}); - this.buttongrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2_arrowup; - this.buttongrid.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttongrid.ImageTransparentColor = System.Drawing.Color.Transparent; - this.buttongrid.Name = "buttongrid"; - this.buttongrid.ShowDropDownArrow = false; - this.buttongrid.Size = new System.Drawing.Size(29, 21); - this.buttongrid.Text = "Grid"; - // - // itemgrid1024 - // - this.itemgrid1024.Name = "itemgrid1024"; - this.itemgrid1024.Size = new System.Drawing.Size(153, 22); - this.itemgrid1024.Tag = "1024"; - this.itemgrid1024.Text = "1024 mp"; - this.itemgrid1024.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid512 - // - this.itemgrid512.Name = "itemgrid512"; - this.itemgrid512.Size = new System.Drawing.Size(153, 22); - this.itemgrid512.Tag = "512"; - this.itemgrid512.Text = "512 mp"; - this.itemgrid512.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid256 - // - this.itemgrid256.Name = "itemgrid256"; - this.itemgrid256.Size = new System.Drawing.Size(153, 22); - this.itemgrid256.Tag = "256"; - this.itemgrid256.Text = "256 mp"; - this.itemgrid256.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid128 - // - this.itemgrid128.Name = "itemgrid128"; - this.itemgrid128.Size = new System.Drawing.Size(153, 22); - this.itemgrid128.Tag = "128"; - this.itemgrid128.Text = "128 mp"; - this.itemgrid128.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid64 - // - this.itemgrid64.Name = "itemgrid64"; - this.itemgrid64.Size = new System.Drawing.Size(153, 22); - this.itemgrid64.Tag = "64"; - this.itemgrid64.Text = "64 mp"; - this.itemgrid64.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid32 - // - this.itemgrid32.Name = "itemgrid32"; - this.itemgrid32.Size = new System.Drawing.Size(153, 22); - this.itemgrid32.Tag = "32"; - this.itemgrid32.Text = "32 mp"; - this.itemgrid32.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid16 - // - this.itemgrid16.Name = "itemgrid16"; - this.itemgrid16.Size = new System.Drawing.Size(153, 22); - this.itemgrid16.Tag = "16"; - this.itemgrid16.Text = "16 mp"; - this.itemgrid16.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid8 - // - this.itemgrid8.Name = "itemgrid8"; - this.itemgrid8.Size = new System.Drawing.Size(153, 22); - this.itemgrid8.Tag = "8"; - this.itemgrid8.Text = "8 mp"; - this.itemgrid8.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgrid4 - // - this.itemgrid4.Name = "itemgrid4"; - this.itemgrid4.Size = new System.Drawing.Size(153, 22); - this.itemgrid4.Tag = "4"; - this.itemgrid4.Text = "4 mp"; - this.itemgrid4.Click += new System.EventHandler(this.itemgridsize_Click); - // - // itemgridcustom - // - this.itemgridcustom.Name = "itemgridcustom"; - this.itemgridcustom.Size = new System.Drawing.Size(153, 22); - this.itemgridcustom.Text = "Customize..."; - this.itemgridcustom.Click += new System.EventHandler(this.itemgridcustom_Click); - // - // zoomlabel - // - this.zoomlabel.AutoSize = false; - this.zoomlabel.AutoToolTip = true; - this.zoomlabel.Name = "zoomlabel"; - this.zoomlabel.Size = new System.Drawing.Size(54, 18); - this.zoomlabel.Text = "50%"; - this.zoomlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.zoomlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay; - this.zoomlabel.ToolTipText = "Zoom level"; - // - // buttonzoom - // - this.buttonzoom.AutoToolTip = false; - this.buttonzoom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.buttongrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2_arrowup; + this.buttongrid.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttongrid.ImageTransparentColor = System.Drawing.Color.Transparent; + this.buttongrid.Name = "buttongrid"; + this.buttongrid.ShowDropDownArrow = false; + this.buttongrid.Size = new System.Drawing.Size(29, 21); + this.buttongrid.Text = "Grid"; + // + // itemgrid1024 + // + this.itemgrid1024.Name = "itemgrid1024"; + this.itemgrid1024.Size = new System.Drawing.Size(153, 22); + this.itemgrid1024.Tag = "1024"; + this.itemgrid1024.Text = "1024 mp"; + this.itemgrid1024.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid512 + // + this.itemgrid512.Name = "itemgrid512"; + this.itemgrid512.Size = new System.Drawing.Size(153, 22); + this.itemgrid512.Tag = "512"; + this.itemgrid512.Text = "512 mp"; + this.itemgrid512.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid256 + // + this.itemgrid256.Name = "itemgrid256"; + this.itemgrid256.Size = new System.Drawing.Size(153, 22); + this.itemgrid256.Tag = "256"; + this.itemgrid256.Text = "256 mp"; + this.itemgrid256.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid128 + // + this.itemgrid128.Name = "itemgrid128"; + this.itemgrid128.Size = new System.Drawing.Size(153, 22); + this.itemgrid128.Tag = "128"; + this.itemgrid128.Text = "128 mp"; + this.itemgrid128.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid64 + // + this.itemgrid64.Name = "itemgrid64"; + this.itemgrid64.Size = new System.Drawing.Size(153, 22); + this.itemgrid64.Tag = "64"; + this.itemgrid64.Text = "64 mp"; + this.itemgrid64.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid32 + // + this.itemgrid32.Name = "itemgrid32"; + this.itemgrid32.Size = new System.Drawing.Size(153, 22); + this.itemgrid32.Tag = "32"; + this.itemgrid32.Text = "32 mp"; + this.itemgrid32.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid16 + // + this.itemgrid16.Name = "itemgrid16"; + this.itemgrid16.Size = new System.Drawing.Size(153, 22); + this.itemgrid16.Tag = "16"; + this.itemgrid16.Text = "16 mp"; + this.itemgrid16.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid8 + // + this.itemgrid8.Name = "itemgrid8"; + this.itemgrid8.Size = new System.Drawing.Size(153, 22); + this.itemgrid8.Tag = "8"; + this.itemgrid8.Text = "8 mp"; + this.itemgrid8.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgrid4 + // + this.itemgrid4.Name = "itemgrid4"; + this.itemgrid4.Size = new System.Drawing.Size(153, 22); + this.itemgrid4.Tag = "4"; + this.itemgrid4.Text = "4 mp"; + this.itemgrid4.Click += new System.EventHandler(this.itemgridsize_Click); + // + // itemgridcustom + // + this.itemgridcustom.Name = "itemgridcustom"; + this.itemgridcustom.Size = new System.Drawing.Size(153, 22); + this.itemgridcustom.Text = "Customize..."; + this.itemgridcustom.Click += new System.EventHandler(this.itemgridcustom_Click); + // + // zoomlabel + // + this.zoomlabel.AutoSize = false; + this.zoomlabel.AutoToolTip = true; + this.zoomlabel.Name = "zoomlabel"; + this.zoomlabel.Size = new System.Drawing.Size(54, 18); + this.zoomlabel.Text = "50%"; + this.zoomlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.zoomlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay; + this.zoomlabel.ToolTipText = "Zoom level"; + // + // buttonzoom + // + this.buttonzoom.AutoToolTip = false; + this.buttonzoom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.itemzoom200, this.itemzoom100, this.itemzoom50, @@ -1478,317 +1492,317 @@ namespace CodeImp.DoomBuilder.Windows this.itemzoom5, toolStripSeparator2, this.itemzoomfittoscreen}); - this.buttonzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom_arrowup; - this.buttonzoom.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttonzoom.ImageTransparentColor = System.Drawing.Color.Transparent; - this.buttonzoom.Name = "buttonzoom"; - this.buttonzoom.ShowDropDownArrow = false; - this.buttonzoom.Size = new System.Drawing.Size(29, 21); - this.buttonzoom.Text = "Zoom"; - // - // itemzoom200 - // - this.itemzoom200.Name = "itemzoom200"; - this.itemzoom200.Size = new System.Drawing.Size(156, 22); - this.itemzoom200.Tag = "200"; - this.itemzoom200.Text = "200%"; - this.itemzoom200.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom100 - // - this.itemzoom100.Name = "itemzoom100"; - this.itemzoom100.Size = new System.Drawing.Size(156, 22); - this.itemzoom100.Tag = "100"; - this.itemzoom100.Text = "100%"; - this.itemzoom100.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom50 - // - this.itemzoom50.Name = "itemzoom50"; - this.itemzoom50.Size = new System.Drawing.Size(156, 22); - this.itemzoom50.Tag = "50"; - this.itemzoom50.Text = "50%"; - this.itemzoom50.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom25 - // - this.itemzoom25.Name = "itemzoom25"; - this.itemzoom25.Size = new System.Drawing.Size(156, 22); - this.itemzoom25.Tag = "25"; - this.itemzoom25.Text = "25%"; - this.itemzoom25.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom10 - // - this.itemzoom10.Name = "itemzoom10"; - this.itemzoom10.Size = new System.Drawing.Size(156, 22); - this.itemzoom10.Tag = "10"; - this.itemzoom10.Text = "10%"; - this.itemzoom10.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoom5 - // - this.itemzoom5.Name = "itemzoom5"; - this.itemzoom5.Size = new System.Drawing.Size(156, 22); - this.itemzoom5.Tag = "5"; - this.itemzoom5.Text = "5%"; - this.itemzoom5.Click += new System.EventHandler(this.itemzoomto_Click); - // - // itemzoomfittoscreen - // - this.itemzoomfittoscreen.Name = "itemzoomfittoscreen"; - this.itemzoomfittoscreen.Size = new System.Drawing.Size(156, 22); - this.itemzoomfittoscreen.Text = "Fit to screen"; - this.itemzoomfittoscreen.Click += new System.EventHandler(this.itemzoomfittoscreen_Click); - // - // xposlabel - // - this.xposlabel.AutoSize = false; - this.xposlabel.Name = "xposlabel"; - this.xposlabel.Size = new System.Drawing.Size(50, 18); - this.xposlabel.Text = "0"; - this.xposlabel.ToolTipText = "Current X, Y coordinates on map"; - // - // yposlabel - // - this.yposlabel.AutoSize = false; - this.yposlabel.Name = "yposlabel"; - this.yposlabel.Size = new System.Drawing.Size(50, 18); - this.yposlabel.Text = "0"; - this.yposlabel.ToolTipText = "Current X, Y coordinates on map"; - // - // warnsLabel - // - this.warnsLabel.AutoSize = false; - this.warnsLabel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.warnsLabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.WarningOff; - this.warnsLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.warnsLabel.Name = "warnsLabel"; - this.warnsLabel.Size = new System.Drawing.Size(44, 18); - this.warnsLabel.Text = "0"; - this.warnsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.warnsLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; - this.warnsLabel.Click += new System.EventHandler(this.warnsLabel_Click); - // - // panelinfo - // - this.panelinfo.Controls.Add(this.heightpanel1); - this.panelinfo.Controls.Add(this.vertexinfo); - this.panelinfo.Controls.Add(this.labelcollapsedinfo); - this.panelinfo.Controls.Add(this.buttontoggleinfo); - this.panelinfo.Controls.Add(this.modename); - this.panelinfo.Controls.Add(this.linedefinfo); - this.panelinfo.Controls.Add(this.thinginfo); - this.panelinfo.Controls.Add(this.sectorinfo); - this.panelinfo.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelinfo.Location = new System.Drawing.Point(26, 564); - this.panelinfo.Name = "panelinfo"; - this.panelinfo.Size = new System.Drawing.Size(986, 106); - this.panelinfo.TabIndex = 4; - // - // heightpanel1 - // - this.heightpanel1.BackColor = System.Drawing.Color.Navy; - this.heightpanel1.ForeColor = System.Drawing.SystemColors.ControlText; - this.heightpanel1.Location = new System.Drawing.Point(0, 0); - this.heightpanel1.Name = "heightpanel1"; - this.heightpanel1.Size = new System.Drawing.Size(29, 106); - this.heightpanel1.TabIndex = 7; - this.heightpanel1.Visible = false; - // - // vertexinfo - // - this.vertexinfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.vertexinfo.Location = new System.Drawing.Point(3, 3); - this.vertexinfo.MaximumSize = new System.Drawing.Size(10000, 100); - this.vertexinfo.MinimumSize = new System.Drawing.Size(100, 100); - this.vertexinfo.Name = "vertexinfo"; - this.vertexinfo.Size = new System.Drawing.Size(310, 100); - this.vertexinfo.TabIndex = 1; - this.vertexinfo.Visible = false; - // - // labelcollapsedinfo - // - this.labelcollapsedinfo.AutoSize = true; - this.labelcollapsedinfo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelcollapsedinfo.Location = new System.Drawing.Point(2, 2); - this.labelcollapsedinfo.Name = "labelcollapsedinfo"; - this.labelcollapsedinfo.Size = new System.Drawing.Size(137, 13); - this.labelcollapsedinfo.TabIndex = 6; - this.labelcollapsedinfo.Text = "Collapsed Descriptions"; - this.labelcollapsedinfo.Visible = false; - // - // buttontoggleinfo - // - this.buttontoggleinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttontoggleinfo.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.buttontoggleinfo.Font = new System.Drawing.Font("Marlett", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttontoggleinfo.Location = new System.Drawing.Point(962, 1); - this.buttontoggleinfo.Name = "buttontoggleinfo"; - this.buttontoggleinfo.Size = new System.Drawing.Size(22, 19); - this.buttontoggleinfo.TabIndex = 5; - this.buttontoggleinfo.TabStop = false; - this.buttontoggleinfo.Tag = "builder_toggleinfopanel"; - this.buttontoggleinfo.Text = "6"; - this.buttontoggleinfo.UseVisualStyleBackColor = true; - this.buttontoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction); - this.buttontoggleinfo.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttontoggleinfo_MouseUp); - // - // modename - // - this.modename.AutoSize = true; - this.modename.Font = new System.Drawing.Font("Verdana", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.modename.ForeColor = System.Drawing.SystemColors.GrayText; - this.modename.Location = new System.Drawing.Point(12, 20); - this.modename.Name = "modename"; - this.modename.Size = new System.Drawing.Size(244, 59); - this.modename.TabIndex = 4; - this.modename.Text = "Vertices"; - this.modename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.modename.UseMnemonic = false; - this.modename.Visible = false; - // - // linedefinfo - // - this.linedefinfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.linedefinfo.Location = new System.Drawing.Point(3, 3); - this.linedefinfo.MaximumSize = new System.Drawing.Size(10000, 100); - this.linedefinfo.MinimumSize = new System.Drawing.Size(100, 100); - this.linedefinfo.Name = "linedefinfo"; - this.linedefinfo.Size = new System.Drawing.Size(1039, 100); - this.linedefinfo.TabIndex = 0; - this.linedefinfo.Visible = false; - // - // thinginfo - // - this.thinginfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.thinginfo.Location = new System.Drawing.Point(3, 3); - this.thinginfo.MaximumSize = new System.Drawing.Size(10000, 100); - this.thinginfo.MinimumSize = new System.Drawing.Size(100, 100); - this.thinginfo.Name = "thinginfo"; - this.thinginfo.Size = new System.Drawing.Size(639, 100); - this.thinginfo.TabIndex = 3; - this.thinginfo.Visible = false; - // - // sectorinfo - // - this.sectorinfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sectorinfo.Location = new System.Drawing.Point(3, 3); - this.sectorinfo.MaximumSize = new System.Drawing.Size(10000, 100); - this.sectorinfo.MinimumSize = new System.Drawing.Size(100, 100); - this.sectorinfo.Name = "sectorinfo"; - this.sectorinfo.Size = new System.Drawing.Size(522, 100); - this.sectorinfo.TabIndex = 2; - this.sectorinfo.Visible = false; - // - // redrawtimer - // - this.redrawtimer.Interval = 1; - this.redrawtimer.Tick += new System.EventHandler(this.redrawtimer_Tick); - // - // display - // - this.display.BackColor = System.Drawing.SystemColors.AppWorkspace; - this.display.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.display.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.display.CausesValidation = false; - this.display.Location = new System.Drawing.Point(373, 141); - this.display.Name = "display"; - this.display.Size = new System.Drawing.Size(542, 307); - this.display.TabIndex = 5; - this.display.MouseLeave += new System.EventHandler(this.display_MouseLeave); - this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint); - this.display.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.display_PreviewKeyDown); - this.display.MouseMove += new System.Windows.Forms.MouseEventHandler(this.display_MouseMove); - this.display.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseDoubleClick); - this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick); - this.display.MouseDown += new System.Windows.Forms.MouseEventHandler(this.display_MouseDown); - this.display.Resize += new System.EventHandler(this.display_Resize); - this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp); - this.display.MouseEnter += new System.EventHandler(this.display_MouseEnter); - // - // processor - // - this.processor.Interval = 10; - this.processor.Tick += new System.EventHandler(this.processor_Tick); - // - // statusflasher - // - this.statusflasher.Tick += new System.EventHandler(this.statusflasher_Tick); - // - // statusresetter - // - this.statusresetter.Tick += new System.EventHandler(this.statusresetter_Tick); - // - // dockersspace - // - this.dockersspace.Dock = System.Windows.Forms.DockStyle.Left; - this.dockersspace.Location = new System.Drawing.Point(0, 49); - this.dockersspace.Name = "dockersspace"; - this.dockersspace.Size = new System.Drawing.Size(26, 621); - this.dockersspace.TabIndex = 6; - // - // dockerspanel - // - this.dockerspanel.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dockerspanel.Location = new System.Drawing.Point(62, 67); - this.dockerspanel.Name = "dockerspanel"; - this.dockerspanel.Size = new System.Drawing.Size(236, 467); - this.dockerspanel.TabIndex = 7; - this.dockerspanel.TabStop = false; - this.dockerspanel.UserResize += new System.EventHandler(this.dockerspanel_UserResize); - this.dockerspanel.Collapsed += new System.EventHandler(this.LoseFocus); - this.dockerspanel.MouseContainerEnter += new System.EventHandler(this.dockerspanel_MouseContainerEnter); - // - // dockerscollapser - // - this.dockerscollapser.Interval = 200; - this.dockerscollapser.Tick += new System.EventHandler(this.dockerscollapser_Tick); - // - // warnsTimer - // - this.warnsTimer.Interval = 500; - this.warnsTimer.Tick += new System.EventHandler(this.warnsTimer_Tick); - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(1012, 693); - this.Controls.Add(this.dockerspanel); - this.Controls.Add(this.display); - this.Controls.Add(this.panelinfo); - this.Controls.Add(this.dockersspace); - this.Controls.Add(this.statusbar); - this.Controls.Add(this.toolbar); - this.Controls.Add(this.menumain); - this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.KeyPreview = true; - this.MainMenuStrip = this.menumain; - this.Name = "MainForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; - this.Text = "GZDoomBuilder"; - this.Deactivate += new System.EventHandler(this.MainForm_Deactivate); - this.Load += new System.EventHandler(this.MainForm_Load); - this.Shown += new System.EventHandler(this.MainForm_Shown); - this.Activated += new System.EventHandler(this.MainForm_Activated); - this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp); - this.Move += new System.EventHandler(this.MainForm_Move); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); - this.Resize += new System.EventHandler(this.MainForm_Resize); - this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown); - this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd); - this.menumain.ResumeLayout(false); - this.menumain.PerformLayout(); - this.toolbar.ResumeLayout(false); - this.toolbar.PerformLayout(); - this.statusbar.ResumeLayout(false); - this.statusbar.PerformLayout(); - this.panelinfo.ResumeLayout(false); - this.panelinfo.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.buttonzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom_arrowup; + this.buttonzoom.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttonzoom.ImageTransparentColor = System.Drawing.Color.Transparent; + this.buttonzoom.Name = "buttonzoom"; + this.buttonzoom.ShowDropDownArrow = false; + this.buttonzoom.Size = new System.Drawing.Size(29, 21); + this.buttonzoom.Text = "Zoom"; + // + // itemzoom200 + // + this.itemzoom200.Name = "itemzoom200"; + this.itemzoom200.Size = new System.Drawing.Size(156, 22); + this.itemzoom200.Tag = "200"; + this.itemzoom200.Text = "200%"; + this.itemzoom200.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom100 + // + this.itemzoom100.Name = "itemzoom100"; + this.itemzoom100.Size = new System.Drawing.Size(156, 22); + this.itemzoom100.Tag = "100"; + this.itemzoom100.Text = "100%"; + this.itemzoom100.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom50 + // + this.itemzoom50.Name = "itemzoom50"; + this.itemzoom50.Size = new System.Drawing.Size(156, 22); + this.itemzoom50.Tag = "50"; + this.itemzoom50.Text = "50%"; + this.itemzoom50.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom25 + // + this.itemzoom25.Name = "itemzoom25"; + this.itemzoom25.Size = new System.Drawing.Size(156, 22); + this.itemzoom25.Tag = "25"; + this.itemzoom25.Text = "25%"; + this.itemzoom25.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom10 + // + this.itemzoom10.Name = "itemzoom10"; + this.itemzoom10.Size = new System.Drawing.Size(156, 22); + this.itemzoom10.Tag = "10"; + this.itemzoom10.Text = "10%"; + this.itemzoom10.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoom5 + // + this.itemzoom5.Name = "itemzoom5"; + this.itemzoom5.Size = new System.Drawing.Size(156, 22); + this.itemzoom5.Tag = "5"; + this.itemzoom5.Text = "5%"; + this.itemzoom5.Click += new System.EventHandler(this.itemzoomto_Click); + // + // itemzoomfittoscreen + // + this.itemzoomfittoscreen.Name = "itemzoomfittoscreen"; + this.itemzoomfittoscreen.Size = new System.Drawing.Size(156, 22); + this.itemzoomfittoscreen.Text = "Fit to screen"; + this.itemzoomfittoscreen.Click += new System.EventHandler(this.itemzoomfittoscreen_Click); + // + // xposlabel + // + this.xposlabel.AutoSize = false; + this.xposlabel.Name = "xposlabel"; + this.xposlabel.Size = new System.Drawing.Size(50, 18); + this.xposlabel.Text = "0"; + this.xposlabel.ToolTipText = "Current X, Y coordinates on map"; + // + // yposlabel + // + this.yposlabel.AutoSize = false; + this.yposlabel.Name = "yposlabel"; + this.yposlabel.Size = new System.Drawing.Size(50, 18); + this.yposlabel.Text = "0"; + this.yposlabel.ToolTipText = "Current X, Y coordinates on map"; + // + // warnsLabel + // + this.warnsLabel.AutoSize = false; + this.warnsLabel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.warnsLabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.WarningOff; + this.warnsLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.warnsLabel.Name = "warnsLabel"; + this.warnsLabel.Size = new System.Drawing.Size(44, 18); + this.warnsLabel.Text = "0"; + this.warnsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.warnsLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; + this.warnsLabel.Click += new System.EventHandler(this.warnsLabel_Click); + // + // panelinfo + // + this.panelinfo.Controls.Add(this.heightpanel1); + this.panelinfo.Controls.Add(this.vertexinfo); + this.panelinfo.Controls.Add(this.labelcollapsedinfo); + this.panelinfo.Controls.Add(this.buttontoggleinfo); + this.panelinfo.Controls.Add(this.modename); + this.panelinfo.Controls.Add(this.linedefinfo); + this.panelinfo.Controls.Add(this.thinginfo); + this.panelinfo.Controls.Add(this.sectorinfo); + this.panelinfo.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelinfo.Location = new System.Drawing.Point(26, 564); + this.panelinfo.Name = "panelinfo"; + this.panelinfo.Size = new System.Drawing.Size(986, 106); + this.panelinfo.TabIndex = 4; + // + // heightpanel1 + // + this.heightpanel1.BackColor = System.Drawing.Color.Navy; + this.heightpanel1.ForeColor = System.Drawing.SystemColors.ControlText; + this.heightpanel1.Location = new System.Drawing.Point(0, 0); + this.heightpanel1.Name = "heightpanel1"; + this.heightpanel1.Size = new System.Drawing.Size(29, 106); + this.heightpanel1.TabIndex = 7; + this.heightpanel1.Visible = false; + // + // vertexinfo + // + this.vertexinfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.vertexinfo.Location = new System.Drawing.Point(3, 3); + this.vertexinfo.MaximumSize = new System.Drawing.Size(10000, 100); + this.vertexinfo.MinimumSize = new System.Drawing.Size(100, 100); + this.vertexinfo.Name = "vertexinfo"; + this.vertexinfo.Size = new System.Drawing.Size(310, 100); + this.vertexinfo.TabIndex = 1; + this.vertexinfo.Visible = false; + // + // labelcollapsedinfo + // + this.labelcollapsedinfo.AutoSize = true; + this.labelcollapsedinfo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelcollapsedinfo.Location = new System.Drawing.Point(2, 2); + this.labelcollapsedinfo.Name = "labelcollapsedinfo"; + this.labelcollapsedinfo.Size = new System.Drawing.Size(137, 13); + this.labelcollapsedinfo.TabIndex = 6; + this.labelcollapsedinfo.Text = "Collapsed Descriptions"; + this.labelcollapsedinfo.Visible = false; + // + // buttontoggleinfo + // + this.buttontoggleinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttontoggleinfo.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.buttontoggleinfo.Font = new System.Drawing.Font("Marlett", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.buttontoggleinfo.Location = new System.Drawing.Point(962, 1); + this.buttontoggleinfo.Name = "buttontoggleinfo"; + this.buttontoggleinfo.Size = new System.Drawing.Size(22, 19); + this.buttontoggleinfo.TabIndex = 5; + this.buttontoggleinfo.TabStop = false; + this.buttontoggleinfo.Tag = "builder_toggleinfopanel"; + this.buttontoggleinfo.Text = "6"; + this.buttontoggleinfo.UseVisualStyleBackColor = true; + this.buttontoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction); + this.buttontoggleinfo.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttontoggleinfo_MouseUp); + // + // modename + // + this.modename.AutoSize = true; + this.modename.Font = new System.Drawing.Font("Verdana", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.modename.ForeColor = System.Drawing.SystemColors.GrayText; + this.modename.Location = new System.Drawing.Point(12, 20); + this.modename.Name = "modename"; + this.modename.Size = new System.Drawing.Size(244, 59); + this.modename.TabIndex = 4; + this.modename.Text = "Vertices"; + this.modename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.modename.UseMnemonic = false; + this.modename.Visible = false; + // + // linedefinfo + // + this.linedefinfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.linedefinfo.Location = new System.Drawing.Point(3, 3); + this.linedefinfo.MaximumSize = new System.Drawing.Size(10000, 100); + this.linedefinfo.MinimumSize = new System.Drawing.Size(100, 100); + this.linedefinfo.Name = "linedefinfo"; + this.linedefinfo.Size = new System.Drawing.Size(1039, 100); + this.linedefinfo.TabIndex = 0; + this.linedefinfo.Visible = false; + // + // thinginfo + // + this.thinginfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.thinginfo.Location = new System.Drawing.Point(3, 3); + this.thinginfo.MaximumSize = new System.Drawing.Size(10000, 100); + this.thinginfo.MinimumSize = new System.Drawing.Size(100, 100); + this.thinginfo.Name = "thinginfo"; + this.thinginfo.Size = new System.Drawing.Size(639, 100); + this.thinginfo.TabIndex = 3; + this.thinginfo.Visible = false; + // + // sectorinfo + // + this.sectorinfo.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.sectorinfo.Location = new System.Drawing.Point(3, 3); + this.sectorinfo.MaximumSize = new System.Drawing.Size(10000, 100); + this.sectorinfo.MinimumSize = new System.Drawing.Size(100, 100); + this.sectorinfo.Name = "sectorinfo"; + this.sectorinfo.Size = new System.Drawing.Size(522, 100); + this.sectorinfo.TabIndex = 2; + this.sectorinfo.Visible = false; + // + // redrawtimer + // + this.redrawtimer.Interval = 1; + this.redrawtimer.Tick += new System.EventHandler(this.redrawtimer_Tick); + // + // display + // + this.display.BackColor = System.Drawing.SystemColors.AppWorkspace; + this.display.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.display.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.display.CausesValidation = false; + this.display.Location = new System.Drawing.Point(373, 141); + this.display.Name = "display"; + this.display.Size = new System.Drawing.Size(542, 307); + this.display.TabIndex = 5; + this.display.MouseLeave += new System.EventHandler(this.display_MouseLeave); + this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint); + this.display.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.display_PreviewKeyDown); + this.display.MouseMove += new System.Windows.Forms.MouseEventHandler(this.display_MouseMove); + this.display.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseDoubleClick); + this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick); + this.display.MouseDown += new System.Windows.Forms.MouseEventHandler(this.display_MouseDown); + this.display.Resize += new System.EventHandler(this.display_Resize); + this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp); + this.display.MouseEnter += new System.EventHandler(this.display_MouseEnter); + // + // processor + // + this.processor.Interval = 10; + this.processor.Tick += new System.EventHandler(this.processor_Tick); + // + // statusflasher + // + this.statusflasher.Tick += new System.EventHandler(this.statusflasher_Tick); + // + // statusresetter + // + this.statusresetter.Tick += new System.EventHandler(this.statusresetter_Tick); + // + // dockersspace + // + this.dockersspace.Dock = System.Windows.Forms.DockStyle.Left; + this.dockersspace.Location = new System.Drawing.Point(0, 49); + this.dockersspace.Name = "dockersspace"; + this.dockersspace.Size = new System.Drawing.Size(26, 621); + this.dockersspace.TabIndex = 6; + // + // dockerspanel + // + this.dockerspanel.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dockerspanel.Location = new System.Drawing.Point(62, 67); + this.dockerspanel.Name = "dockerspanel"; + this.dockerspanel.Size = new System.Drawing.Size(236, 467); + this.dockerspanel.TabIndex = 7; + this.dockerspanel.TabStop = false; + this.dockerspanel.UserResize += new System.EventHandler(this.dockerspanel_UserResize); + this.dockerspanel.Collapsed += new System.EventHandler(this.LoseFocus); + this.dockerspanel.MouseContainerEnter += new System.EventHandler(this.dockerspanel_MouseContainerEnter); + // + // dockerscollapser + // + this.dockerscollapser.Interval = 200; + this.dockerscollapser.Tick += new System.EventHandler(this.dockerscollapser_Tick); + // + // warnsTimer + // + this.warnsTimer.Interval = 500; + this.warnsTimer.Tick += new System.EventHandler(this.warnsTimer_Tick); + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(1012, 693); + this.Controls.Add(this.dockerspanel); + this.Controls.Add(this.display); + this.Controls.Add(this.panelinfo); + this.Controls.Add(this.dockersspace); + this.Controls.Add(this.statusbar); + this.Controls.Add(this.toolbar); + this.Controls.Add(this.menumain); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.MainMenuStrip = this.menumain; + this.Name = "MainForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; + this.Text = "GZDoomBuilder"; + this.Deactivate += new System.EventHandler(this.MainForm_Deactivate); + this.Load += new System.EventHandler(this.MainForm_Load); + this.Shown += new System.EventHandler(this.MainForm_Shown); + this.Activated += new System.EventHandler(this.MainForm_Activated); + this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp); + this.Move += new System.EventHandler(this.MainForm_Move); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); + this.Resize += new System.EventHandler(this.MainForm_Resize); + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown); + this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd); + this.menumain.ResumeLayout(false); + this.menumain.PerformLayout(); + this.toolbar.ResumeLayout(false); + this.toolbar.PerformLayout(); + this.statusbar.ResumeLayout(false); + this.statusbar.PerformLayout(); + this.panelinfo.ResumeLayout(false); + this.panelinfo.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1949,5 +1963,6 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.ToolStripMenuItem itemReloadMapinfo; private System.Windows.Forms.ToolStripSeparator separatorDrawModes; private System.Windows.Forms.Timer warnsTimer; + private System.Windows.Forms.ToolStripButton buttontoggleeventlines; } } \ No newline at end of file diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs index 15a032f39aeb0c81b8cc406dc44835ef40dfc601..30013e1e8e7a897534d5d9f8cde44611c4b7b0c3 100644 --- a/Source/Core/Windows/MainForm.cs +++ b/Source/Core/Windows/MainForm.cs @@ -1790,6 +1790,7 @@ namespace CodeImp.DoomBuilder.Windows buttontoggleanimatedlight.Enabled = true; buttontogglefog.Enabled = true; buttontogglefx.Enabled = true; + buttontoggleeventlines.Enabled = true; if (General.Settings.GZToolbarGZDoom) { buttontogglemodels.Checked = General.Settings.GZDrawModels; @@ -1797,6 +1798,7 @@ namespace CodeImp.DoomBuilder.Windows buttontoggledynlight.Checked = General.Settings.GZDrawLights; buttontoggleanimatedlight.Checked = General.Settings.GZAnimateLights; buttontogglefog.Checked = General.Settings.GZDrawFog; + buttontoggleeventlines.Checked = General.Settings.GZShowEventLines; } } else { buttontogglemodels.Enabled = false; @@ -1805,6 +1807,7 @@ namespace CodeImp.DoomBuilder.Windows buttontoggleanimatedlight.Enabled = false; buttontogglefog.Enabled = false; buttontogglefx.Enabled = false; + buttontoggleeventlines.Enabled = false; } } diff --git a/Source/Core/Windows/MainForm.resx b/Source/Core/Windows/MainForm.resx index 54c320a3679c81c15ed6d343eb8032301838c6ed..b0323263aa2fb0057a818279d3bd150df6852404 100644 --- a/Source/Core/Windows/MainForm.resx +++ b/Source/Core/Windows/MainForm.resx @@ -139,13 +139,13 @@ <value>True</value> </metadata> <metadata name="menumain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> + <value>131, 17</value> </metadata> <metadata name="toolbar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="toolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>127, 17</value> + <value>241, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="buttontogglemodels.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -169,7 +169,7 @@ <value>True</value> </metadata> <metadata name="statusbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>218, 17</value> + <value>332, 17</value> </metadata> <metadata name="panelinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> @@ -223,19 +223,19 @@ <value>True</value> </metadata> <metadata name="redrawtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>319, 17</value> + <value>433, 17</value> </metadata> <metadata name="display.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="processor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>437, 17</value> + <value>551, 17</value> </metadata> <metadata name="statusflasher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>541, 17</value> + <value>655, 17</value> </metadata> <metadata name="statusresetter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>661, 17</value> + <value>775, 17</value> </metadata> <metadata name="dockersspace.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> @@ -244,7 +244,10 @@ <value>True</value> </metadata> <metadata name="dockerscollapser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>781, 17</value> + <value>17, 56</value> + </metadata> + <metadata name="warnsTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> </metadata> <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> diff --git a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs index ff22f52dc4b64a27c6052be5af04aa8e34e43f45..f0e3dea4c1f0c5a2cec259dd7e22b33919a0b238 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs @@ -91,9 +91,9 @@ namespace CodeImp.DoomBuilder.BuilderModes // Set highlight association if(l != null) - highlightasso.Set(l.Tag, UniversalType.LinedefTag); + highlightasso.Set(new Vector2D((l.Start.Position + l.End.Position)/2), l.Tag, UniversalType.LinedefTag); else - highlightasso.Set(0, 0); + highlightasso.Set(new Vector2D(), 0, 0); // New association highlights something? if((l != null) && (l.Tag > 0)) completeredraw = true; @@ -102,9 +102,9 @@ namespace CodeImp.DoomBuilder.BuilderModes if(General.Map.Config.LineTagIndicatesSectors) { if(l != null) - association[0].Set(l.Tag, UniversalType.SectorTag); + association[0].Set(new Vector2D((l.Start.Position + l.End.Position)/2), l.Tag, UniversalType.SectorTag); else - association[0].Set(0, 0); + association[0].Set(new Vector2D(), 0, 0); } else { @@ -125,9 +125,9 @@ namespace CodeImp.DoomBuilder.BuilderModes // Make new association if(action != null) - association[i].Set(l.Args[i], action.Args[i].Type); + association[i].Set(new Vector2D((l.Start.Position + l.End.Position)/2), l.Args[i], action.Args[i].Type); else - association[i].Set(0, 0); + association[i].Set(new Vector2D(), 0, 0); // New association highlights something? if((association[i].type == UniversalType.SectorTag) || diff --git a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs index 13ea6bffb4d342fc412ebbe07d582f19bb41774b..67d13d8b55247f888ba7439ab6bcc13d9131c743 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs @@ -232,9 +232,9 @@ namespace CodeImp.DoomBuilder.BuilderModes // Set highlight association if(s != null) - highlightasso.Set(s.Tag, UniversalType.SectorTag); + highlightasso.Set(new Vector2D(s.BBox.X + s.BBox.Width/2, s.BBox.Y + s.BBox.Height/2), s.Tag, UniversalType.SectorTag); else - highlightasso.Set(0, 0); + highlightasso.Set(new Vector2D(), 0, 0); // New association highlights something? if((s != null) && (s.Tag > 0)) completeredraw = true; diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs index bda660f8097868bdbaf05eebc3039db974d3b808..b1c1e571dd8b1bf9578afd0248ca96608c56ce11 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs @@ -165,7 +165,7 @@ namespace CodeImp.DoomBuilder.BuilderModes //mxd if(General.Settings.GZShowEventLines) - renderArrows(GZBuilder.Data.LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings)); + renderer.RenderArrows(GZBuilder.Data.LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings), General.Colors.InfoLine); renderer.Finish(); } @@ -183,18 +183,6 @@ namespace CodeImp.DoomBuilder.BuilderModes renderer.Present(); } - - //mxd - private void renderArrows(List<Line3D> lines) { - foreach (Line3D l in lines) { - renderer.RenderLine(l.v1, l.v2, 0.6f, General.Colors.InfoLine, true); - float angle = l.GetAngle(); - //arrowhead - float scaler = 20f / renderer.Scale; - renderer.RenderLine(l.v2, new Vector2D(l.v2.x - scaler * (float)Math.Sin(angle - 0.52f), l.v2.y + scaler * (float)Math.Cos(angle - 0.52f)), 0.6f, General.Colors.InfoLine, true); - renderer.RenderLine(l.v2, new Vector2D(l.v2.x - scaler * (float)Math.Sin(angle + 0.52f), l.v2.y + scaler * (float)Math.Cos(angle + 0.52f)), 0.6f, General.Colors.InfoLine, true); - } - } // This highlights a new item protected void Highlight(Thing t) @@ -211,9 +199,9 @@ namespace CodeImp.DoomBuilder.BuilderModes // Set highlight association if(t != null) - highlightasso.Set(t.Tag, UniversalType.ThingTag); + highlightasso.Set(t.Position, t.Tag, UniversalType.ThingTag); else - highlightasso.Set(0, 0); + highlightasso.Set(new Vector2D(), 0, 0); // New association highlights something? if((t != null) && (t.Tag > 0)) completeredraw = true; @@ -235,9 +223,9 @@ namespace CodeImp.DoomBuilder.BuilderModes // Make new association if(action != null) - association[i].Set(t.Args[i], action.Args[i].Type); + association[i].Set(t.Position, t.Args[i], action.Args[i].Type); else - association[i].Set(0, 0); + association[i].Set(new Vector2D(), 0, 0); // New association highlights something? if((association[i].type == UniversalType.SectorTag) || diff --git a/Source/Plugins/BuilderModes/General/Association.cs b/Source/Plugins/BuilderModes/General/Association.cs index 6620dfc59614053d9bbc97038889dc92eb200b2c..c45bdae7da1c4b80b574d6d9ea75437a1652d03e 100644 --- a/Source/Plugins/BuilderModes/General/Association.cs +++ b/Source/Plugins/BuilderModes/General/Association.cs @@ -43,33 +43,39 @@ namespace CodeImp.DoomBuilder.BuilderModes { public int tag; public UniversalType type; + public Vector2D Center { get { return center; } } + private Vector2D center; // This sets up the association - public Association(int tag, int type) + public Association(Vector2D center, int tag, int type) { this.tag = tag; this.type = (UniversalType)type; + this.center = center; } // This sets up the association - public Association(int tag, UniversalType type) + public Association(Vector2D center, int tag, UniversalType type) { this.tag = tag; this.type = type; + this.center = center; } // This sets up the association - public void Set(int tag, int type) + public void Set(Vector2D center, int tag, int type) { this.tag = tag; this.type = (UniversalType)type; + this.center = center; } // This sets up the association - public void Set(int tag, UniversalType type) + public void Set(Vector2D center, int tag, UniversalType type) { this.tag = tag; this.type = type; + this.center = center; } // This compares an association diff --git a/Source/Plugins/BuilderModes/General/BuilderPlug.cs b/Source/Plugins/BuilderModes/General/BuilderPlug.cs index b2f2f0c605ef403b291c7c0153a42b2f5e7d70a5..6d849a215d7ef24049f823b35433dace7d9befc5 100644 --- a/Source/Plugins/BuilderModes/General/BuilderPlug.cs +++ b/Source/Plugins/BuilderModes/General/BuilderPlug.cs @@ -37,6 +37,7 @@ using CodeImp.DoomBuilder.Types; using CodeImp.DoomBuilder.Config; using CodeImp.DoomBuilder.Data; using CodeImp.DoomBuilder.Controls; +using CodeImp.DoomBuilder.GZBuilder.Geometry; #endregion @@ -487,14 +488,32 @@ namespace CodeImp.DoomBuilder.BuilderModes // Sectors? if(asso.type == UniversalType.SectorTag) { - foreach(Sector s in General.Map.Map.Sectors) - if(s.Tag == asso.tag) renderer.PlotSector(s, General.Colors.Indication); + List<Line3D> lines = new List<Line3D>(); //mxd + foreach(Sector s in General.Map.Map.Sectors) { + if(s.Tag == asso.tag) { + renderer.PlotSector(s, General.Colors.Indication); + if(General.Settings.GZShowEventLines) + lines.Add(new Line3D(asso.Center, new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2)));//mxd + } + } + + if(General.Settings.GZShowEventLines) + renderer.PlotArrows(lines, General.Colors.InfoLine);//mxd } // Linedefs? else if(asso.type == UniversalType.LinedefTag) { - foreach(Linedef l in General.Map.Map.Linedefs) - if(l.Tag == asso.tag) renderer.PlotLinedef(l, General.Colors.Indication); + List<Line3D> lines = new List<Line3D>(); //mxd + foreach(Linedef l in General.Map.Map.Linedefs) { + if(l.Tag == asso.tag) { + renderer.PlotLinedef(l, General.Colors.Indication); + if(General.Settings.GZShowEventLines) + lines.Add(new Line3D(asso.Center, new Vector2D((l.Start.Position + l.End.Position) / 2)));//mxd + } + } + + if(General.Settings.GZShowEventLines) + renderer.PlotArrows(lines, General.Colors.InfoLine);//mxd } } @@ -508,8 +527,16 @@ namespace CodeImp.DoomBuilder.BuilderModes // Things? if(asso.type == UniversalType.ThingTag) { - foreach(Thing t in General.Map.Map.Things) - if(t.Tag == asso.tag) renderer.RenderThing(t, General.Colors.Indication, 1.0f); + List<Line3D> lines = new List<Line3D>(); //mxd + foreach(Thing t in General.Map.Map.Things){ + if(t.Tag == asso.tag) { + renderer.RenderThing(t, General.Colors.Indication, 1.0f); + if(General.Settings.GZShowEventLines) + lines.Add(new Line3D(asso.Center, t.Position));//mxd + } + } + if(General.Settings.GZShowEventLines) + renderer.RenderArrows(lines, General.Colors.InfoLine);//mxd } } @@ -519,6 +546,8 @@ namespace CodeImp.DoomBuilder.BuilderModes { // Tag must be above zero if(asso.tag <= 0) return; + + List<Line3D> lines = new List<Line3D>(); //mxd // Doom style referencing to sectors? if(General.Map.Config.LineTagIndicatesSectors && (asso.type == UniversalType.SectorTag)) @@ -529,9 +558,16 @@ namespace CodeImp.DoomBuilder.BuilderModes // Any action on this line? if(l.Action > 0) { - if(l.Tag == asso.tag) renderer.PlotLinedef(l, General.Colors.Indication); + if(l.Tag == asso.tag) { + renderer.PlotLinedef(l, General.Colors.Indication); + + if(General.Settings.GZShowEventLines) //mxd + lines.Add(new Line3D(new Vector2D((l.Start.Position + l.End.Position) / 2), asso.Center)); //mxd + } } } + if(General.Settings.GZShowEventLines) + renderer.PlotArrows(lines, General.Colors.InfoLine); //mxd } else { @@ -542,13 +578,22 @@ namespace CodeImp.DoomBuilder.BuilderModes if((l.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(l.Action)) { LinedefActionInfo action = General.Map.Config.LinedefActions[l.Action]; - if((action.Args[0].Type == (int)asso.type) && (l.Args[0] == asso.tag)) renderer.PlotLinedef(l, General.Colors.Indication); - if((action.Args[1].Type == (int)asso.type) && (l.Args[1] == asso.tag)) renderer.PlotLinedef(l, General.Colors.Indication); - if((action.Args[2].Type == (int)asso.type) && (l.Args[2] == asso.tag)) renderer.PlotLinedef(l, General.Colors.Indication); - if((action.Args[3].Type == (int)asso.type) && (l.Args[3] == asso.tag)) renderer.PlotLinedef(l, General.Colors.Indication); - if((action.Args[4].Type == (int)asso.type) && (l.Args[4] == asso.tag)) renderer.PlotLinedef(l, General.Colors.Indication); + if( ((action.Args[0].Type == (int)asso.type) && (l.Args[0] == asso.tag)) || + ((action.Args[1].Type == (int)asso.type) && (l.Args[1] == asso.tag)) || + ((action.Args[2].Type == (int)asso.type) && (l.Args[2] == asso.tag)) || + ((action.Args[3].Type == (int)asso.type) && (l.Args[3] == asso.tag)) || + ((action.Args[4].Type == (int)asso.type) && (l.Args[4] == asso.tag)) ){ + + renderer.PlotLinedef(l, General.Colors.Indication); + + if(General.Settings.GZShowEventLines) //mxd + lines.Add(new Line3D(new Vector2D((l.Start.Position + l.End.Position) / 2), asso.Center)); + } } } + + if(General.Settings.GZShowEventLines) //mxd + renderer.PlotArrows(lines, General.Colors.InfoLine); } } @@ -559,6 +604,8 @@ namespace CodeImp.DoomBuilder.BuilderModes // Tag must be above zero if(asso.tag <= 0) return; + List<Line3D> lines = new List<Line3D>(); //mxd + // Things foreach(Thing t in General.Map.Map.Things) { @@ -566,13 +613,20 @@ namespace CodeImp.DoomBuilder.BuilderModes if((t.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(t.Action)) { LinedefActionInfo action = General.Map.Config.LinedefActions[t.Action]; - if((action.Args[0].Type == (int)asso.type) && (t.Args[0] == asso.tag)) renderer.RenderThing(t, General.Colors.Indication, 1.0f); - if((action.Args[1].Type == (int)asso.type) && (t.Args[1] == asso.tag)) renderer.RenderThing(t, General.Colors.Indication, 1.0f); - if((action.Args[2].Type == (int)asso.type) && (t.Args[2] == asso.tag)) renderer.RenderThing(t, General.Colors.Indication, 1.0f); - if((action.Args[3].Type == (int)asso.type) && (t.Args[3] == asso.tag)) renderer.RenderThing(t, General.Colors.Indication, 1.0f); - if((action.Args[4].Type == (int)asso.type) && (t.Args[4] == asso.tag)) renderer.RenderThing(t, General.Colors.Indication, 1.0f); + if( ((action.Args[0].Type == (int)asso.type) && (t.Args[0] == asso.tag)) || + ((action.Args[1].Type == (int)asso.type) && (t.Args[1] == asso.tag)) || + ((action.Args[2].Type == (int)asso.type) && (t.Args[2] == asso.tag)) || + ((action.Args[3].Type == (int)asso.type) && (t.Args[3] == asso.tag)) || + ((action.Args[4].Type == (int)asso.type) && (t.Args[4] == asso.tag)) ){ + renderer.RenderThing(t, General.Colors.Indication, 1.0f); + if(General.Settings.GZShowEventLines) //mxd + lines.Add(new Line3D(t.Position, asso.Center)); + } } } + + if(General.Settings.GZShowEventLines)//mxd + renderer.RenderArrows(lines, General.Colors.InfoLine); } #endregion