stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-20 10:53:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

GZDoom Builder 1.11:

Browse source 
Enhanced scripting workflow.
Thing and linedef arguments can now have default value in configuration files.
Fixed laggy visual camera movement on systems with big uptime.
Fixed incorrect alignment of Things with "hangs" flag in GZDoom Visual mode.
Fixed Editor crash when nodebuilder fails to build map. A window with error description will be shown instead.
Doom light levels were used even in maps in non-doom map format.

Tag Explorer plugin:
Elements list wasn't updated when map element was deleted.
Pugin wasn't disposed properly, which may led to Doom Builder 2 crash on map close.
Fixed plugin crash after opening another map.
Fixed unresponsive text entry in Filter text box.
Fixed plugin crash when Doom Builder can't determmine thing category ("UNKNOWN" category will be used instead).
This commit is contained in:
MaxED 2012-07-10 10:20:45 +00:00
parent fcd29375c8
commit 5cb573d938
52 changed files with 2654 additions and 2047 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
Build/Configurations/Includes/GZDoom_things.cfg
View file

@ -19,18 +19,22 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Intensity"; title = "Intensity";
default = 64;
} }
} }
9801 9801
@ -39,22 +43,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Start intensity"; title = "Start intensity";
default = 64;
} }
arg4 arg4
{ {
title = "End intensity"; title = "End intensity";
default = 32;
} }
} }
9802 9802
@ -63,22 +72,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Primary intensity"; title = "Primary intensity";
default = 64;
} }
arg4 arg4
{ {
title = "Secondary intensity"; title = "Secondary intensity";
default = 32;
} }
} }
9803 9803
@ -87,18 +101,22 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Intensity scale"; title = "Intensity scale";
default = 4;
} }
} }
9804 9804
@ -107,22 +125,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Minimal intensity"; title = "Minimal intensity";
default = 32;
} }
arg4 arg4
{ {
title = "Maximal intensity"; title = "Maximal intensity";
default = 64;
} }
} }
9810 9810
@ -131,18 +154,22 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Intensity"; title = "Intensity";
default = 64;
} }
} }
9811 9811
@ -151,22 +178,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Start intensity"; title = "Start intensity";
default = 32;
} }
arg4 arg4
{ {
title = "End intensity"; title = "End intensity";
default = 64;
} }
} }
9812 9812
@ -175,22 +207,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Primary intensity"; title = "Primary intensity";
default = 64;
} }
arg4 arg4
{ {
title = "Secondary intensity"; title = "Secondary intensity";
default = 32;
} }
} }
9813 9813
@ -199,18 +236,22 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Intensity scale"; title = "Intensity scale";
default = 4;
} }
} }
9814 9814
@ -219,22 +260,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Minimal intensity"; title = "Minimal intensity";
default = 32;
} }
arg4 arg4
{ {
title = "Maximal intensity"; title = "Maximal intensity";
default = 64;
} }
} }
9820 9820
@ -243,18 +289,22 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Radius"; title = "Radius";
default = 64;
} }
} }
9821 9821
@ -263,22 +313,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Start intensity"; title = "Start intensity";
default = 32;
} }
arg4 arg4
{ {
title = "End intensity"; title = "End intensity";
default = 64;
} }
} }
9822 9822
@ -287,22 +342,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Primary intensity"; title = "Primary intensity";
default = 32;
} }
arg4 arg4
{ {
title = "Secondary intensity"; title = "Secondary intensity";
default = 64;
} }
} }
9823 9823
@ -311,18 +371,22 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Intensity scale"; title = "Intensity scale";
default = 4;
} }
} }
9824 9824
@ -331,22 +395,27 @@ gzdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
title = "Minimal intensity"; title = "Minimal intensity";
default = 32;
} }
arg4 arg4
{ {
title = "Maximal intensity"; title = "Maximal intensity";
default = 64;
} }
} }
9825 = "Vavoom Light"; 9825 = "Vavoom Light";
@ -356,6 +425,7 @@ gzdoom
arg0 arg0
{ {
title = "Radius"; title = "Radius";
default = 16;
} }
} }
1503 1503
@ -364,18 +434,22 @@ gzdoom
arg0 arg0
{ {
title = "Radius"; title = "Radius";
default = 16;
} }
arg1 arg1
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg2 arg2
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg3 arg3
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
} }
} }

24
Build/Configurations/Includes/ZDoom_common.cfg
View file

@ -59,12 +59,6 @@ common
include("Boom_misc.cfg", "colormaps"); include("Boom_misc.cfg", "colormaps");
} }
// DEFAULT SECTOR BRIGHTNESS LEVELS
sectorbrightness
{
include("Doom_misc.cfg", "sectorbrightness");
}
// Generalized sector types // Generalized sector types
gen_sectortypes gen_sectortypes
{ {
@ -113,6 +107,12 @@ mapformat_doom
include("Boom_generalized.cfg", "gen_linedeftypes"); include("Boom_generalized.cfg", "gen_linedeftypes");
} }
// DEFAULT SECTOR BRIGHTNESS LEVELS
sectorbrightness
{
include("Doom_misc.cfg", "sectorbrightness");
}
// SECTOR TYPES // SECTOR TYPES
sectortypes sectortypes
{ {
@ -205,6 +205,12 @@ mapformat_hexen
// Generalized actions // Generalized actions
generalizedlinedefs = false; generalizedlinedefs = false;
// DEFAULT SECTOR BRIGHTNESS LEVELS
sectorbrightness
{
include("ZDoom_misc.cfg", "sectorbrightness");
}
// SECTOR TYPES // SECTOR TYPES
sectortypes sectortypes
{ {
@ -319,6 +325,12 @@ mapformat_udmf
// Generalized actions // Generalized actions
generalizedlinedefs = false; generalizedlinedefs = false;
// DEFAULT SECTOR BRIGHTNESS LEVELS
sectorbrightness
{
include("ZDoom_misc.cfg", "sectorbrightness");
}
// SECTOR TYPES // SECTOR TYPES
sectortypes sectortypes
{ {

10
Build/Configurations/Includes/ZDoom_misc.cfg
View file

@ -206,6 +206,11 @@ universalfields
add = "Additive"; add = "Additive";
} }
} }
arg0str
{
type = 2;
default = "";
}
} }
sidedef sidedef
@ -343,6 +348,11 @@ universalfields
type = 0; type = 0;
default = 0; default = 0;
} }
arg0str
{
type = 2;
default = "";
}
} }
sector sector

10
Build/Configurations/Includes/ZDoom_things.cfg
View file

@ -540,14 +540,17 @@ zdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 255;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 255;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 255;
} }
arg3 arg3
{ {
@ -560,14 +563,17 @@ zdoom
arg0 arg0
{ {
title = "Red"; title = "Red";
default = 128;
} }
arg1 arg1
{ {
title = "Green"; title = "Green";
default = 128;
} }
arg2 arg2
{ {
title = "Blue"; title = "Blue";
default = 128;
} }
} }
9041 9041
@ -759,10 +765,12 @@ zdoom
arg2 arg2
{ {
title = "X Scale (64=100%)"; title = "X Scale (64=100%)";
default = 64;
} }
arg3 arg3
{ {
title = "Y Scale (64=100%) "; title = "Y Scale (64=100%) ";
default = 64;
} }
arg4 arg4
{ {
@ -798,6 +806,7 @@ zdoom
arg0 arg0
{ {
title = "Flat Transparency"; title = "Flat Transparency";
default = 128;
} }
} }
@ -807,6 +816,7 @@ zdoom
arg0 arg0
{ {
title = "Flat Transparency"; title = "Flat Transparency";
default = 128;
} }
} }
} }

6
Help/Contents.hhc
View file

@ -233,9 +233,13 @@
<LI> <OBJECT type="text/sitemap"> <LI> <OBJECT type="text/sitemap">
<param name="Name" value="New settings"> <param name="Name" value="New settings">
<param name="Local" value="gz_settings.html"> <param name="Local" value="gz_settings.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Enhanced scripting workflow">
<param name="Local" value="gz_acsex.html">
</OBJECT> </OBJECT>
<UL> <UL>
</UL> </UL>
<LI> <OBJECT type="text/sitemap"> <LI> <OBJECT type="text/sitemap">
<param name="Name" value="New editing modes"> <param name="Name" value="New editing modes">
<param name="Local" value="gz_editmodes.html"> <param name="Local" value="gz_editmodes.html">

39
Help/gz_acsex.html Normal file
View file

@ -0,0 +1,39 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>GZDoom Builder features</title>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
</head>
<body>
<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="Template">
</object>
<div id="gz_title"><h1>Enhanced scripting workflow</h1></div>
<div id="contents">
<p><img style="float:left; margin-right:10px" src="gz_scripteditor.jpg"/><b>GZDoom Builder</b> includes several features to help you edit and assign scripts easier.</br></br>
Script editor now has "Script names" drop down, which allows you to view and select individual scripts faster.</br>
<h3>Pseudo-named scripts</h3>
If you add a comment after script opening brace like so:</br>
<code>script 1 (void)</br>
{ //My Pseudo-named script</br>
...</br>
}</br></code>
it will be used as script name in "Script names" drop down and in Thing and Linedef Edit windows drop downs (example script will be named as "[1] My Pseudo-named script").</br></br>
<b>Notice:</b> "Script names" drop down items are updated when you compile script successfully.
</p>
</div>
<div id="contents" style="clear: left">
<p><img style="float:left; margin-right:10px" src="gz_thing1.jpg"/><img style="float:left; clear: left; margin-right:10px" src="gz_thing2.jpg"/>Thing and Linedef scripts can now be set much easier.</br></br>
<b>Notice:</b> to remove named or regular script, clear script selector text box</p>
</div>
<div id="contents" style="clear: left">
<p><img style="float:left; margin-right:10px" src="gz_infoex.jpg"/>If a Thing or Linedef has named script, it will be shown in info panel.</p>
</div>
</body>

12
Help/gz_cfg_settings.html
View file

@ -18,8 +18,18 @@
</div> </div>
<div id="contents"> <div id="contents">
<p><b>basegame</b> - indicates on which game current configuration is based. Used to load game-specific GLDEFS lumps (DOOMDEFS, HTICDEFS, HEXNDEFS or STRFDEFS)</br>
<p><h3>General settings:</h3></br><b>basegame</b> - indicates on which game current configuration is based. Used to load game-specific GLDEFS lumps (DOOMDEFS, HTICDEFS, HEXNDEFS or STRFDEFS)</br>
<b>Possile values:</b> 0 (DOOM), 1 (HERETIC), 2 (HEXEN) or 3 (STRIFE).</br> <b>Possile values:</b> 0 (DOOM), 1 (HERETIC), 2 (HEXEN) or 3 (STRIFE).</br>
<b>Example:</b> <code>basegame = 0;</code></p> <b>Example:</b> <code>basegame = 0;</code></p>
<h3>Thing and linedef definition:</h3>
Default values can be set in Thing and Linedef argument definitions.</br>
<b>Example:</b> </br>
<code>arg1</br>
{</br>
title = "Speed";</br>
default = 100;</br>
}</br></code></p>
</div> </div>
</body> </body>

2
Help/gz_features.html
View file

@ -22,6 +22,7 @@
<li>Dynamic lights (all types) are rendered in Visual modes.</li> <li>Dynamic lights (all types) are rendered in Visual modes.</li>
<li>Dynamic lights defined in GLDEFS are rendered in Visual modes.</li> <li>Dynamic lights defined in GLDEFS are rendered in Visual modes.</li>
<li>Animated lights.</li> <li>Animated lights.</li>
<li><a href="gz_acsex.html">Enhanced scripting workflow</a>.</li>
<li>Partial <a href="gz_gldefs.html">GLDEFS</a> and <a href="gz_mapinfo.html">(Z)MAPINFO support.</a></li> <li>Partial <a href="gz_gldefs.html">GLDEFS</a> and <a href="gz_mapinfo.html">(Z)MAPINFO support.</a></li>
<li>Fog rendering (including colored fog in maps in UDMF format).</li> <li>Fog rendering (including colored fog in maps in UDMF format).</li>
<li><a href="gz_gldefs.html">MD2 and MD3 models</a> rendering in 2D and 3D modes.</li> <li><a href="gz_gldefs.html">MD2 and MD3 models</a> rendering in 2D and 3D modes.</li>
@ -30,6 +31,7 @@
<li><a href="gz_actions.html#newtestmap">"Test Map from current position"</a> feature.</li> <li><a href="gz_actions.html#newtestmap">"Test Map from current position"</a> feature.</li>
<li><a href="gz_settings.html">"Sync camera position between 2D and 3D modes"</a> feature.</li> <li><a href="gz_settings.html">"Sync camera position between 2D and 3D modes"</a> feature.</li>
<li><a href="gz_actions.html#movethingtocursor">"Place Things at cursor position in Visual Modes"</a> feature.</li> <li><a href="gz_actions.html#movethingtocursor">"Place Things at cursor position in Visual Modes"</a> feature.</li>
<li>PNG image format support.</li> <li>PNG image format support.</li>
<li><a href="gz_plug_colorpicker.html">Color Picker plugin.</a></li> <li><a href="gz_plug_colorpicker.html">Color Picker plugin.</a></li>
<li><a href="gz_plug_udmfcontrols.html">UDMF Controls plugin.</a></li> <li><a href="gz_plug_udmfcontrols.html">UDMF Controls plugin.</a></li>

BIN
Help/gz_infoex.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
Help/gz_scripteditor.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

BIN
Help/gz_thing1.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 56 KiB

BIN
Help/gz_thing2.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB

2
Source/Core/Builder.csproj
View file

@ -718,6 +718,7 @@
<Compile Include="GZBuilder\Data\GZDoomLight.cs" /> <Compile Include="GZBuilder\Data\GZDoomLight.cs" />
<Compile Include="GZBuilder\Data\MapInfo.cs" /> <Compile Include="GZBuilder\Data\MapInfo.cs" />
<Compile Include="GZBuilder\Data\ModeldefEntry.cs" /> <Compile Include="GZBuilder\Data\ModeldefEntry.cs" />
<Compile Include="GZBuilder\Data\ScriptItem.cs" />
<Compile Include="GZBuilder\Data\TextureData.cs" /> <Compile Include="GZBuilder\Data\TextureData.cs" />
<Compile Include="GZBuilder\Data\ThingBoundingBox.cs" /> <Compile Include="GZBuilder\Data\ThingBoundingBox.cs" />
<Compile Include="GZBuilder\GZDoom\GldefsParser.cs" /> <Compile Include="GZBuilder\GZDoom\GldefsParser.cs" />
@ -727,6 +728,7 @@
<Compile Include="GZBuilder\GZGeneral.cs" /> <Compile Include="GZBuilder\GZGeneral.cs" />
<Compile Include="GZBuilder\md3\GZModel.cs" /> <Compile Include="GZBuilder\md3\GZModel.cs" />
<Compile Include="GZBuilder\md3\ModelReader.cs" /> <Compile Include="GZBuilder\md3\ModelReader.cs" />
<Compile Include="GZBuilder\ZDoom\AcsParser.cs" />
<Compile Include="IO\DoomColormapReader.cs" /> <Compile Include="IO\DoomColormapReader.cs" />
<Compile Include="Map\SelectionType.cs" /> <Compile Include="Map\SelectionType.cs" />
<Compile Include="Map\MapElementCollection.cs" /> <Compile Include="Map\MapElementCollection.cs" />

12
Source/Core/Builder.sln
View file

@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagExplorer", "..\Plugins\T
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UDMFControls", "..\Plugins\UMDFControls\UDMFControls.csproj", "{2D11C828-295C-463A-8545-CA1AD6D51518}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UDMFControls", "..\Plugins\UMDFControls\UDMFControls.csproj", "{2D11C828-295C-463A-8545-CA1AD6D51518}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker", "..\Plugins\ColorPicker\ColorPicker.csproj", "{A4761900-0EA3-4FE4-A919-847FD5080EFC}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -71,6 +73,16 @@ Global
{2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.Build.0 = Release|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2D11C828-295C-463A-8545-CA1AD6D51518}.Release|x86.ActiveCfg = Release|Any CPU {2D11C828-295C-463A-8545-CA1AD6D51518}.Release|x86.ActiveCfg = Release|Any CPU
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Any CPU.ActiveCfg = Debug|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Mixed Platforms.Build.0 = Debug|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|x86.ActiveCfg = Debug|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|x86.Build.0 = Debug|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Any CPU.ActiveCfg = Release|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Mixed Platforms.ActiveCfg = Release|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Mixed Platforms.Build.0 = Release|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.ActiveCfg = Release|x86
{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

35
Source/Core/Compilers/NodesCompiler.cs
View file

@ -89,12 +89,16 @@ namespace CodeImp.DoomBuilder.Compilers
processinfo = new ProcessStartInfo(); processinfo = new ProcessStartInfo();
processinfo.Arguments = args; processinfo.Arguments = args;
processinfo.FileName = Path.Combine(this.tempdir.FullName, info.ProgramFile); processinfo.FileName = Path.Combine(this.tempdir.FullName, info.ProgramFile);
processinfo.CreateNoWindow = false; processinfo.CreateNoWindow = true; //mxd. was false
processinfo.ErrorDialog = false; processinfo.ErrorDialog = false;
processinfo.UseShellExecute = true; processinfo.UseShellExecute = false; //mxd. was true
processinfo.WindowStyle = ProcessWindowStyle.Hidden; processinfo.WindowStyle = ProcessWindowStyle.Hidden;
processinfo.WorkingDirectory = this.workingdir; processinfo.WorkingDirectory = this.workingdir;
//mxd
processinfo.RedirectStandardError = true;
processinfo.RedirectStandardOutput = true;
// Output info // Output info
General.WriteLogLine("Running compiler..."); General.WriteLogLine("Running compiler...");
General.WriteLogLine("Program: " + processinfo.FileName); General.WriteLogLine("Program: " + processinfo.FileName);
@ -112,11 +116,36 @@ namespace CodeImp.DoomBuilder.Compilers
return false; return false;
} }
//mxd
string outErr = process.StandardError.ReadToEnd();
string outMsg = process.StandardOutput.ReadToEnd();
// Wait for compiler to complete // Wait for compiler to complete
process.WaitForExit(); process.WaitForExit();
//mxd
bool errorsInNormalOurput = (outMsg.Length > 0 && outMsg.ToLowerInvariant().IndexOf("error") != -1);
//zdbsp actually writes building process here, not error info
bool errorsInErrorOutput = (outErr.Length > 0 && outErr.ToLowerInvariant().IndexOf("error") != -1);
deltatime = TimeSpan.FromTicks(process.ExitTime.Ticks - process.StartTime.Ticks); deltatime = TimeSpan.FromTicks(process.ExitTime.Ticks - process.StartTime.Ticks);
General.WriteLogLine("Compiler process has finished."); General.WriteLogLine("Compiler process has finished " + (errorsInNormalOurput || errorsInErrorOutput ? "with errors." : ".")); //mxd
General.WriteLogLine("Compile time: " + deltatime.TotalSeconds.ToString("########0.00") + " seconds"); General.WriteLogLine("Compile time: " + deltatime.TotalSeconds.ToString("########0.00") + " seconds");
//mxd
if (process.ExitCode > 0 || errorsInNormalOurput || errorsInErrorOutput) {
if (errorsInNormalOurput) {
ReportError(new CompilerError(outMsg));
General.WriteLogLine("Normal output: " + outMsg);
}
if (errorsInErrorOutput) {
ReportError(new CompilerError(outErr));
General.WriteLogLine("Error output: " + outErr);
}
return false;
}
return true; return true;
} }

7
Source/Core/Config/ArgumentInfo.cs
View file

@ -42,6 +42,8 @@ namespace CodeImp.DoomBuilder.Config
private bool used; private bool used;
private int type; private int type;
private EnumList enumlist; private EnumList enumlist;
//mxd
private object defaultValue;
#endregion #endregion
@ -51,6 +53,8 @@ namespace CodeImp.DoomBuilder.Config
public bool Used { get { return used; } } public bool Used { get { return used; } }
public int Type { get { return type; } } public int Type { get { return type; } }
public EnumList Enum { get { return enumlist; } } public EnumList Enum { get { return enumlist; } }
//mxd
public object DefaultValue { get { return defaultValue; } }
#endregion #endregion
@ -65,6 +69,9 @@ namespace CodeImp.DoomBuilder.Config
this.title = cfg.ReadSetting(argspath + ".arg" + istr + ".title", "Argument " + (argindex + 1)); this.title = cfg.ReadSetting(argspath + ".arg" + istr + ".title", "Argument " + (argindex + 1));
this.type = cfg.ReadSetting(argspath + ".arg" + istr + ".type", 0); this.type = cfg.ReadSetting(argspath + ".arg" + istr + ".type", 0);
//mxd
this.defaultValue = cfg.ReadSetting(argspath + ".arg" + istr + ".default", 0);
// Determine enum type // Determine enum type
EnumList enumlist = null; EnumList enumlist = null;
IDictionary argdic = cfg.ReadSetting(argspath + ".arg" + istr, new Hashtable()); IDictionary argdic = cfg.ReadSetting(argspath + ".arg" + istr, new Hashtable());

14
Source/Core/Controls/ArgumentBox.cs
View file

@ -41,6 +41,8 @@ namespace CodeImp.DoomBuilder.Controls
private TypeHandler typehandler; private TypeHandler typehandler;
private bool ignorebuttonchange = false; private bool ignorebuttonchange = false;
//mxd
private ArgumentInfo arginfo;
#endregion #endregion
@ -171,7 +173,9 @@ namespace CodeImp.DoomBuilder.Controls
// This sets up the control for a specific argument // This sets up the control for a specific argument
public void Setup(ArgumentInfo arginfo) public void Setup(ArgumentInfo arginfo)
{ {
int oldvalue = 0; this.arginfo = arginfo; //mxd
int oldvalue = 0;
// Get the original value // Get the original value
if(typehandler != null) oldvalue = typehandler.GetIntValue(); if(typehandler != null) oldvalue = typehandler.GetIntValue();
@ -225,6 +229,14 @@ namespace CodeImp.DoomBuilder.Controls
combobox_Validating(this, new CancelEventArgs()); combobox_Validating(this, new CancelEventArgs());
} }
//mxd. this sets default value
public void SetDefaultValue() {
typehandler.SetDefaultValue();
combobox.SelectedItem = null;
combobox.Text = typehandler.GetStringValue();
combobox_Validating(this, new CancelEventArgs());
}
// This clears the value // This clears the value
public void ClearValue() public void ClearValue()
{ {

43
Source/Core/Controls/FieldsEditorControl.cs
View file

@ -33,6 +33,7 @@ using System.Drawing.Imaging;
using System.Drawing.Drawing2D; using System.Drawing.Drawing2D;
using CodeImp.DoomBuilder.Map; using CodeImp.DoomBuilder.Map;
using System.Globalization; using System.Globalization;
using CodeImp.DoomBuilder.Types;
#endregion #endregion
@ -238,6 +239,48 @@ namespace CodeImp.DoomBuilder.Controls
Sort(); Sort();
} }
//mxd
public object GetValue(string name) {
//have required row?
foreach (DataGridViewRow row in fieldslist.Rows) {
// Row is a field?
if (row is FieldsEditorRow) {
FieldsEditorRow frow = row as FieldsEditorRow;
// Row name matches with field
if (frow.Name == name) {
// Apply value of field to row
if (frow.IsDefined && !frow.IsEmpty)
return frow.GetResult(null);
return null;
}
}
}
return null;
}
//mxd
public void SetValue(string name, object value, UniversalType type) {
//have required row?
foreach (DataGridViewRow row in fieldslist.Rows) {
// Row is a field?
if (row is FieldsEditorRow) {
FieldsEditorRow frow = row as FieldsEditorRow;
// Row name matches with field
if (frow.Name == name) {
// Apply value of field to row
frow.Define(value);
return;
}
}
}
//no such row... let's add it
FieldsEditorRow newfrow = new FieldsEditorRow(fieldslist, name, (int)type, value);
fieldslist.Rows.Insert(fieldslist.Rows.Count - 1, newfrow);
}
// This applies the current fields to a UniFields object // This applies the current fields to a UniFields object
public void Apply(UniFields tofields) public void Apply(UniFields tofields)
{ {

16
Source/Core/Controls/LinedefInfoPanel.cs
View file

@ -29,6 +29,7 @@ using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Config; using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Types; using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.IO; using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.GZBuilder;
#endregion #endregion
@ -114,8 +115,11 @@ namespace CodeImp.DoomBuilder.Controls
tag.Text = l.Tag.ToString(); tag.Text = l.Tag.ToString();
unpegged.Text = peggedness; unpegged.Text = peggedness;
//mxd
bool hasArg0Str = General.Map.UDMF && Array.IndexOf(GZGeneral.ACS_SPECIALS, l.Action) != -1 && l.Fields.ContainsKey("arg0str");
// Arguments // Arguments
arglbl1.Text = act.Args[0].Title + ":"; arglbl1.Text = hasArg0Str ? "Script name:" : act.Args[0].Title + ":"; //mxd
arglbl2.Text = act.Args[1].Title + ":"; arglbl2.Text = act.Args[1].Title + ":";
arglbl3.Text = act.Args[2].Title + ":"; arglbl3.Text = act.Args[2].Title + ":";
arglbl4.Text = act.Args[3].Title + ":"; arglbl4.Text = act.Args[3].Title + ":";
@ -130,8 +134,14 @@ namespace CodeImp.DoomBuilder.Controls
arg3.Enabled = act.Args[2].Used; arg3.Enabled = act.Args[2].Used;
arg4.Enabled = act.Args[3].Used; arg4.Enabled = act.Args[3].Used;
arg5.Enabled = act.Args[4].Used; arg5.Enabled = act.Args[4].Used;
th = General.Types.GetArgumentHandler(act.Args[0]);
th.SetValue(l.Args[0]); arg1.Text = th.GetStringValue(); //mxd
if (hasArg0Str) {
arg1.Text = '"' + l.Fields["arg0str"].Value.ToString() + '"';
} else {
th = General.Types.GetArgumentHandler(act.Args[0]);
th.SetValue(l.Args[0]); arg1.Text = th.GetStringValue();
}
th = General.Types.GetArgumentHandler(act.Args[1]); th = General.Types.GetArgumentHandler(act.Args[1]);
th.SetValue(l.Args[1]); arg2.Text = th.GetStringValue(); th.SetValue(l.Args[1]); arg2.Text = th.GetStringValue();
th = General.Types.GetArgumentHandler(act.Args[2]); th = General.Types.GetArgumentHandler(act.Args[2]);

18
Source/Core/Controls/ScriptDocumentTab.cs
View file

@ -40,7 +40,8 @@ namespace CodeImp.DoomBuilder.Controls
{ {
#region ================== Constants #region ================== Constants
private const int EDITOR_BORDER_TOP = 8; private const int NAVIGATOR_BORDER_TOP = 8; //mxd
private const int EDITOR_BORDER_TOP = 33;
private const int EDITOR_BORDER_BOTTOM = 4; private const int EDITOR_BORDER_BOTTOM = 4;
private const int EDITOR_BORDER_LEFT = 4; private const int EDITOR_BORDER_LEFT = 4;
private const int EDITOR_BORDER_RIGHT = 4; private const int EDITOR_BORDER_RIGHT = 4;
@ -51,6 +52,8 @@ namespace CodeImp.DoomBuilder.Controls
// The script edit control // The script edit control
protected ScriptEditorControl editor; protected ScriptEditorControl editor;
//mxd
protected ComboBox navigator;
// Derived classes must set this! // Derived classes must set this!
protected ScriptConfiguration config; protected ScriptConfiguration config;
@ -83,6 +86,17 @@ namespace CodeImp.DoomBuilder.Controls
// Keep panel // Keep panel
this.panel = panel; this.panel = panel;
//mxd
navigator = new ComboBox();
navigator.Location = new Point(EDITOR_BORDER_LEFT, NAVIGATOR_BORDER_TOP);
navigator.Width = this.ClientSize.Width - EDITOR_BORDER_LEFT - EDITOR_BORDER_RIGHT;
navigator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
navigator.DropDownStyle = ComboBoxStyle.DropDownList;
navigator.Name = "navigator";
navigator.TabStop = true;
navigator.TabIndex = 0;
this.Controls.Add(navigator);
// Make the script control // Make the script control
editor = new ScriptEditorControl(); editor = new ScriptEditorControl();
editor.Location = new Point(EDITOR_BORDER_LEFT, EDITOR_BORDER_TOP); editor.Location = new Point(EDITOR_BORDER_LEFT, EDITOR_BORDER_TOP);
@ -91,7 +105,7 @@ namespace CodeImp.DoomBuilder.Controls
editor.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; editor.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
editor.Name = "editor"; editor.Name = "editor";
editor.TabStop = true; editor.TabStop = true;
editor.TabIndex = 0; editor.TabIndex = 1;
this.Controls.Add(editor); this.Controls.Add(editor);
// Bind events // Bind events

13
Source/Core/Controls/ScriptEditorPanel.cs
View file

@ -137,7 +137,18 @@ namespace CodeImp.DoomBuilder.Controls
} }
// Select the first tab // Select the first tab
if(tabs.TabPages.Count > 0) tabs.SelectedIndex = 0; //if(tabs.TabPages.Count > 0) tabs.SelectedIndex = 0;
//mxd. Select "Scripts" tab, because that's what user will want 99% of time
if (tabs.TabPages.Count > 0) {
foreach (TabPage p in tabs.TabPages) {
if (p.Text == "SCRIPTS") {
tabs.SelectedTab = p;
break;
}
}
if (tabs.SelectedIndex == -1) tabs.SelectedIndex = 0;
}
// If the map has remembered any compile errors, then show them // If the map has remembered any compile errors, then show them
ShowErrors(General.Map.Errors); ShowErrors(General.Map.Errors);

60
Source/Core/Controls/ScriptLumpDocumentTab.cs
View file

@ -20,6 +20,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using Microsoft.Win32; using Microsoft.Win32;
@ -31,6 +32,8 @@ using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.IO; using CodeImp.DoomBuilder.IO;
using System.IO; using System.IO;
using CodeImp.DoomBuilder.Compilers; using CodeImp.DoomBuilder.Compilers;
//mxd
using CodeImp.DoomBuilder.GZBuilder.Data;
#endregion #endregion
@ -91,6 +94,14 @@ namespace CodeImp.DoomBuilder.Controls
SetTitle(General.Map.Options.CurrentName); SetTitle(General.Map.Options.CurrentName);
else else
SetTitle(this.lumpname.ToUpper()); SetTitle(this.lumpname.ToUpper());
//mxd
if (this.Text == "SCRIPTS") {
updateNavigator();
navigator.SelectedIndexChanged += new EventHandler(navigator_SelectedIndexChanged);
}else{
navigator.Enabled = false;
}
} }
// Disposer // Disposer
@ -103,6 +114,37 @@ namespace CodeImp.DoomBuilder.Controls
#region ================== Methods #region ================== Methods
//mxd
private void updateNavigator() {
string selectedItem = "";
int selectedIndex = 0;
if (navigator.SelectedIndex != -1) selectedItem = navigator.Text;
navigator.Items.Clear();
//add named scripts
int i = 0;
if (General.Map.UDMF) {
ScriptItem[] namedScripts = new ScriptItem[General.Map.NamedScripts.Count];
foreach (ScriptItem si in General.Map.NamedScripts) {
namedScripts[i++] = si;
if (si.Name == selectedItem) selectedIndex = i - 1;
}
navigator.Items.AddRange(namedScripts);
}
//add numbered scripts
ScriptItem[] numberedScripts = new ScriptItem[General.Map.NumberedScripts.Count];
int c = 0;
foreach (ScriptItem si in General.Map.NumberedScripts) {
numberedScripts[c++] = si;
if (si.Name == selectedItem) selectedIndex = i - 1 + c;
}
navigator.Items.AddRange(numberedScripts);
if (navigator.Items.Count > 0) navigator.SelectedIndex = selectedIndex;
}
// Compile script // Compile script
public override void Compile() public override void Compile()
{ {
@ -114,6 +156,14 @@ namespace CodeImp.DoomBuilder.Controls
// Feed errors to panel // Feed errors to panel
panel.ShowErrors(General.Map.Errors); panel.ShowErrors(General.Map.Errors);
//mxd
if (General.Map.Errors.Count == 0) {
General.Map.UpdateScriptNames();
navigator.SelectedIndexChanged -= navigator_SelectedIndexChanged;
updateNavigator();
navigator.SelectedIndexChanged += new EventHandler(navigator_SelectedIndexChanged);
}
} }
// Implicit save // Implicit save
@ -136,6 +186,16 @@ namespace CodeImp.DoomBuilder.Controls
#region ================== Events #region ================== Events
//mxd
private void navigator_SelectedIndexChanged(object sender, EventArgs e) {
if (navigator.SelectedItem is ScriptItem) {
ScriptItem si = navigator.SelectedItem as ScriptItem;
editor.EnsureLineVisible(editor.LineFromPosition(si.SelectionStart));
editor.SelectionStart = si.SelectionStart;
editor.SelectionEnd = si.SelectionEnd;
}
}
#endregion #endregion
} }
} }

18
Source/Core/Controls/ThingInfoPanel.cs
View file

@ -30,6 +30,9 @@ using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Config; using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Types; using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.IO; using CodeImp.DoomBuilder.IO;
//mxd
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder;
#endregion #endregion
@ -166,7 +169,10 @@ namespace CodeImp.DoomBuilder.Controls
// Arguments // Arguments
if(act != null) if(act != null)
{ {
arglbl1.Text = act.Args[0].Title + ":"; //mxd
bool hasArg0Str = General.Map.UDMF && Array.IndexOf(GZGeneral.ACS_SPECIALS, t.Action) != -1 && t.Fields.ContainsKey("arg0str");
arglbl1.Text = hasArg0Str ? "Script name:" : act.Args[0].Title + ":"; //mxd
arglbl2.Text = act.Args[1].Title + ":"; arglbl2.Text = act.Args[1].Title + ":";
arglbl3.Text = act.Args[2].Title + ":"; arglbl3.Text = act.Args[2].Title + ":";
arglbl4.Text = act.Args[3].Title + ":"; arglbl4.Text = act.Args[3].Title + ":";
@ -181,8 +187,14 @@ namespace CodeImp.DoomBuilder.Controls
arg3.Enabled = act.Args[2].Used; arg3.Enabled = act.Args[2].Used;
arg4.Enabled = act.Args[3].Used; arg4.Enabled = act.Args[3].Used;
arg5.Enabled = act.Args[4].Used; arg5.Enabled = act.Args[4].Used;
th = General.Types.GetArgumentHandler(act.Args[0]);
th.SetValue(t.Args[0]); arg1.Text = th.GetStringValue(); //mxd
if (hasArg0Str) {
arg1.Text = '"' + t.Fields["arg0str"].Value.ToString() + '"';
} else {
th = General.Types.GetArgumentHandler(act.Args[0]);
th.SetValue(t.Args[0]); arg1.Text = th.GetStringValue();
}
th = General.Types.GetArgumentHandler(act.Args[1]); th = General.Types.GetArgumentHandler(act.Args[1]);
th.SetValue(t.Args[1]); arg2.Text = th.GetStringValue(); th.SetValue(t.Args[1]); arg2.Text = th.GetStringValue();
th = General.Types.GetArgumentHandler(act.Args[2]); th = General.Types.GetArgumentHandler(act.Args[2]);

41
Source/Core/GZBuilder/Data/GZDoomLight.cs
View file

@ -17,47 +17,6 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
Color = new Color3(); Color = new Color3();
Offset = new Vector3(); Offset = new Vector3();
} }
public static int[] GetDefaultLightSettings(int type) {
int light_id = Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, type);
if (light_id != -1) {
int[] args = new int[5];
if (light_id == (int)GZDoomLightType.VAVOOM_COLORED) {
args[0] = 16;
args[1] = 255;
args[2] = 255;
args[3] = 255;
} else if (light_id == (int)GZDoomLightType.VAVOOM) {
args[0] = 16;
} else {
int n;
if (light_id < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[0]) {
n = 0;
} else if (light_id < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[1]) {
n = 10;
} else {
n = 20;
}
light_id = type - 9800 - n;
args[0] = 255;
args[1] = 255;
args[2] = 255;
if (light_id == (int)GZDoomLightType.SECTOR)
args[3] = 4;
else
args[3] = 64;
if (Array.IndexOf(GZBuilder.GZGeneral.GZ_ANIMATED_LIGHT_TYPES, light_id) != -1) {
args[4] = 32;
}
}
return args;
}
return null;
}
} }
public enum GZDoomLightType : int public enum GZDoomLightType : int

34
Source/Core/GZBuilder/Data/ScriptItem.cs Normal file
View file

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace CodeImp.DoomBuilder.GZBuilder.Data {
public sealed class ScriptItem : Object {
private string name;
private int index;
private int selectionStart;
private int selectionEnd;
public string Name { get { return name; } }
public int Index { get { return index; } }
public int SelectionStart { get { return selectionStart; } }
public int SelectionEnd { get { return selectionEnd; } }
public ScriptItem(int index, string name, int selectionStart, int selectionEnd) {
this.name = name;
this.index = index;
this.selectionStart = selectionStart;
this.selectionEnd = selectionEnd;
}
public ScriptItem(int index, string name) {
this.name = name;
this.index = index;
}
public override string ToString() {
return name;
}
}
}

14
Source/Core/GZBuilder/GZGeneral.cs
View file

@ -27,10 +27,12 @@ namespace CodeImp.DoomBuilder.GZBuilder
private static int[] gzAnimatedLightTypes = { (int)GZDoomLightType.FLICKER, (int)GZDoomLightType.RANDOM, (int)GZDoomLightType.PULSE }; private static int[] gzAnimatedLightTypes = { (int)GZDoomLightType.FLICKER, (int)GZDoomLightType.RANDOM, (int)GZDoomLightType.PULSE };
public static int[] GZ_ANIMATED_LIGHT_TYPES { get { return gzAnimatedLightTypes; } } public static int[] GZ_ANIMATED_LIGHT_TYPES { get { return gzAnimatedLightTypes; } }
public static bool UDMF; //asc script action specials
private static int[] acsSpecials = { 80, 81, 82, 83, 84, 85, 226 };
public static int[] ACS_SPECIALS { get { return acsSpecials; } }
//version //version
public const float Version = 1.10f; public const float Version = 1.11f;
//debug console //debug console
#if DEBUG #if DEBUG
@ -52,14 +54,6 @@ namespace CodeImp.DoomBuilder.GZBuilder
#endif #endif
} }
public static void OnMapOpenEnd() {
UDMF = (General.Map.Config.FormatInterface == "UniversalMapSetIO");
General.MainWindow.UpdateGZDoomPannel();
//dbg
//GZBuilder.GZGeneral.Trace("GameConfiguration: loaded gametype " + General.Map.Config.GameType);
}
public static void OnReloadResources() { public static void OnReloadResources() {
#if DEBUG #if DEBUG
((ConsoleDocker)console.Control).Clear(); ((ConsoleDocker)console.Control).Clear();

79
Source/Core/GZBuilder/ZDoom/AcsParser.cs Normal file
View file

@ -0,0 +1,79 @@
using System;
using System.IO;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using CodeImp.DoomBuilder.ZDoom;
using CodeImp.DoomBuilder.GZBuilder.Data;
namespace CodeImp.DoomBuilder.GZBuilder.ZDoom
{
public class AcsParser : ZDTextParser
{
private List<ScriptItem> namedScripts;
private List<ScriptItem> numberedScripts;
public List<ScriptItem> NamedScripts { get { return namedScripts; } }
public List<ScriptItem> NumberedScripts { get { return numberedScripts; } }
public AcsParser() {
namedScripts = new List<ScriptItem>();
numberedScripts = new List<ScriptItem>();
}
public override bool Parse(Stream stream, string sourcefilename) {
base.Parse(stream, sourcefilename);
// Continue until at the end of the stream
while (SkipWhitespace(true)) {
string token = ReadToken();
if (!string.IsNullOrEmpty(token)) {
token = token.ToLowerInvariant();
if (token == "script") {
int startPos = (int)stream.Position - 7;
SkipWhitespace(true);
token = ReadToken();
//is it named script?
if (token.IndexOf('"') != -1) {
token = StripTokenQuotes(token);
ScriptItem i = new ScriptItem(0, token, startPos, (int)stream.Position-1);
namedScripts.Add(i);
} else { //should be numbered script
int n = 0;
if (int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out n)) {
int endPos = (int)stream.Position - 1;
//now find opening brace
do {
SkipWhitespace(true);
token = ReadToken();
} while (token != "{");
token = ReadLine();
string name = "";
if (token.Length > 0) {
int commentStart = token.IndexOf("//");
if (commentStart != -1) { //found comment
commentStart += 2;
name = token.Substring(commentStart, token.Length - commentStart);
}
}
name = (name != "" ? "[" + n + "] " + name : "Script " + n);
ScriptItem i = new ScriptItem(n, name, startPos, endPos);
numberedScripts.Add(i);
}
}
}
}
}
return true;
}
}
}

102
Source/Core/General/Clock.cs
View file

@ -14,126 +14,36 @@
#endregion #endregion
#region ================== Namespaces
using System; using System;
using System.Collections; using SlimDX;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Runtime.InteropServices;
using System.Diagnostics;
#endregion
namespace CodeImp.DoomBuilder namespace CodeImp.DoomBuilder
{ {
public class Clock public class Clock
{ {
#region ================== Declarations
//#if !LINUX
[DllImport("kernel32.dll")]
private static extern short QueryPerformanceCounter(out long x);
[DllImport("kernel32.dll")]
private static extern short QueryPerformanceFrequency(out long x);
//#endif
#endregion
#region ================== Constants
#endregion
#region ================== Variables
// Settings
private double currenttime;
// Disposing // Disposing
private bool isdisposed = false; private bool isdisposed = false;
#endregion
#region ================== Properties
// Settings
public double CurrentTime { get { return currenttime; } }
// Disposing // Disposing
public bool IsDisposed { get { return isdisposed; } } public bool IsDisposed { get { return isdisposed; } }
#endregion
#region ================== Constructor / Disposer
// Constructor // Constructor
public Clock() public Clock(){
{
// We have no destructor // We have no destructor
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
// Disposer // Disposer
public void Dispose() public void Dispose(){
{
// Not already disposed? // Not already disposed?
if(!isdisposed) if(!isdisposed) {
{
// Clean up
// Done
isdisposed = true; isdisposed = true;
} }
} }
#endregion
#region ================== Methods
// This queries the system for the current time // This queries the system for the current time
public double GetCurrentTime() public double GetCurrentTime(){
{ return SlimDX.Configuration.Timer.ElapsedMilliseconds;
// Only windows has QPC
//#if !LINUX
long timefrequency;
// Get the high resolution clock frequency
if(QueryPerformanceFrequency(out timefrequency) == 0)
{
// No high resolution clock available
currenttime = (double)Environment.TickCount;
}
else
{
long timecount;
// Get the high resolution count
QueryPerformanceCounter(out timecount);
// Calculate high resolution time in milliseconds
// TODO: It seems there is a loss of precision here when the
// result of this math is assigned to currenttime, WHY?!
currenttime = (double)timecount / (double)timefrequency * (double)1000.0;
}
/*
#else
// In LINUX always use standard clock
currenttime = (double)Environment.TickCount;
#endif
*/
// Return the current time
return currenttime;
} }
#endregion
} }
} }

9
Source/Core/General/General.cs
View file

@ -671,7 +671,7 @@ namespace CodeImp.DoomBuilder
General.WriteLogLine("Creating types manager..."); General.WriteLogLine("Creating types manager...");
types = new TypesManager(); types = new TypesManager();
//mxd. init gzdoombuilder //mxd. init gzdoom builder
GZBuilder.GZGeneral.Init(); GZBuilder.GZGeneral.Init();
// Do auto map loading when window is delayed // Do auto map loading when window is delayed
@ -1019,6 +1019,8 @@ namespace CodeImp.DoomBuilder
mainwindow.RedrawDisplay(); mainwindow.RedrawDisplay();
mainwindow.UpdateThingsFilters(); mainwindow.UpdateThingsFilters();
mainwindow.UpdateInterface(); mainwindow.UpdateInterface();
//mxd
mainwindow.UpdateGZDoomPannel();
mainwindow.HideInfo(); mainwindow.HideInfo();
if(errorlogger.IsErrorAdded) if(errorlogger.IsErrorAdded)
@ -1068,6 +1070,8 @@ namespace CodeImp.DoomBuilder
mainwindow.RedrawDisplay(); mainwindow.RedrawDisplay();
mainwindow.HideInfo(); mainwindow.HideInfo();
mainwindow.UpdateThingsFilters(); mainwindow.UpdateThingsFilters();
//mxd
mainwindow.UpdateGZDoomPannel();
mainwindow.UpdateInterface(); mainwindow.UpdateInterface();
mainwindow.DisplayReady(); mainwindow.DisplayReady();
General.WriteLogLine("Map unload done"); General.WriteLogLine("Map unload done");
@ -1104,6 +1108,9 @@ namespace CodeImp.DoomBuilder
// Open map file // Open map file
OpenMapFile(openfile.FileName, null); OpenMapFile(openfile.FileName, null);
//mxd
mainwindow.UpdateGZDoomPannel();
} }
openfile.Dispose(); openfile.Dispose();

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

File diff suppressed because it is too large Load diff

4
Source/Core/Plugins/Plug.cs
View file

@ -188,13 +188,13 @@ namespace CodeImp.DoomBuilder.Plugins
/// <summary> /// <summary>
/// Occurs before test map is launched. Return false if map launch is not desired. /// Occurs before test map is launched. Return false if map launch is not desired.
/// </summary> /// </summary>
public virtual bool OnMapTestBegin() { return true; } //public virtual bool OnMapTestBegin() { return true; }
//mxd //mxd
/// <summary> /// <summary>
/// Occurs after game engine is closed. /// Occurs after game engine is closed.
/// </summary> /// </summary>
public virtual void OnMapTestEnd() { } //public virtual void OnMapTestEnd() { }
/// <summary> /// <summary>
/// Occurs before the MapSet is changed. This means that the active MapSet will be disposed and changed to a new one. /// Occurs before the MapSet is changed. This means that the active MapSet will be disposed and changed to a new one.

4
Source/Core/Plugins/PluginManager.cs
View file

@ -303,7 +303,7 @@ namespace CodeImp.DoomBuilder.Plugins
public void OnPresentDisplayBegin() { foreach(Plugin p in plugins) p.Plug.OnPresentDisplayBegin(); } public void OnPresentDisplayBegin() { foreach(Plugin p in plugins) p.Plug.OnPresentDisplayBegin(); }
//mxd. test map events //mxd. test map events
public bool OnMapTestBegin() { /*public bool OnMapTestBegin() {
bool canLaunch; bool canLaunch;
foreach (Plugin p in plugins) { foreach (Plugin p in plugins) {
canLaunch = p.Plug.OnMapTestBegin(); canLaunch = p.Plug.OnMapTestBegin();
@ -311,7 +311,7 @@ namespace CodeImp.DoomBuilder.Plugins
} }
return true; return true;
} }
public void OnMapTestEnd() { foreach (Plugin p in plugins) p.Plug.OnMapTestEnd(); } public void OnMapTestEnd() { foreach (Plugin p in plugins) p.Plug.OnMapTestEnd(); }*/
#endregion #endregion
} }

5
Source/Core/Rendering/Renderer3D.cs
View file

@ -1097,10 +1097,7 @@ namespace CodeImp.DoomBuilder.Rendering
//mxd. returns true if sector has fog color //mxd. returns true if sector has fog color
private bool getFogColor(Sector sector, out Color4 color) { private bool getFogColor(Sector sector, out Color4 color) {
/*if(sector.Fields == null){ if (General.Map.UDMF && sector.Fields.ContainsKey("fadecolor")) {
color = new Color4(); //black
return false;
} else*/ if (GZBuilder.GZGeneral.UDMF && sector.Fields.ContainsKey("fadecolor")) {
color = new Color4((int)sector.Fields["fadecolor"].Value); color = new Color4((int)sector.Fields["fadecolor"].Value);
return true; return true;
} else if (General.Map.Data.MapInfo.HasOutsideFogColor && sector.CeilTexture == General.Map.Config.SkyFlatName) { } else if (General.Map.Data.MapInfo.HasOutsideFogColor && sector.CeilTexture == General.Map.Config.SkyFlatName) {

BIN
Source/Core/Resources/Splash3_trans.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 229 KiB

14
Source/Core/Types/IntegerHandler.cs
View file

@ -25,6 +25,7 @@ using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Data; using CodeImp.DoomBuilder.Data;
using System.IO; using System.IO;
using System.Diagnostics; using System.Diagnostics;
using CodeImp.DoomBuilder.Config;
#endregion #endregion
@ -40,6 +41,7 @@ namespace CodeImp.DoomBuilder.Types
#region ================== Variables #region ================== Variables
private int value; private int value;
private int defaultValue; //mxd
#endregion #endregion
@ -49,6 +51,12 @@ namespace CodeImp.DoomBuilder.Types
#region ================== Methods #region ================== Methods
//mxd
public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) {
defaultValue = (int)arginfo.DefaultValue;
base.SetupArgument(attr, arginfo);
}
public override void SetValue(object value) public override void SetValue(object value)
{ {
int result; int result;
@ -83,6 +91,10 @@ namespace CodeImp.DoomBuilder.Types
} }
} }
public override void SetDefaultValue() {
value = defaultValue;
}
public override object GetValue() public override object GetValue()
{ {
return this.value; return this.value;
@ -90,7 +102,7 @@ namespace CodeImp.DoomBuilder.Types
public override int GetIntValue() public override int GetIntValue()
{ {
return this.value; return this.value;
} }
public override string GetStringValue() public override string GetStringValue()

2
Source/Core/Types/StringHandler.cs
View file

@ -64,7 +64,7 @@ namespace CodeImp.DoomBuilder.Types
public override void SetValue(object value) public override void SetValue(object value)
{ {
if(value != null) if(value != null)
this.value = value.ToString(); this.value = value.ToString().Replace("\"", ""); //mxd
else else
this.value = ""; this.value = "";
} }

5
Source/Core/Types/TypeHandler.cs
View file

@ -133,6 +133,11 @@ namespace CodeImp.DoomBuilder.Types
// How the value is actually validated and stored is up to the implementation // How the value is actually validated and stored is up to the implementation
public abstract void SetValue(object value); public abstract void SetValue(object value);
//mxd. this should replace current value with default one
public virtual void SetDefaultValue() {
throw new NotSupportedException("Override this method to support default value for this type");
}
// This must return the value as one of the primitive data types // This must return the value as one of the primitive data types
// supported by UDMF: int, string, float or bool // supported by UDMF: int, string, float or bool
public abstract object GetValue(); public abstract object GetValue();

48
Source/Core/Windows/LinedefEditForm.Designer.cs generated
View file

@ -45,6 +45,8 @@ namespace CodeImp.DoomBuilder.Windows
this.apply = new System.Windows.Forms.Button(); this.apply = new System.Windows.Forms.Button();
this.actiongroup = new System.Windows.Forms.GroupBox(); this.actiongroup = new System.Windows.Forms.GroupBox();
this.argspanel = new System.Windows.Forms.Panel(); this.argspanel = new System.Windows.Forms.Panel();
this.arg0str = new System.Windows.Forms.ComboBox();
this.cbArgStr = new System.Windows.Forms.CheckBox();
this.arg2 = new CodeImp.DoomBuilder.Controls.ArgumentBox(); this.arg2 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
this.arg1 = new CodeImp.DoomBuilder.Controls.ArgumentBox(); this.arg1 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
this.arg0 = new CodeImp.DoomBuilder.Controls.ArgumentBox(); this.arg0 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
@ -282,26 +284,47 @@ namespace CodeImp.DoomBuilder.Windows
// //
// argspanel // argspanel
// //
this.argspanel.Controls.Add(this.arg0str);
this.argspanel.Controls.Add(this.arg2); this.argspanel.Controls.Add(this.arg2);
this.argspanel.Controls.Add(this.arg1); this.argspanel.Controls.Add(this.arg1);
this.argspanel.Controls.Add(this.arg0); this.argspanel.Controls.Add(this.arg0);
this.argspanel.Controls.Add(this.arg3); this.argspanel.Controls.Add(this.arg3);
this.argspanel.Controls.Add(this.arg4); this.argspanel.Controls.Add(this.arg4);
this.argspanel.Controls.Add(this.arg1label); this.argspanel.Controls.Add(this.arg1label);
this.argspanel.Controls.Add(this.arg0label);
this.argspanel.Controls.Add(this.arg3label); this.argspanel.Controls.Add(this.arg3label);
this.argspanel.Controls.Add(this.arg2label); this.argspanel.Controls.Add(this.arg2label);
this.argspanel.Controls.Add(this.arg4label); this.argspanel.Controls.Add(this.arg4label);
this.argspanel.Controls.Add(this.cbArgStr);
this.argspanel.Controls.Add(this.arg0label);
this.argspanel.Location = new System.Drawing.Point(6, 54); this.argspanel.Location = new System.Drawing.Point(6, 54);
this.argspanel.Name = "argspanel"; this.argspanel.Name = "argspanel";
this.argspanel.Size = new System.Drawing.Size(521, 83); this.argspanel.Size = new System.Drawing.Size(521, 83);
this.argspanel.TabIndex = 2; this.argspanel.TabIndex = 2;
this.argspanel.Visible = false; this.argspanel.Visible = false;
// //
// arg0str
//
this.arg0str.FormattingEnabled = true;
this.arg0str.Location = new System.Drawing.Point(272, 55);
this.arg0str.Name = "arg0str";
this.arg0str.Size = new System.Drawing.Size(125, 22);
this.arg0str.TabIndex = 38;
this.arg0str.Leave += new System.EventHandler(this.arg0str_Leave);
//
// cbArgStr
//
this.cbArgStr.Location = new System.Drawing.Point(8, -4);
this.cbArgStr.Name = "cbArgStr";
this.cbArgStr.Size = new System.Drawing.Size(63, 40);
this.cbArgStr.TabIndex = 37;
this.cbArgStr.Text = "Named script";
this.cbArgStr.UseVisualStyleBackColor = true;
this.cbArgStr.CheckedChanged += new System.EventHandler(this.cbArgStr_CheckedChanged);
//
// arg2 // arg2
// //
this.arg2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.arg2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arg2.Location = new System.Drawing.Point(123, 55); this.arg2.Location = new System.Drawing.Point(157, 55);
this.arg2.Name = "arg2"; this.arg2.Name = "arg2";
this.arg2.Size = new System.Drawing.Size(93, 24); this.arg2.Size = new System.Drawing.Size(93, 24);
this.arg2.TabIndex = 2; this.arg2.TabIndex = 2;
@ -309,7 +332,7 @@ namespace CodeImp.DoomBuilder.Windows
// arg1 // arg1
// //
this.arg1.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.arg1.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arg1.Location = new System.Drawing.Point(123, 29); this.arg1.Location = new System.Drawing.Point(157, 29);
this.arg1.Name = "arg1"; this.arg1.Name = "arg1";
this.arg1.Size = new System.Drawing.Size(93, 24); this.arg1.Size = new System.Drawing.Size(93, 24);
this.arg1.TabIndex = 1; this.arg1.TabIndex = 1;
@ -317,7 +340,7 @@ namespace CodeImp.DoomBuilder.Windows
// arg0 // arg0
// //
this.arg0.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.arg0.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arg0.Location = new System.Drawing.Point(123, 3); this.arg0.Location = new System.Drawing.Point(157, 3);
this.arg0.Name = "arg0"; this.arg0.Name = "arg0";
this.arg0.Size = new System.Drawing.Size(93, 24); this.arg0.Size = new System.Drawing.Size(93, 24);
this.arg0.TabIndex = 0; this.arg0.TabIndex = 0;
@ -325,7 +348,7 @@ namespace CodeImp.DoomBuilder.Windows
// arg3 // arg3
// //
this.arg3.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.arg3.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arg3.Location = new System.Drawing.Point(364, 3); this.arg3.Location = new System.Drawing.Point(398, 3);
this.arg3.Name = "arg3"; this.arg3.Name = "arg3";
this.arg3.Size = new System.Drawing.Size(93, 24); this.arg3.Size = new System.Drawing.Size(93, 24);
this.arg3.TabIndex = 3; this.arg3.TabIndex = 3;
@ -333,14 +356,14 @@ namespace CodeImp.DoomBuilder.Windows
// arg4 // arg4
// //
this.arg4.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.arg4.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arg4.Location = new System.Drawing.Point(364, 29); this.arg4.Location = new System.Drawing.Point(398, 29);
this.arg4.Name = "arg4"; this.arg4.Name = "arg4";
this.arg4.Size = new System.Drawing.Size(93, 24); this.arg4.Size = new System.Drawing.Size(93, 24);
this.arg4.TabIndex = 4; this.arg4.TabIndex = 4;
// //
// arg1label // arg1label
// //
this.arg1label.Location = new System.Drawing.Point(-62, 34); this.arg1label.Location = new System.Drawing.Point(-28, 34);
this.arg1label.Name = "arg1label"; this.arg1label.Name = "arg1label";
this.arg1label.Size = new System.Drawing.Size(179, 14); this.arg1label.Size = new System.Drawing.Size(179, 14);
this.arg1label.TabIndex = 33; this.arg1label.TabIndex = 33;
@ -350,7 +373,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
// arg0label // arg0label
// //
this.arg0label.Location = new System.Drawing.Point(-62, 8); this.arg0label.Location = new System.Drawing.Point(-28, 8);
this.arg0label.Name = "arg0label"; this.arg0label.Name = "arg0label";
this.arg0label.Size = new System.Drawing.Size(179, 14); this.arg0label.Size = new System.Drawing.Size(179, 14);
this.arg0label.TabIndex = 32; this.arg0label.TabIndex = 32;
@ -360,7 +383,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
// arg3label // arg3label
// //
this.arg3label.Location = new System.Drawing.Point(179, 8); this.arg3label.Location = new System.Drawing.Point(213, 8);
this.arg3label.Name = "arg3label"; this.arg3label.Name = "arg3label";
this.arg3label.Size = new System.Drawing.Size(179, 14); this.arg3label.Size = new System.Drawing.Size(179, 14);
this.arg3label.TabIndex = 36; this.arg3label.TabIndex = 36;
@ -370,7 +393,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
// arg2label // arg2label
// //
this.arg2label.Location = new System.Drawing.Point(-62, 60); this.arg2label.Location = new System.Drawing.Point(-28, 60);
this.arg2label.Name = "arg2label"; this.arg2label.Name = "arg2label";
this.arg2label.Size = new System.Drawing.Size(179, 14); this.arg2label.Size = new System.Drawing.Size(179, 14);
this.arg2label.TabIndex = 35; this.arg2label.TabIndex = 35;
@ -380,7 +403,7 @@ namespace CodeImp.DoomBuilder.Windows
// //
// arg4label // arg4label
// //
this.arg4label.Location = new System.Drawing.Point(179, 34); this.arg4label.Location = new System.Drawing.Point(213, 34);
this.arg4label.Name = "arg4label"; this.arg4label.Name = "arg4label";
this.arg4label.Size = new System.Drawing.Size(179, 14); this.arg4label.Size = new System.Drawing.Size(179, 14);
this.arg4label.TabIndex = 34; this.arg4label.TabIndex = 34;
@ -838,6 +861,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist.TypeColumnVisible = true; this.fieldslist.TypeColumnVisible = true;
this.fieldslist.TypeColumnWidth = 100; this.fieldslist.TypeColumnWidth = 100;
this.fieldslist.ValueColumnVisible = true; this.fieldslist.ValueColumnVisible = true;
this.fieldslist.OnFieldValueChanged += new CodeImp.DoomBuilder.Controls.FieldsEditorControl.SingleFieldNameEvent(this.fieldslist_OnFieldValueChanged);
// //
// heightpanel1 // heightpanel1
// //
@ -960,5 +984,7 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backoffsety; private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backoffsety;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backoffsetx; private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backoffsetx;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backsector; private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backsector;
private System.Windows.Forms.CheckBox cbArgStr;
private System.Windows.Forms.ComboBox arg0str;
} }
} }

144
Source/Core/Windows/LinedefEditForm.cs
View file

@ -29,6 +29,8 @@ using System.IO;
using CodeImp.DoomBuilder.Config; using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Editing; using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Controls; using CodeImp.DoomBuilder.Controls;
//mxd
using CodeImp.DoomBuilder.GZBuilder.Data;
#endregion #endregion
@ -150,6 +152,12 @@ namespace CodeImp.DoomBuilder.Windows
if(fl.Flags.ContainsKey(ai.Key)) c.Checked = fl.Flags[ai.Key]; if(fl.Flags.ContainsKey(ai.Key)) c.Checked = fl.Flags[ai.Key];
} }
//mxd. setup arg0str
arg0str.Location = arg0.Location;
// Custom fields
fieldslist.SetValues(fl.Fields, true);
// Action/tags // Action/tags
action.Value = fl.Action; action.Value = fl.Action;
tag.Text = fl.Tag.ToString(); tag.Text = fl.Tag.ToString();
@ -191,9 +199,6 @@ namespace CodeImp.DoomBuilder.Windows
backoffsety.Text = fl.Back.OffsetY.ToString(); backoffsety.Text = fl.Back.OffsetY.ToString();
} }
// Custom fields
fieldslist.SetValues(fl.Fields, true);
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Now go for all lines and change the options when a setting is different // Now go for all lines and change the options when a setting is different
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -306,6 +311,58 @@ namespace CodeImp.DoomBuilder.Windows
preventchanges = false; preventchanges = false;
} }
//mxd
private void setNumberedScripts(Linedef l) {
arg0str.Items.Clear();
if (General.Map.NumberedScripts.Count > 0) {
foreach (ScriptItem si in General.Map.NumberedScripts) {
arg0str.Items.Add(si);
if (si.Index == l.Args[0])
arg0str.SelectedIndex = arg0str.Items.Count - 1;
}
//script number is not among known scripts...
if (arg0str.SelectedIndex == -1 && l.Args[0] > 0) {
arg0str.Items.Add(new ScriptItem(l.Args[0], "Script " + l.Args[0]));
arg0str.SelectedIndex = arg0str.Items.Count - 1;
}
} else if (l.Args[0] > 0) {
arg0str.Items.Add(new ScriptItem(l.Args[0], "Script " + l.Args[0]));
arg0str.SelectedIndex = 0;
}
}
//mxd
private void setNamedScripts(string selectedValue) {
arg0str.Items.Clear();
//update arg0str items
if (General.Map.NamedScripts.Count > 0) {
//dbg
GZBuilder.GZGeneral.Trace("Got " + General.Map.NamedScripts.Count + " script names");
ScriptItem[] sn = new ScriptItem[General.Map.NamedScripts.Count];
General.Map.NamedScripts.CopyTo(sn, 0);
arg0str.Items.AddRange(sn);
for (int i = 0; i < sn.Length; i++) {
if (sn[i].Name == selectedValue) {
arg0str.SelectedIndex = i;
break;
}
}
//int index = General.Map.NamedScripts.IndexOf(selectedValue);
//if (index != -1)
// arg0str.SelectedIndex = index;
}
else {
arg0str.Text = selectedValue;
}
}
// Front side (un)checked // Front side (un)checked
private void frontside_CheckStateChanged(object sender, EventArgs e) private void frontside_CheckStateChanged(object sender, EventArgs e)
{ {
@ -363,6 +420,10 @@ namespace CodeImp.DoomBuilder.Windows
if(lines.Count > 1) undodesc = lines.Count + " linedefs"; if(lines.Count > 1) undodesc = lines.Count + " linedefs";
General.Map.UndoRedo.CreateUndo("Edit " + undodesc); General.Map.UndoRedo.CreateUndo("Edit " + undodesc);
//nxd
bool hasAcs = Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1;
bool hasArg0str = General.Map.UDMF && !action.Empty && hasAcs && arg0str.Text.Length > 0;
// Go for all the lines // Go for all the lines
foreach(Linedef l in lines) foreach(Linedef l in lines)
{ {
@ -388,7 +449,16 @@ namespace CodeImp.DoomBuilder.Windows
// Action/tags // Action/tags
l.Tag = General.Clamp(tag.GetResult(l.Tag), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); l.Tag = General.Clamp(tag.GetResult(l.Tag), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag);
if(!action.Empty) l.Action = action.Value; if(!action.Empty) l.Action = action.Value;
l.Args[0] = arg0.GetResult(l.Args[0]);
//mxd
if (hasAcs && !cbArgStr.Checked) {
if (arg0str.SelectedItem != null)
l.Args[0] = ((ScriptItem)arg0str.SelectedItem).Index;
else if (!int.TryParse(arg0str.Text.Trim(), out l.Args[0]))
l.Args[0] = 0;
} else {
l.Args[0] = arg0.GetResult(l.Args[0]);
}
l.Args[1] = arg1.GetResult(l.Args[1]); l.Args[1] = arg1.GetResult(l.Args[1]);
l.Args[2] = arg2.GetResult(l.Args[2]); l.Args[2] = arg2.GetResult(l.Args[2]);
l.Args[3] = arg3.GetResult(l.Args[3]); l.Args[3] = arg3.GetResult(l.Args[3]);
@ -466,6 +536,17 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields // Custom fields
fieldslist.Apply(l.Fields); fieldslist.Apply(l.Fields);
//mxd. apply arg0str
if (hasArg0str && cbArgStr.Checked) {
if (l.Fields.ContainsKey("arg0str"))
l.Fields["arg0str"].Value = arg0str.Text;
else
l.Fields.Add("arg0str", new UniValue(2, arg0str.Text));
}
else if (l.Fields.ContainsKey("arg0str")) {
l.Fields.Remove("arg0str");
}
} }
// Update the used textures // Update the used textures
@ -524,12 +605,38 @@ namespace CodeImp.DoomBuilder.Windows
// Zero all arguments when linedef action 0 (normal) is chosen // Zero all arguments when linedef action 0 (normal) is chosen
if(!preventchanges && (showaction == 0)) if(!preventchanges && (showaction == 0))
{ {
arg0.SetValue(0); //mxd
arg0.SetDefaultValue();
arg1.SetDefaultValue();
arg2.SetDefaultValue();
arg3.SetDefaultValue();
arg4.SetDefaultValue();
/*arg0.SetValue(0);
arg1.SetValue(0); arg1.SetValue(0);
arg2.SetValue(0); arg2.SetValue(0);
arg3.SetValue(0); arg3.SetValue(0);
arg4.SetValue(0); arg4.SetValue(0);*/
} }
//mxd. update arg0str
if (Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, showaction) != -1) {
arg0str.Visible = true;
if (General.Map.UDMF && fieldslist.GetValue("arg0str") != null) {
cbArgStr.Visible = true;
cbArgStr.Checked = true;
setNamedScripts((string)fieldslist.GetValue("arg0str"));
} else { //use script numbers
cbArgStr.Visible = General.Map.UDMF;
cbArgStr.Checked = false;
Linedef l = General.GetByIndex(lines, 0);
setNumberedScripts(l);
}
} else {
cbArgStr.Checked = false;
cbArgStr.Visible = false;
arg0str.Visible = false;
}
} }
// Browse Action clicked // Browse Action clicked
@ -572,6 +679,31 @@ namespace CodeImp.DoomBuilder.Windows
General.Map.UndoRedo.WithdrawUndo(); General.Map.UndoRedo.WithdrawUndo();
} }
//mxd
private void cbArgStr_CheckedChanged(object sender, EventArgs e) {
arg0str.Text = "";
if (cbArgStr.Checked) {
setNamedScripts((string)fieldslist.GetValue("arg0str"));
}
else if (!cbArgStr.Checked) {
setNumberedScripts(General.GetByIndex(lines, 0));
}
arg0label.Text = cbArgStr.Checked ? "Script name:" : "Script number:";
}
//mxd
private void arg0str_Leave(object sender, EventArgs e) {
if (cbArgStr.Checked) fieldslist.SetValue("arg0str", arg0str.Text, CodeImp.DoomBuilder.Types.UniversalType.String);
}
//mxd
private void fieldslist_OnFieldValueChanged(string fieldname) {
if (cbArgStr.Checked && fieldname == "arg0str")
arg0str.Text = (string)fieldslist.GetValue(fieldname);
}
// Help! // Help!
private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{ {

30
Source/Core/Windows/LinedefEditForm.resx
View file

@ -204,36 +204,6 @@
<metadata name="argspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="argspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="arg2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg0.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg3label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="arg4label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="hexenpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>

16
Source/Core/Windows/MapOptionsForm.cs
View file

@ -68,8 +68,12 @@ namespace CodeImp.DoomBuilder.Windows
} }
} }
//mxd. Still better than nothing :)
if (config.SelectedIndex == -1 && General.Configs.Count > 0) config.SelectedIndex = 0;
// Set the level name // Set the level name
levelname.Text = options.CurrentName; if (options.CurrentName.Length > 0) //mxd
levelname.Text = options.CurrentName;
// Set strict patches loading // Set strict patches loading
strictpatches.Checked = options.StrictPatches; strictpatches.Checked = options.StrictPatches;
@ -213,11 +217,11 @@ namespace CodeImp.DoomBuilder.Windows
ci = (ConfigurationInfo)config.SelectedItem; ci = (ConfigurationInfo)config.SelectedItem;
// No lump name in the name field? // No lump name in the name field?
if(levelname.Text.Trim().Length == 0) if (levelname.Text.Trim().Length == 0)
{ {
// Get default lump name from configuration // Get default lump name from configuration
levelname.Text = ci.DefaultLumpName; levelname.Text = ci.DefaultLumpName;
} }
// Show resources // Show resources
datalocations.FixedResourceLocationList(ci.Resources); datalocations.FixedResourceLocationList(ci.Resources);

66
Source/Core/Windows/ScriptEditorForm.Designer.cs generated
View file

@ -28,39 +28,39 @@ namespace CodeImp.DoomBuilder.Windows
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScriptEditorForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScriptEditorForm));
this.editor = new CodeImp.DoomBuilder.Controls.ScriptEditorPanel(); this.editor = new CodeImp.DoomBuilder.Controls.ScriptEditorPanel();
this.SuspendLayout(); this.SuspendLayout();
// //
// editor // editor
// //
this.editor.BackColor = System.Drawing.SystemColors.Control; this.editor.BackColor = System.Drawing.SystemColors.Control;
this.editor.Dock = System.Windows.Forms.DockStyle.Fill; this.editor.Dock = System.Windows.Forms.DockStyle.Fill;
this.editor.Location = new System.Drawing.Point(0, 0); this.editor.Location = new System.Drawing.Point(0, 0);
this.editor.Name = "editor"; this.editor.Name = "editor";
this.editor.Size = new System.Drawing.Size(729, 578); this.editor.Size = new System.Drawing.Size(729, 578);
this.editor.TabIndex = 0; this.editor.TabIndex = 0;
this.editor.TabStop = false; this.editor.TabStop = false;
// //
// ScriptEditorForm // ScriptEditorForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(729, 578); this.ClientSize = new System.Drawing.Size(729, 578);
this.Controls.Add(this.editor); this.Controls.Add(this.editor);
this.DoubleBuffered = true; this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true; this.KeyPreview = true;
this.Name = "ScriptEditorForm"; this.Name = "ScriptEditorForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "Doom Builder Script Editor"; this.Text = "GZDoom Builder Script Editor";
this.Load += new System.EventHandler(this.ScriptEditorForm_Load); this.Load += new System.EventHandler(this.ScriptEditorForm_Load);
this.Shown += new System.EventHandler(this.ScriptEditorForm_Shown); this.Shown += new System.EventHandler(this.ScriptEditorForm_Shown);
this.Move += new System.EventHandler(this.ScriptEditorForm_Move); this.Move += new System.EventHandler(this.ScriptEditorForm_Move);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScriptEditorForm_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScriptEditorForm_FormClosing);
this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ScriptEditorForm_HelpRequested); this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ScriptEditorForm_HelpRequested);
this.ResizeEnd += new System.EventHandler(this.ScriptEditorForm_ResizeEnd); this.ResizeEnd += new System.EventHandler(this.ScriptEditorForm_ResizeEnd);
this.ResumeLayout(false); this.ResumeLayout(false);
} }

26
Source/Core/Windows/ThingEditForm.Designer.cs generated
View file

@ -50,6 +50,8 @@ namespace CodeImp.DoomBuilder.Windows
this.tabeffects = new System.Windows.Forms.TabPage(); this.tabeffects = new System.Windows.Forms.TabPage();
this.actiongroup = new System.Windows.Forms.GroupBox(); this.actiongroup = new System.Windows.Forms.GroupBox();
this.hexenpanel = new System.Windows.Forms.Panel(); this.hexenpanel = new System.Windows.Forms.Panel();
this.arg0str = new System.Windows.Forms.ComboBox();
this.cbArgStr = new System.Windows.Forms.CheckBox();
this.arg2 = new CodeImp.DoomBuilder.Controls.ArgumentBox(); this.arg2 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
this.arg1 = new CodeImp.DoomBuilder.Controls.ArgumentBox(); this.arg1 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
this.arg0 = new CodeImp.DoomBuilder.Controls.ArgumentBox(); this.arg0 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
@ -351,6 +353,8 @@ namespace CodeImp.DoomBuilder.Windows
this.hexenpanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.hexenpanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.hexenpanel.Controls.Add(this.arg0str);
this.hexenpanel.Controls.Add(this.cbArgStr);
this.hexenpanel.Controls.Add(this.arg2); this.hexenpanel.Controls.Add(this.arg2);
this.hexenpanel.Controls.Add(this.arg1); this.hexenpanel.Controls.Add(this.arg1);
this.hexenpanel.Controls.Add(this.arg0); this.hexenpanel.Controls.Add(this.arg0);
@ -366,6 +370,25 @@ namespace CodeImp.DoomBuilder.Windows
this.hexenpanel.Size = new System.Drawing.Size(628, 221); this.hexenpanel.Size = new System.Drawing.Size(628, 221);
this.hexenpanel.TabIndex = 13; this.hexenpanel.TabIndex = 13;
// //
// arg0str
//
this.arg0str.FormattingEnabled = true;
this.arg0str.Location = new System.Drawing.Point(179, 93);
this.arg0str.Name = "arg0str";
this.arg0str.Size = new System.Drawing.Size(125, 22);
this.arg0str.TabIndex = 22;
this.arg0str.Leave += new System.EventHandler(this.arg0str_Leave);
//
// cbArgStr
//
this.cbArgStr.Location = new System.Drawing.Point(14, 3);
this.cbArgStr.Name = "cbArgStr";
this.cbArgStr.Size = new System.Drawing.Size(63, 40);
this.cbArgStr.TabIndex = 21;
this.cbArgStr.Text = "Named script";
this.cbArgStr.UseVisualStyleBackColor = true;
this.cbArgStr.CheckedChanged += new System.EventHandler(this.cbArgStr_CheckedChanged);
//
// arg2 // arg2
// //
this.arg2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.arg2.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -556,6 +579,7 @@ namespace CodeImp.DoomBuilder.Windows
this.fieldslist.TypeColumnVisible = true; this.fieldslist.TypeColumnVisible = true;
this.fieldslist.TypeColumnWidth = 100; this.fieldslist.TypeColumnWidth = 100;
this.fieldslist.ValueColumnVisible = true; this.fieldslist.ValueColumnVisible = true;
this.fieldslist.OnFieldValueChanged += new CodeImp.DoomBuilder.Controls.FieldsEditorControl.SingleFieldNameEvent(this.fieldslist_OnFieldValueChanged);
// //
// cancel // cancel
// //
@ -657,5 +681,7 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox posX; private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox posX;
private System.Windows.Forms.CheckBox cbArgStr;
private System.Windows.Forms.ComboBox arg0str;
} }
} }

148
Source/Core/Windows/ThingEditForm.cs
View file

@ -44,10 +44,8 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Variables #region ================== Variables
private ICollection<Thing> things; private ICollection<Thing> things;
private List<TreeNode> nodes;
private ThingTypeInfo thinginfo; private ThingTypeInfo thinginfo;
private bool preventchanges = false; private bool preventchanges = false;
//mxd //mxd
private Vector2D initialPosition; //initial position of a thing used to fill posX and posY fields private Vector2D initialPosition; //initial position of a thing used to fill posX and posY fields
@ -130,6 +128,12 @@ namespace CodeImp.DoomBuilder.Windows
posX.ButtonStep = General.Map.Grid.GridSize; posX.ButtonStep = General.Map.Grid.GridSize;
posY.ButtonStep = General.Map.Grid.GridSize; posY.ButtonStep = General.Map.Grid.GridSize;
//mxd. setup arg0str
arg0str.Location = arg0.Location;
// Custom fields
fieldslist.SetValues(ft.Fields, true);
// Action/tags // Action/tags
action.Value = ft.Action; action.Value = ft.Action;
tag.Text = ft.Tag.ToString(); tag.Text = ft.Tag.ToString();
@ -139,9 +143,6 @@ namespace CodeImp.DoomBuilder.Windows
arg3.SetValue(ft.Args[3]); arg3.SetValue(ft.Args[3]);
arg4.SetValue(ft.Args[4]); arg4.SetValue(ft.Args[4]);
// Custom fields
fieldslist.SetValues(ft.Fields, true);
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Now go for all lines and change the options when a setting is different // Now go for all lines and change the options when a setting is different
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -187,6 +188,55 @@ namespace CodeImp.DoomBuilder.Windows
preventchanges = false; preventchanges = false;
} }
//mxd
private void setNumberedScripts(Thing t) {
arg0str.Items.Clear();
if (General.Map.NumberedScripts.Count > 0) {
foreach (ScriptItem si in General.Map.NumberedScripts) {
arg0str.Items.Add(si);
if (si.Index == t.Args[0])
arg0str.SelectedIndex = arg0str.Items.Count - 1;
}
//script number is not among known scripts...
if (arg0str.SelectedIndex == -1 && t.Args[0] > 0) {
arg0str.Items.Add(new ScriptItem(t.Args[0], "Script " + t.Args[0]));
arg0str.SelectedIndex = arg0str.Items.Count - 1;
}
} else if (t.Args[0] > 0) {
arg0str.Items.Add(new ScriptItem(t.Args[0], "Script " + t.Args[0]));
arg0str.SelectedIndex = 0;
}
}
//mxd
private void setNamedScripts(string selectedValue) {
arg0str.Items.Clear();
//update arg0str items
if (General.Map.NamedScripts.Count > 0) {
//dbg
GZBuilder.GZGeneral.Trace("Got " + General.Map.NamedScripts.Count + " script names");
ScriptItem[] sn = new ScriptItem[General.Map.NamedScripts.Count];
General.Map.NamedScripts.CopyTo(sn, 0);
arg0str.Items.AddRange(sn);
for(int i = 0; i < sn.Length; i++){
if (sn[i].Name == selectedValue) {
arg0str.SelectedIndex = i;
break;
}
}
//int index = General.Map.NamedScripts.IndexOf(selectedValue);
//if (index != -1)
//arg0str.SelectedIndex = index;
} else {
arg0str.Text = selectedValue;
}
}
#endregion #endregion
#region ================== Interface #region ================== Interface
@ -264,22 +314,33 @@ namespace CodeImp.DoomBuilder.Windows
// Zero all arguments when linedef action 0 (normal) is chosen // Zero all arguments when linedef action 0 (normal) is chosen
if(!preventchanges && (showaction == 0)) if(!preventchanges && (showaction == 0))
{ {
//mxd. If thing is light, set default light settings //mxd
int[] args = GZDoomLight.GetDefaultLightSettings(thingtype.GetResult(1)); arg0.SetDefaultValue();
if (args != null) { arg1.SetDefaultValue();
arg0.SetValue(args[0]); arg2.SetDefaultValue();
arg1.SetValue(args[1]); arg3.SetDefaultValue();
arg2.SetValue(args[2]); arg4.SetDefaultValue();
arg3.SetValue(args[3]);
arg4.SetValue(args[4]);
} else {
arg0.SetValue(0);
arg1.SetValue(0);
arg2.SetValue(0);
arg3.SetValue(0);
arg4.SetValue(0);
}
} }
//update arg0str
if (Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, showaction) != -1) {
arg0str.Visible = true;
if (General.Map.UDMF && fieldslist.GetValue("arg0str") != null) {
cbArgStr.Visible = true;
cbArgStr.Checked = true;
setNamedScripts((string)fieldslist.GetValue("arg0str"));
} else { //use script numbers
cbArgStr.Visible = General.Map.UDMF;
cbArgStr.Checked = false;
Thing t = General.GetByIndex(things, 0);
setNumberedScripts(t);
}
} else {
cbArgStr.Checked = false;
cbArgStr.Visible = false;
arg0str.Visible = false;
}
} }
// Browse Action clicked // Browse Action clicked
@ -333,6 +394,8 @@ namespace CodeImp.DoomBuilder.Windows
//mxd //mxd
Vector2D delta = new Vector2D((float)posX.GetResult((int)initialPosition.x) - initialPosition.x, (float)posY.GetResult((int)initialPosition.y) - initialPosition.y); Vector2D delta = new Vector2D((float)posX.GetResult((int)initialPosition.x) - initialPosition.x, (float)posY.GetResult((int)initialPosition.y) - initialPosition.y);
bool hasAcs = Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action.Value) != -1;
bool hasArg0str = General.Map.UDMF && !action.Empty && hasAcs && arg0str.Text.Length > 0;
// Go for all the things // Go for all the things
foreach(Thing t in things) foreach(Thing t in things)
@ -356,7 +419,16 @@ namespace CodeImp.DoomBuilder.Windows
// Action/tags // Action/tags
t.Tag = tag.GetResult(t.Tag); t.Tag = tag.GetResult(t.Tag);
if(!action.Empty) t.Action = action.Value; if(!action.Empty) t.Action = action.Value;
t.Args[0] = arg0.GetResult(t.Args[0]);
//mxd
if (hasAcs && !cbArgStr.Checked) {
if(arg0str.SelectedItem != null)
t.Args[0] = ((ScriptItem)arg0str.SelectedItem).Index;
else if(!int.TryParse(arg0str.Text.Trim(), out t.Args[0]))
t.Args[0] = 0;
} else {
t.Args[0] = arg0.GetResult(t.Args[0]);
}
t.Args[1] = arg1.GetResult(t.Args[1]); t.Args[1] = arg1.GetResult(t.Args[1]);
t.Args[2] = arg2.GetResult(t.Args[2]); t.Args[2] = arg2.GetResult(t.Args[2]);
t.Args[3] = arg3.GetResult(t.Args[3]); t.Args[3] = arg3.GetResult(t.Args[3]);
@ -365,6 +437,16 @@ namespace CodeImp.DoomBuilder.Windows
// Custom fields // Custom fields
fieldslist.Apply(t.Fields); fieldslist.Apply(t.Fields);
//mxd. apply arg0str
if (hasArg0str && cbArgStr.Checked) {
if (t.Fields.ContainsKey("arg0str"))
t.Fields["arg0str"].Value = arg0str.Text;
else
t.Fields.Add("arg0str", new UniValue(2, arg0str.Text));
} else if (t.Fields.ContainsKey("arg0str")) {
t.Fields.Remove("arg0str");
}
// Update settings // Update settings
t.UpdateConfiguration(); t.UpdateConfiguration();
} }
@ -390,6 +472,30 @@ namespace CodeImp.DoomBuilder.Windows
this.Close(); this.Close();
} }
//mxd
private void cbArgStr_CheckedChanged(object sender, EventArgs e) {
arg0str.Text = "";
if (cbArgStr.Checked){
setNamedScripts((string)fieldslist.GetValue("arg0str"));
} else if (!cbArgStr.Checked) {
setNumberedScripts(General.GetByIndex(things, 0));
}
arg0label.Text = cbArgStr.Checked ? "Script name:" : "Script number:";
}
//mxd
private void arg0str_Leave(object sender, EventArgs e) {
if(cbArgStr.Checked) fieldslist.SetValue("arg0str", arg0str.Text, CodeImp.DoomBuilder.Types.UniversalType.String);
}
//mxd
private void fieldslist_OnFieldValueChanged(string fieldname) {
if (cbArgStr.Checked && fieldname == "arg0str")
arg0str.Text = (string)fieldslist.GetValue(fieldname);
}
// Help // Help
private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
{ {

15
Source/Core/Windows/ThingEditForm.resx
View file

@ -126,12 +126,18 @@
<metadata name="thingtype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="thingtype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="thingtype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="groupBox2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="groupBox2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value> <value>False</value>
</metadata> </metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="taglabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="taglabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -210,6 +216,15 @@
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="tag.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="newtag.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>

4
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View file

@ -561,10 +561,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Time to pick a new target? // Time to pick a new target?
if(General.Clock.CurrentTime > (lastpicktime + PICK_INTERVAL)) if(General.Clock.GetCurrentTime() > (lastpicktime + PICK_INTERVAL))
{ {
PickTargetUnlocked(); PickTargetUnlocked();
lastpicktime = General.Clock.CurrentTime; lastpicktime = General.Clock.GetCurrentTime();
} }
// The mouse is always in motion // The mouse is always in motion

12
Source/Plugins/ColorPicker/BuilderPlug.cs
View file

@ -29,8 +29,8 @@ namespace CodeImp.DoomBuilder.ColorPicker
private Point formLocation; //used to keep form's location constant private Point formLocation; //used to keep form's location constant
public override void OnInitialize() { public override void OnInitialize() {
if (GZBuilder.GZGeneral.Version < 1.06f) { if (GZBuilder.GZGeneral.Version < 1.11f) {
General.ErrorLogger.Add(ErrorType.Error, "ColorPicker plugin: GZDoomBuilder 1.06 or later required!"); General.ErrorLogger.Add(ErrorType.Error, "ColorPicker plugin: GZDoomBuilder 1.11 or later required!");
return; return;
} }
@ -76,7 +76,7 @@ namespace CodeImp.DoomBuilder.ColorPicker
form = new LightColorPicker(); form = new LightColorPicker();
} else if (currentModeName == "SectorsMode") { } else if (currentModeName == "SectorsMode") {
if (GZBuilder.GZGeneral.UDMF) { if (General.Map.UDMF) {
if (General.Map.Map.SelectedSectorsCount == 0) { if (General.Map.Map.SelectedSectorsCount == 0) {
General.Interface.DisplayStatus(StatusType.Warning, "Select some sectors first!"); General.Interface.DisplayStatus(StatusType.Warning, "Select some sectors first!");
return; return;
@ -92,17 +92,17 @@ namespace CodeImp.DoomBuilder.ColorPicker
if ( ((VisualMode)General.Editing.Mode).GetSelectedVisualThings(true).Count == 0 ) { if ( ((VisualMode)General.Editing.Mode).GetSelectedVisualThings(true).Count == 0 ) {
//check sectors //check sectors
int selectedSectorsCount = ((VisualMode)General.Editing.Mode).GetSelectedVisualSectors(true).Count; int selectedSectorsCount = ((VisualMode)General.Editing.Mode).GetSelectedVisualSectors(true).Count;
if (GZBuilder.GZGeneral.UDMF && (selectedSectorsCount > 0 || General.Map.Map.SelectedSectorsCount > 0)) { if (General.Map.UDMF && (selectedSectorsCount > 0 || General.Map.Map.SelectedSectorsCount > 0)) {
form = new SectorColorPicker(); form = new SectorColorPicker();
} else { } else {
General.Interface.DisplayStatus(StatusType.Warning, "Select some lights " + (GZBuilder.GZGeneral.UDMF ? ", sectors or surfaces " : "") + "first!"); General.Interface.DisplayStatus(StatusType.Warning, "Select some lights " + (General.Map.UDMF ? ", sectors or surfaces " : "") + "first!");
return; return;
} }
} else { } else {
form = new LightColorPicker(); form = new LightColorPicker();
} }
} else { //wrong mode } else { //wrong mode
General.Interface.DisplayStatus(StatusType.Warning, "Switch to" + (GZBuilder.GZGeneral.UDMF ? " Sectors," : "") + " Things or GZDoom Visual Mode first!"); General.Interface.DisplayStatus(StatusType.Warning, "Switch to" + (General.Map.UDMF ? " Sectors," : "") + " Things or GZDoom Visual Mode first!");
return; return;
} }

4
Source/Plugins/GZDoomEditing/VisualModes/BaseVisualMode.cs
View file

@ -767,10 +767,10 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
} }
// Time to pick a new target? // Time to pick a new target?
if(General.Clock.CurrentTime > (lastpicktime + PICK_INTERVAL)) if(General.Clock.GetCurrentTime() > (lastpicktime + PICK_INTERVAL))
{ {
PickTargetUnlocked(); PickTargetUnlocked();
lastpicktime = General.Clock.CurrentTime; lastpicktime = General.Clock.GetCurrentTime();
} }
// The mouse is always in motion // The mouse is always in motion

11
Source/Plugins/TagExplorer/BuilderPlug.cs
View file

@ -44,9 +44,10 @@ namespace CodeImp.DoomBuilder.TagExplorer
} }
// This is called after a map has been closed // This is called after a map has been closed
public override void OnMapCloseEnd() { public override void OnMapCloseBegin() {
// If we have a Tag Explorer panel, remove it // If we have a Tag Explorer panel, remove it
if (tagExplorer != null) { if (tagExplorer != null) {
tagExplorer.Terminate();
General.Interface.RemoveDocker(docker); General.Interface.RemoveDocker(docker);
docker = null; docker = null;
tagExplorer.Dispose(); tagExplorer.Dispose();
@ -57,24 +58,24 @@ namespace CodeImp.DoomBuilder.TagExplorer
// Geometry pasted // Geometry pasted
public override void OnPasteEnd(PasteOptions options) { public override void OnPasteEnd(PasteOptions options) {
if (tagExplorer != null) if (tagExplorer != null)
tagExplorer.UpdateTree(); tagExplorer.UpdateTree(true);
} }
// Undo performed // Undo performed
public override void OnUndoEnd() { public override void OnUndoEnd() {
if (tagExplorer != null) if (tagExplorer != null)
tagExplorer.UpdateTree(); tagExplorer.UpdateTree(true);
} }
// Redo performed // Redo performed
public override void OnRedoEnd() { public override void OnRedoEnd() {
if (tagExplorer != null) if (tagExplorer != null)
tagExplorer.UpdateTree(); tagExplorer.UpdateTree(true);
} }
public override void OnActionEnd(CodeImp.DoomBuilder.Actions.Action action) { public override void OnActionEnd(CodeImp.DoomBuilder.Actions.Action action) {
if (tagExplorer != null && action.Name == "builder_deleteitem") if (tagExplorer != null && action.Name == "builder_deleteitem")
tagExplorer.UpdateTree(); tagExplorer.UpdateTree(true);
} }
} }
} }

478
Source/Plugins/TagExplorer/Controls/TagExplorer.cs
View file

@ -68,7 +68,6 @@ namespace CodeImp.DoomBuilder.TagExplorer
// Disposer // Disposer
protected override void Dispose(bool disposing) { protected override void Dispose(bool disposing) {
if (this.ParentForm != null) this.ParentForm.Activated -= ParentForm_Activated;
General.Settings.WritePluginSetting("sortmode", cbSortMode.SelectedIndex); General.Settings.WritePluginSetting("sortmode", cbSortMode.SelectedIndex);
General.Settings.WritePluginSetting("displaymode", cbDisplayMode.SelectedIndex); General.Settings.WritePluginSetting("displaymode", cbDisplayMode.SelectedIndex);
General.Settings.WritePluginSetting("centeronselected", cbCenterOnSelected.Checked); General.Settings.WritePluginSetting("centeronselected", cbCenterOnSelected.Checked);
@ -81,12 +80,14 @@ namespace CodeImp.DoomBuilder.TagExplorer
public void Setup() { public void Setup() {
if (this.ParentForm != null) this.ParentForm.Activated += ParentForm_Activated; if (this.ParentForm != null) this.ParentForm.Activated += ParentForm_Activated;
UpdateTree(); UpdateTree(true);
} }
public void UpdateTree() { public void Terminate() {
treeView.Nodes.Clear(); if (this.ParentForm != null) this.ParentForm.Activated -= ParentForm_Activated;
}
public void UpdateTree(bool focusDisplay) {
bool showTags = (currentDisplayMode == DISPLAY_TAGS || currentDisplayMode == DISPLAY_TAGS_AND_ACTIONS); bool showTags = (currentDisplayMode == DISPLAY_TAGS || currentDisplayMode == DISPLAY_TAGS_AND_ACTIONS);
bool showActions = (currentDisplayMode == DISPLAY_ACTIONS || currentDisplayMode == DISPLAY_TAGS_AND_ACTIONS); bool showActions = (currentDisplayMode == DISPLAY_ACTIONS || currentDisplayMode == DISPLAY_TAGS_AND_ACTIONS);
bool hasComment = false; bool hasComment = false;
@ -101,295 +102,314 @@ namespace CodeImp.DoomBuilder.TagExplorer
TreeNode selectedNode = null; TreeNode selectedNode = null;
this.SuspendLayout();
treeView.Nodes.Clear();
//add things //add things
List<TreeNode> nodes = new List<TreeNode>(); List<TreeNode> nodes = new List<TreeNode>();
ICollection<Thing> things = General.Map.Map.Things; ICollection<Thing> things = General.Map.Map.Things;
foreach (Thing t in things) {
if ((showTags && t.Tag > 0) || (showActions && t.Action > 0)) {
if (filteredTag != -1 && t.Tag != filteredTag)
continue;
if (filteredAction != -1 && t.Action != filteredAction)
continue;
NodeInfo info = new NodeInfo(t); if (!(things is MapElementCollection<Linedef>)) { //don't want to enumerate when array is locked
string name = info.GetName(ref comment, currentSortMode); foreach (Thing t in things) {
hasComment = comment.Length > 0; if ((showTags && t.Tag > 0) || (showActions && t.Action > 0)) {
if (filteredTag != -1 && t.Tag != filteredTag)
continue;
if (filteredAction != -1 && t.Action != filteredAction)
continue;
if (!hasComment && cbCommentsOnly.Checked) NodeInfo info = new NodeInfo(t);
continue; string name = info.GetName(ref comment, currentSortMode);
hasComment = comment.Length > 0;
if (!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) { if (!hasComment && cbCommentsOnly.Checked)
TreeNode node = new TreeNode(name, 1, 1); continue;
node.Tag = info;
if (hasComment) node.ForeColor = commentColor;
nodes.Add(node);
if (info.Index == selection.Index && info.Type == selection.Type) if (!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) {
selectedNode = node; TreeNode node = new TreeNode(name, 1, 1);
node.Tag = info;
if (hasComment) node.ForeColor = commentColor;
nodes.Add(node);
if (info.Index == selection.Index && info.Type == selection.Type)
selectedNode = node;
}
} }
} }
}
//sort nodes //sort nodes
sort(ref nodes, currentSortMode); sort(ref nodes, currentSortMode);
//add "things" category //add "things" category
if (nodes.Count > 0) { if (nodes.Count > 0) {
if (currentSortMode == SortMode.SORT_BY_ACTION) { //create action categories if (currentSortMode == SortMode.SORT_BY_ACTION) { //create action categories
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>(); Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
TreeNode noAction = new TreeNode("No Action", 0, 0); TreeNode noAction = new TreeNode("No Action", 0, 0);
foreach (TreeNode node in nodes) { foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo; NodeInfo nodeInfo = node.Tag as NodeInfo;
if (nodeInfo.Action == 0) { if (nodeInfo.Action == 0) {
noAction.Nodes.Add(node); noAction.Nodes.Add(node);
continue; continue;
}
LinedefActionInfo lai = General.Map.Config.GetLinedefActionInfo(nodeInfo.Action);
if (!categories.ContainsKey(lai.Index))
categories.Add(lai.Index, new TreeNode(lai.Index + " - " + lai.Name, 0, 0, new TreeNode[] { node }));
else
categories[lai.Index].Nodes.Add(node);
} }
LinedefActionInfo lai = General.Map.Config.GetLinedefActionInfo(nodeInfo.Action); TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
TreeNode category = new TreeNode(CAT_THINGS, 0, 0, catNodes);
if (noAction.Nodes.Count > 0)
category.Nodes.Add(noAction);
treeView.Nodes.Add(category);
} else if (currentSortMode == SortMode.SORT_BY_INDEX) { //create thing categories
Dictionary<string, TreeNode> categories = new Dictionary<string, TreeNode>();
foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo;
ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(General.Map.Map.GetThingByIndex(nodeInfo.Index).Type);
if (tti != null) {
if (!categories.ContainsKey(tti.Category.Title))
categories.Add(tti.Category.Title, new TreeNode(tti.Category.Title, 0, 0, new TreeNode[] { node }));
else
categories[tti.Category.Title].Nodes.Add(node);
} else {
if (!categories.ContainsKey("UNKNOWN"))
categories.Add("UNKNOWN", new TreeNode("UNKNOWN", 0, 0, new TreeNode[] { node }));
else
categories["UNKNOWN"].Nodes.Add(node);
}
}
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
treeView.Nodes.Add(new TreeNode(CAT_THINGS, 0, 0, catNodes));
if (!categories.ContainsKey(lai.Index))
categories.Add(lai.Index, new TreeNode(lai.Index + " - " + lai.Name, 0, 0, new TreeNode[] { node }));
else
categories[lai.Index].Nodes.Add(node);
} }
else { //sort by tag
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
TreeNode noTag = new TreeNode("No Tag", 0, 0);
TreeNode[] catNodes = new TreeNode[categories.Values.Count]; foreach (TreeNode node in nodes) {
categories.Values.CopyTo(catNodes, 0); NodeInfo nodeInfo = node.Tag as NodeInfo;
TreeNode category = new TreeNode(CAT_THINGS, 0, 0, catNodes); if (nodeInfo.Tag == 0) {
if (noAction.Nodes.Count > 0) noTag.Nodes.Add(node);
category.Nodes.Add(noAction); continue;
}
treeView.Nodes.Add(category); if (!categories.ContainsKey(nodeInfo.Tag))
categories.Add(nodeInfo.Tag, new TreeNode("Tag " + nodeInfo.Tag, 0, 0, new TreeNode[] { node }));
} else if (currentSortMode == SortMode.SORT_BY_INDEX) { //create thing categories else
Dictionary<string, TreeNode> categories = new Dictionary<string, TreeNode>(); categories[nodeInfo.Tag].Nodes.Add(node);
foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo;
ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(General.Map.Map.GetThingByIndex(nodeInfo.Index).Type);
if (!categories.ContainsKey(tti.Category.Title))
categories.Add(tti.Category.Title, new TreeNode(tti.Category.Title, 0, 0, new TreeNode[] { node }));
else
categories[tti.Category.Title].Nodes.Add(node);
}
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
treeView.Nodes.Add(new TreeNode(CAT_THINGS, 0, 0, catNodes));
} else { //sort by tag
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
TreeNode noTag = new TreeNode("No Tag", 0, 0);
foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo;
if (nodeInfo.Tag == 0) {
noTag.Nodes.Add(node);
continue;
} }
if (!categories.ContainsKey(nodeInfo.Tag)) TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Add(nodeInfo.Tag, new TreeNode("Tag " + nodeInfo.Tag, 0, 0, new TreeNode[] { node })); categories.Values.CopyTo(catNodes, 0);
else
categories[nodeInfo.Tag].Nodes.Add(node); TreeNode category = new TreeNode(CAT_THINGS, 0, 0, catNodes);
if (noTag.Nodes.Count > 0)
category.Nodes.Add(noTag);
treeView.Nodes.Add(category);
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
TreeNode category = new TreeNode(CAT_THINGS, 0, 0, catNodes);
if (noTag.Nodes.Count > 0)
category.Nodes.Add(noTag);
treeView.Nodes.Add(category);
} }
} }
//add sectors //add sectors
nodes = new List<TreeNode>(); nodes = new List<TreeNode>();
ICollection<Sector> sectors = General.Map.Map.Sectors; ICollection<Sector> sectors = General.Map.Map.Sectors;
foreach (Sector s in sectors) {
if ((showTags && s.Tag > 0) || (showActions && s.Effect > 0)) {
if (filteredTag != -1 && s.Tag != filteredTag)
continue;
if (filteredAction != -1 && s.Effect != filteredAction)
continue;
NodeInfo info = new NodeInfo(s); if (!(sectors is MapElementCollection<Linedef>)) { //don't want to enumerate when array is locked
string name = info.GetName(ref comment, currentSortMode); foreach (Sector s in sectors) {
hasComment = comment.Length > 0; if ((showTags && s.Tag > 0) || (showActions && s.Effect > 0)) {
if (filteredTag != -1 && s.Tag != filteredTag)
continue;
if (filteredAction != -1 && s.Effect != filteredAction)
continue;
if (!hasComment && cbCommentsOnly.Checked) NodeInfo info = new NodeInfo(s);
continue; string name = info.GetName(ref comment, currentSortMode);
hasComment = comment.Length > 0;
if (!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) { if (!hasComment && cbCommentsOnly.Checked)
TreeNode node = new TreeNode(name, 3, 3); continue;
node.Tag = info;
if (hasComment) node.ForeColor = commentColor;
nodes.Add(node);
if (info.Index == selection.Index && info.Type == selection.Type) if (!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) {
selectedNode = node; TreeNode node = new TreeNode(name, 3, 3);
node.Tag = info;
if (hasComment) node.ForeColor = commentColor;
nodes.Add(node);
if (info.Index == selection.Index && info.Type == selection.Type)
selectedNode = node;
}
} }
} }
}
//sort nodes //sort nodes
sort(ref nodes, currentSortMode); sort(ref nodes, currentSortMode);
//add category //add category
if (nodes.Count > 0) { if (nodes.Count > 0) {
if (currentSortMode == SortMode.SORT_BY_ACTION) { if (currentSortMode == SortMode.SORT_BY_ACTION) {
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>(); Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
TreeNode noAction = new TreeNode("No Effect", 2, 2); TreeNode noAction = new TreeNode("No Effect", 2, 2);
foreach (TreeNode node in nodes) { foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo; NodeInfo nodeInfo = node.Tag as NodeInfo;
if (nodeInfo.Action == 0) { if (nodeInfo.Action == 0) {
noAction.Nodes.Add(node); noAction.Nodes.Add(node);
continue; continue;
}
SectorEffectInfo sei = General.Map.Config.GetSectorEffectInfo(nodeInfo.Action);
if (!categories.ContainsKey(sei.Index))
categories.Add(sei.Index, new TreeNode(sei.Index + " - " + sei.Title, 2, 2, new TreeNode[] { node }));
else
categories[sei.Index].Nodes.Add(node);
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
SectorEffectInfo sei = General.Map.Config.GetSectorEffectInfo(nodeInfo.Action); TreeNode category = new TreeNode(CAT_SECTORS, 2, 2, catNodes);
if (noAction.Nodes.Count > 0)
category.Nodes.Add(noAction);
if (!categories.ContainsKey(sei.Index)) treeView.Nodes.Add(category);
categories.Add(sei.Index, new TreeNode(sei.Index + " - " + sei.Title, 2, 2, new TreeNode[] { node })); } else if (currentSortMode == SortMode.SORT_BY_TAG) {
else Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
categories[sei.Index].Nodes.Add(node); TreeNode noTag = new TreeNode("No Tag", 2, 2);
}
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
TreeNode category = new TreeNode(CAT_SECTORS, 2, 2, catNodes); foreach (TreeNode node in nodes) {
if (noAction.Nodes.Count > 0) NodeInfo nodeInfo = node.Tag as NodeInfo;
category.Nodes.Add(noAction);
treeView.Nodes.Add(category); if (nodeInfo.Tag == 0) {
} else if (currentSortMode == SortMode.SORT_BY_TAG) { noTag.Nodes.Add(node);
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>(); continue;
TreeNode noTag = new TreeNode("No Tag", 2, 2); }
foreach (TreeNode node in nodes) { if (!categories.ContainsKey(nodeInfo.Tag))
NodeInfo nodeInfo = node.Tag as NodeInfo; categories.Add(nodeInfo.Tag, new TreeNode("Tag " + nodeInfo.Tag, 2, 2, new TreeNode[] { node }));
else
if (nodeInfo.Tag == 0) { categories[nodeInfo.Tag].Nodes.Add(node);
noTag.Nodes.Add(node);
continue;
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
if (!categories.ContainsKey(nodeInfo.Tag)) TreeNode category = new TreeNode(CAT_SECTORS, 2, 2, catNodes);
categories.Add(nodeInfo.Tag, new TreeNode("Tag " + nodeInfo.Tag, 2, 2, new TreeNode[] { node })); if (noTag.Nodes.Count > 0)
else category.Nodes.Add(noTag);
categories[nodeInfo.Tag].Nodes.Add(node);
treeView.Nodes.Add(category);
} else {//just add them as they are
treeView.Nodes.Add(new TreeNode(CAT_SECTORS, 2, 2, nodes.ToArray()));
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
TreeNode category = new TreeNode(CAT_SECTORS, 2, 2, catNodes);
if (noTag.Nodes.Count > 0)
category.Nodes.Add(noTag);
treeView.Nodes.Add(category);
} else {//just add them as they are
treeView.Nodes.Add(new TreeNode(CAT_SECTORS, 2, 2, nodes.ToArray()));
} }
} }
//add linedefs //add linedefs
nodes = new List<TreeNode>(); nodes = new List<TreeNode>();
ICollection<Linedef> linedefs = General.Map.Map.Linedefs; ICollection<Linedef> linedefs = General.Map.Map.Linedefs;
foreach (Linedef l in linedefs) {
if ((showTags && l.Tag > 0) || (showActions && l.Action > 0)) {
if (filteredTag != -1 && l.Tag != filteredTag)
continue;
if (filteredAction != -1 && l.Action != filteredAction)
continue;
NodeInfo info = new NodeInfo(l); if (!(linedefs is MapElementCollection<Linedef>)) { //don't want to enumerate when array is locked
string name = info.GetName(ref comment, currentSortMode); foreach (Linedef l in linedefs) {
hasComment = comment.Length > 0; if ((showTags && l.Tag > 0) || (showActions && l.Action > 0)) {
if (filteredTag != -1 && l.Tag != filteredTag)
continue;
if (filteredAction != -1 && l.Action != filteredAction)
continue;
if (!hasComment && cbCommentsOnly.Checked) NodeInfo info = new NodeInfo(l);
continue; string name = info.GetName(ref comment, currentSortMode);
hasComment = comment.Length > 0;
if (!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) { if (!hasComment && cbCommentsOnly.Checked)
TreeNode node = new TreeNode(name, 5, 5); continue;
node.Tag = info;
if (hasComment) node.ForeColor = commentColor;
nodes.Add(node);
if (info.Index == selection.Index && info.Type == selection.Type) if (!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) {
selectedNode = node; TreeNode node = new TreeNode(name, 5, 5);
node.Tag = info;
if (hasComment) node.ForeColor = commentColor;
nodes.Add(node);
if (info.Index == selection.Index && info.Type == selection.Type)
selectedNode = node;
}
} }
} }
}
//sort nodes //sort nodes
sort(ref nodes, currentSortMode); sort(ref nodes, currentSortMode);
//add category //add category
if (nodes.Count > 0) { if (nodes.Count > 0) {
if (currentSortMode == SortMode.SORT_BY_ACTION) { if (currentSortMode == SortMode.SORT_BY_ACTION) {
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>(); Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
TreeNode noAction = new TreeNode("No Action", 4, 4); TreeNode noAction = new TreeNode("No Action", 4, 4);
foreach (TreeNode node in nodes) { foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo; NodeInfo nodeInfo = node.Tag as NodeInfo;
if (nodeInfo.Action == 0) { if (nodeInfo.Action == 0) {
noAction.Nodes.Add(node); noAction.Nodes.Add(node);
continue; continue;
}
LinedefActionInfo lai = General.Map.Config.GetLinedefActionInfo(nodeInfo.Action);
if (!categories.ContainsKey(lai.Index))
categories.Add(lai.Index, new TreeNode(lai.Index + " - " + lai.Name, 4, 4, new TreeNode[] { node }));
else
categories[lai.Index].Nodes.Add(node);
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
LinedefActionInfo lai = General.Map.Config.GetLinedefActionInfo(nodeInfo.Action); TreeNode category = new TreeNode(CAT_LINEDEFS, 4, 4, catNodes);
if (noAction.Nodes.Count > 0)
category.Nodes.Add(noAction);
if (!categories.ContainsKey(lai.Index)) treeView.Nodes.Add(category);
categories.Add(lai.Index, new TreeNode(lai.Index + " - " + lai.Name, 4, 4, new TreeNode[] { node }));
else
categories[lai.Index].Nodes.Add(node);
}
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
TreeNode category = new TreeNode(CAT_LINEDEFS, 4, 4, catNodes); } else if (currentSortMode == SortMode.SORT_BY_TAG) {
if (noAction.Nodes.Count > 0) Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
category.Nodes.Add(noAction); TreeNode noTag = new TreeNode("No Tag", 4, 4);
treeView.Nodes.Add(category); foreach (TreeNode node in nodes) {
NodeInfo nodeInfo = node.Tag as NodeInfo;
} else if (currentSortMode == SortMode.SORT_BY_TAG) { if (nodeInfo.Tag == 0) {
Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>(); noTag.Nodes.Add(node);
TreeNode noTag = new TreeNode("No Tag", 4, 4); continue;
}
foreach (TreeNode node in nodes) { if (!categories.ContainsKey(nodeInfo.Tag))
NodeInfo nodeInfo = node.Tag as NodeInfo; categories.Add(nodeInfo.Tag, new TreeNode("Tag " + nodeInfo.Tag, 4, 4, new TreeNode[] { node }));
else
if (nodeInfo.Tag == 0) { categories[nodeInfo.Tag].Nodes.Add(node);
noTag.Nodes.Add(node);
continue;
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
if (!categories.ContainsKey(nodeInfo.Tag)) TreeNode category = new TreeNode(CAT_LINEDEFS, 4, 4, catNodes);
categories.Add(nodeInfo.Tag, new TreeNode("Tag " + nodeInfo.Tag, 4, 4, new TreeNode[] { node })); if (noTag.Nodes.Count > 0)
else category.Nodes.Add(noTag);
categories[nodeInfo.Tag].Nodes.Add(node);
treeView.Nodes.Add(category);
} else { //just add them as they are
treeView.Nodes.Add(new TreeNode(CAT_LINEDEFS, 4, 4, nodes.ToArray()));
} }
TreeNode[] catNodes = new TreeNode[categories.Values.Count];
categories.Values.CopyTo(catNodes, 0);
TreeNode category = new TreeNode(CAT_LINEDEFS, 4, 4, catNodes);
if (noTag.Nodes.Count > 0)
category.Nodes.Add(noTag);
treeView.Nodes.Add(category);
} else { //just add them as they are
treeView.Nodes.Add(new TreeNode(CAT_LINEDEFS, 4, 4, nodes.ToArray()));
} }
} }
@ -399,9 +419,13 @@ namespace CodeImp.DoomBuilder.TagExplorer
if (selectedNode != null) if (selectedNode != null)
treeView.SelectedNode = selectedNode; treeView.SelectedNode = selectedNode;
else if (treeView.Nodes.Count > 0)
treeView.SelectedNode = treeView.Nodes[0];
this.ResumeLayout();
//loose focus //loose focus
General.Interface.FocusDisplay(); if(focusDisplay) General.Interface.FocusDisplay();
} }
//tag/action search //tag/action search
@ -479,12 +503,12 @@ namespace CodeImp.DoomBuilder.TagExplorer
//EVENTS //EVENTS
private void cbDisplayMode_SelectedIndexChanged(object sender, EventArgs e) { private void cbDisplayMode_SelectedIndexChanged(object sender, EventArgs e) {
currentDisplayMode = cbDisplayMode.SelectedItem.ToString(); currentDisplayMode = cbDisplayMode.SelectedItem.ToString();
UpdateTree(); UpdateTree(true);
} }
private void cbSortMode_SelectedIndexChanged(object sender, EventArgs e) { private void cbSortMode_SelectedIndexChanged(object sender, EventArgs e) {
currentSortMode = cbSortMode.SelectedItem.ToString(); currentSortMode = cbSortMode.SelectedItem.ToString();
UpdateTree(); UpdateTree(true);
} }
private void treeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) { private void treeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) {
@ -518,7 +542,7 @@ namespace CodeImp.DoomBuilder.TagExplorer
} }
General.Map.Map.Update(); General.Map.Map.Update();
UpdateTree(); UpdateTree(true);
} else { } else {
//select element? //select element?
@ -646,9 +670,9 @@ namespace CodeImp.DoomBuilder.TagExplorer
General.Interface.FocusDisplay(); General.Interface.FocusDisplay();
} }
//it is called every time a dialog window closes. //It is called every time a dialog window closes.
private void ParentForm_Activated(object sender, EventArgs e){ private void ParentForm_Activated(object sender, EventArgs e){
UpdateTree(); UpdateTree(true);
} }
private void btnClearSearch_Click(object sender, EventArgs e) { private void btnClearSearch_Click(object sender, EventArgs e) {
@ -657,11 +681,11 @@ namespace CodeImp.DoomBuilder.TagExplorer
} }
private void tbSearch_TextChanged(object sender, EventArgs e) { private void tbSearch_TextChanged(object sender, EventArgs e) {
if (tbSearch.Text.Length > 1 || tbSearch.Text.Length == 0) UpdateTree(); if (tbSearch.Text.Length > 1 || tbSearch.Text.Length == 0) UpdateTree(false);
} }
private void cbCommentsOnly_CheckedChanged(object sender, EventArgs e) { private void cbCommentsOnly_CheckedChanged(object sender, EventArgs e) {
UpdateTree(); UpdateTree(true);
} }
} }

4
Source/Plugins/TagExplorer/NodeInfo.cs
View file

@ -186,7 +186,7 @@ namespace CodeImp.DoomBuilder.TagExplorer
string combinedName = ""; string combinedName = "";
switch (sortMode) { switch (sortMode) {
case SortMode.SORT_BY_ACTION: case SortMode.SORT_BY_ACTION:
combinedName = (action > 0 ? "Action:" + action + "; " : "") + (tag > 0 ? "Tag:" + tag + "; " : "") + name + (isDefaultName ? " " + index : ""); combinedName = (tag > 0 ? "Tag:" + tag + "; " : "") + name + (isDefaultName ? " " + index : "");
break; break;
case SortMode.SORT_BY_INDEX: case SortMode.SORT_BY_INDEX:
@ -194,7 +194,7 @@ namespace CodeImp.DoomBuilder.TagExplorer
break; break;
case SortMode.SORT_BY_TAG: case SortMode.SORT_BY_TAG:
combinedName = (tag > 0 ? "Tag:" + tag + "; " : "") + (action > 0 ? "Action:" + action + "; " : "") + name + (isDefaultName ? " " + index : ""); combinedName = (action > 0 ? "Action:" + action + "; " : "") + name + (isDefaultName ? " " + index : "");
break; break;
default: default:

6
Source/Plugins/UMDFControls/BuilderPlug.cs
View file

@ -22,8 +22,8 @@ namespace CodeImp.DoomBuilder.UDMFControls
private Point formLocation; //used to keep form's location constant private Point formLocation; //used to keep form's location constant
public override void OnInitialize() { public override void OnInitialize() {
if (GZBuilder.GZGeneral.Version < 1.09f) { if (GZBuilder.GZGeneral.Version < 1.11f) {
General.ErrorLogger.Add(ErrorType.Error, "UDMFControls plugin: GZDoomBuilder 1.09 or later required!"); General.ErrorLogger.Add(ErrorType.Error, "UDMFControls plugin: GZDoomBuilder 1.11 or later required!");
return; return;
} }
@ -65,7 +65,7 @@ namespace CodeImp.DoomBuilder.UDMFControls
if (General.Editing.Mode == null) if (General.Editing.Mode == null)
return; return;
if (!GZBuilder.GZGeneral.UDMF) { if (!General.Map.UDMF) {
General.Interface.DisplayStatus(StatusType.Warning, "Map in UDMF format required!"); General.Interface.DisplayStatus(StatusType.Warning, "Map in UDMF format required!");
return; return;
} }