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

Internal: did some refactoring.

Browse source
This commit is contained in:
MaxED 2016-04-27 09:13:07 +00:00
parent 7667f14ca2
commit 6b25086795
97 changed files with 185 additions and 454 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
Source/Core/Builder.csproj
View file

@ -165,16 +165,16 @@
<Compile Include="Actions\ActionManager.cs" />
<Compile Include="Config\CompilerInfo.cs" />
<Compile Include="Config\ConfigurationInfo.cs" />
<Compile Include="GZBuilder\Controls\PairedFloatControl.cs">
<Compile Include="Controls\PairedFloatControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\PairedFloatControl.Designer.cs">
<Compile Include="Controls\PairedFloatControl.Designer.cs">
<DependentUpon>PairedFloatControl.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Windows\ThingStatisticsForm.cs">
<Compile Include="Windows\ThingStatisticsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GZBuilder\Windows\ThingStatisticsForm.Designer.cs">
<Compile Include="Windows\ThingStatisticsForm.Designer.cs">
<DependentUpon>ThingStatisticsForm.cs</DependentUpon>
</Compile>
<Compile Include="VisualModes\VisualBlockMap.cs" />
@ -543,10 +543,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="GZBuilder\Controls\PairedFloatControl.resx">
<EmbeddedResource Include="Controls\PairedFloatControl.resx">
<DependentUpon>PairedFloatControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Windows\ThingStatisticsForm.resx">
<EmbeddedResource Include="Windows\ThingStatisticsForm.resx">
<DependentUpon>ThingStatisticsForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Windows\AboutForm.resx">
@ -828,46 +828,46 @@
<Compile Include="General\UpdateChecker.cs" />
<Compile Include="Geometry\CurveTools.cs" />
<Compile Include="Geometry\InterpolationTools.cs" />
<Compile Include="GZBuilder\Controls\AngleControl.cs">
<Compile Include="Controls\AngleControlEx.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\AngleControl.Designer.cs">
<DependentUpon>AngleControl.cs</DependentUpon>
<Compile Include="Controls\AngleControlEx.Designer.cs">
<DependentUpon>AngleControlEx.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Controls\ColorFieldsControl.cs">
<Compile Include="Controls\ColorFieldsControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\ColorFieldsControl.Designer.cs">
<Compile Include="Controls\ColorFieldsControl.Designer.cs">
<DependentUpon>ColorFieldsControl.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Controls\TagsSelector.cs">
<Compile Include="Controls\TagsSelector.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\TagsSelector.Designer.cs">
<Compile Include="Controls\TagsSelector.Designer.cs">
<DependentUpon>TagsSelector.cs</DependentUpon>
</Compile>
<Compile Include="Controls\CheckedColoredListBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\MultiSelectTreeview.cs">
<Compile Include="Controls\MultiSelectTreeview.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\PairedFieldsControl.cs">
<Compile Include="Controls\PairedFieldsControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\PairedFieldsControl.Designer.cs">
<Compile Include="Controls\PairedFieldsControl.Designer.cs">
<DependentUpon>PairedFieldsControl.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Controls\PairedIntControl.cs">
<Compile Include="Controls\PairedIntControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\PairedIntControl.Designer.cs">
<Compile Include="Controls\PairedIntControl.Designer.cs">
<DependentUpon>PairedIntControl.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Controls\TagSelector.cs">
<Compile Include="Controls\TagSelector.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GZBuilder\Controls\TagSelector.Designer.cs">
<Compile Include="Controls\TagSelector.Designer.cs">
<DependentUpon>TagSelector.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Data\BoundingBox.cs" />
@ -883,32 +883,30 @@
<Compile Include="GZBuilder\Data\ScriptItem.cs" />
<Compile Include="GZBuilder\Data\SharpCompressHelper.cs" />
<Compile Include="GZBuilder\Data\SkyboxInfo.cs" />
<Compile Include="GZBuilder\Rendering\SizelessVisualThingCage.cs" />
<Compile Include="GZBuilder\Rendering\ThingBoundingBox.cs" />
<Compile Include="GZBuilder\Data\ThingCopyData.cs" />
<Compile Include="GZBuilder\Rendering\VisualVertexHandle.cs" />
<Compile Include="GZBuilder\Geometry\Line3D.cs" />
<Compile Include="GZBuilder\GZDoom\DecorateParserSE.cs" />
<Compile Include="GZBuilder\GZDoom\GldefsParser.cs" />
<Compile Include="GZBuilder\GZDoom\MapinfoParser.cs" />
<Compile Include="GZBuilder\GZDoom\ModeldefParser.cs" />
<Compile Include="GZBuilder\GZDoom\ModeldefParserSE.cs" />
<Compile Include="GZBuilder\GZDoom\ModeldefStructure.cs" />
<Compile Include="GZBuilder\GZDoom\ScriptTypeParserSE.cs" />
<Compile Include="Rendering\VisualVertexHandle.cs" />
<Compile Include="Geometry\Line3D.cs" />
<Compile Include="ZDoom\Scripting\DecorateParserSE.cs" />
<Compile Include="ZDoom\GldefsParser.cs" />
<Compile Include="ZDoom\MapinfoParser.cs" />
<Compile Include="ZDoom\ModeldefParser.cs" />
<Compile Include="ZDoom\Scripting\ModeldefParserSE.cs" />
<Compile Include="ZDoom\ModeldefStructure.cs" />
<Compile Include="ZDoom\Scripting\ScriptTypeParserSE.cs" />
<Compile Include="GZBuilder\GZGeneral.cs" />
<Compile Include="GZBuilder\md3\GZModel.cs" />
<Compile Include="GZBuilder\md3\ModelReader.cs" />
<Compile Include="GZBuilder\GZDoom\AcsParserSE.cs" />
<Compile Include="GZBuilder\Windows\ExceptionDialog.cs">
<Compile Include="ZDoom\Scripting\AcsParserSE.cs" />
<Compile Include="Windows\ExceptionDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GZBuilder\Windows\ExceptionDialog.designer.cs">
<Compile Include="Windows\ExceptionDialog.designer.cs">
<DependentUpon>ExceptionDialog.cs</DependentUpon>
</Compile>
<Compile Include="GZBuilder\Windows\TagStatisticsForm.cs">
<Compile Include="Windows\TagStatisticsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GZBuilder\Windows\TagStatisticsForm.Designer.cs">
<Compile Include="Windows\TagStatisticsForm.Designer.cs">
<DependentUpon>TagStatisticsForm.cs</DependentUpon>
</Compile>
<Compile Include="IO\ClipboardStreamReader.cs" />
@ -1074,28 +1072,28 @@
<SubType>Designer</SubType>
<DependentUpon>ThingBrowserControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\AngleControl.resx">
<DependentUpon>AngleControl.cs</DependentUpon>
<EmbeddedResource Include="Controls\AngleControlEx.resx">
<DependentUpon>AngleControlEx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\ColorFieldsControl.resx">
<EmbeddedResource Include="Controls\ColorFieldsControl.resx">
<DependentUpon>ColorFieldsControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\TagsSelector.resx">
<EmbeddedResource Include="Controls\TagsSelector.resx">
<DependentUpon>TagsSelector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\PairedFieldsControl.resx">
<EmbeddedResource Include="Controls\PairedFieldsControl.resx">
<DependentUpon>PairedFieldsControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\PairedIntControl.resx">
<EmbeddedResource Include="Controls\PairedIntControl.resx">
<DependentUpon>PairedIntControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Controls\TagSelector.resx">
<EmbeddedResource Include="Controls\TagSelector.resx">
<DependentUpon>TagSelector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Windows\ExceptionDialog.resx">
<EmbeddedResource Include="Windows\ExceptionDialog.resx">
<DependentUpon>ExceptionDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GZBuilder\Windows\TagStatisticsForm.resx">
<EmbeddedResource Include="Windows\TagStatisticsForm.resx">
<DependentUpon>TagStatisticsForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Crosshair.png" />

1
Source/Core/Config/ResourceTextureSet.cs
View file

@ -18,7 +18,6 @@
using System.Collections.Generic;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.IO;
#endregion

4
Source/Core/GZBuilder/Controls/AngleControl.Designer.cs → Source/Core/Controls/AngleControlEx.Designer.cs generated
View file

@ -1,6 +1,6 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class AngleControl
partial class AngleControlEx
{
/// <summary>
/// Required designer variable.

6
Source/Core/GZBuilder/Controls/AngleControl.cs → Source/Core/Controls/AngleControlEx.cs
View file

@ -12,9 +12,9 @@ using CodeImp.DoomBuilder.Geometry;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
public partial class AngleControl : UserControl
public partial class AngleControlEx : UserControl
{
#region Variables
@ -48,7 +48,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.Controls
#endregion
public AngleControl()
public AngleControlEx()
{
InitializeComponent();
this.DoubleBuffered = true;

0
Source/Core/GZBuilder/Controls/AngleControl.resx → Source/Core/Controls/AngleControlEx.resx
View file

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

@ -17,15 +17,12 @@
#region ================== Namespaces
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Types;
using System.Globalization;
using CodeImp.DoomBuilder.GZBuilder.Controls;
using CodeImp.DoomBuilder.Map;
#endregion

2
Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs → Source/Core/Controls/ColorFieldsControl.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class ColorFieldsControl
{

2
Source/Core/GZBuilder/Controls/ColorFieldsControl.cs → Source/Core/Controls/ColorFieldsControl.cs
View file

@ -9,7 +9,7 @@ using CodeImp.DoomBuilder.Rendering;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
public partial class ColorFieldsControl : UserControl
{

0
Source/Core/GZBuilder/Controls/ColorFieldsControl.resx → Source/Core/Controls/ColorFieldsControl.resx
View file

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

@ -23,7 +23,6 @@ using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Map;
using System.Globalization;
using CodeImp.DoomBuilder.Types;
#endregion

3
Source/Core/GZBuilder/Controls/MultiSelectTreeview.cs → Source/Core/Controls/MultiSelectTreeview.cs
View file

@ -72,11 +72,10 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Controls;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
#region TreeViewSelectionMode enumeration

2
Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs → Source/Core/Controls/PairedFieldsControl.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class PairedFieldsControl
{

2
Source/Core/GZBuilder/Controls/PairedFieldsControl.cs → Source/Core/Controls/PairedFieldsControl.cs
View file

@ -8,7 +8,7 @@ using CodeImp.DoomBuilder.Properties;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
public partial class PairedFieldsControl : UserControl
{

0
Source/Core/GZBuilder/Controls/PairedFieldsControl.resx → Source/Core/Controls/PairedFieldsControl.resx
View file

2
Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs → Source/Core/Controls/PairedFloatControl.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class PairedFloatControl
{

2
Source/Core/GZBuilder/Controls/PairedFloatControl.cs → Source/Core/Controls/PairedFloatControl.cs
View file

@ -3,7 +3,7 @@ using System.Globalization;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Properties;
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
public partial class PairedFloatControl : UserControl
{

0
Source/Core/GZBuilder/Controls/PairedFloatControl.resx → Source/Core/Controls/PairedFloatControl.resx
View file

2
Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs → Source/Core/Controls/PairedIntControl.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class PairedIntControl
{

2
Source/Core/GZBuilder/Controls/PairedIntControl.cs → Source/Core/Controls/PairedIntControl.cs
View file

@ -6,7 +6,7 @@ using System.Windows.Forms;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
public partial class PairedIntControl : UserControl
{

0
Source/Core/GZBuilder/Controls/PairedIntControl.resx → Source/Core/Controls/PairedIntControl.resx
View file

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

@ -27,7 +27,7 @@ using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Compilers;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.GZDoom;
using CodeImp.DoomBuilder.ZDoom.Scripting;
using ScintillaNET;
#endregion

2
Source/Core/Controls/ScriptFileDocumentTab.cs
View file

@ -23,7 +23,7 @@ using System.Windows.Forms;
using CodeImp.DoomBuilder.Compilers;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.GZDoom;
using CodeImp.DoomBuilder.ZDoom.Scripting;
#endregion

4
Source/Core/Controls/SectorSlopeControl.Designer.cs generated
View file

@ -35,7 +35,7 @@
this.angletrackbar = new System.Windows.Forms.TrackBar();
this.label1 = new System.Windows.Forms.Label();
this.pivotmodeselector = new System.Windows.Forms.ComboBox();
this.rotationcontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.rotationcontrol = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.slopeangle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.sloperotation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.slopeoffset = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -224,7 +224,7 @@
private System.Windows.Forms.Button reset;
private ButtonsNumericTextbox slopeoffset;
private System.Windows.Forms.Label label18;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl rotationcontrol;
private CodeImp.DoomBuilder.Controls.AngleControlEx rotationcontrol;
private System.Windows.Forms.TrackBar angletrackbar;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox pivotmodeselector;

4
Source/Core/Controls/SectorSlopeControl.cs
View file

@ -129,7 +129,7 @@ namespace CodeImp.DoomBuilder.Controls
if(float.IsNaN(anglexy))
{
sloperotation.Text = "";
rotationcontrol.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
rotationcontrol.Angle = AngleControlEx.NO_ANGLE;
}
else
{
@ -173,7 +173,7 @@ namespace CodeImp.DoomBuilder.Controls
preventchanges = true;
anglexy = General.ClampAngle(sloperotation.GetResultFloat(float.NaN));
rotationcontrol.Angle = (float.IsNaN(anglexy) ? GZBuilder.Controls.AngleControl.NO_ANGLE : (int)Math.Round(anglexy + 90));
rotationcontrol.Angle = (float.IsNaN(anglexy) ? AngleControlEx.NO_ANGLE : (int)Math.Round(anglexy + 90));
if(OnAnglesChanged != null) OnAnglesChanged(this, EventArgs.Empty);
preventchanges = false;

2
Source/Core/GZBuilder/Controls/TagSelector.Designer.cs → Source/Core/Controls/TagSelector.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class TagSelector
{

2
Source/Core/GZBuilder/Controls/TagSelector.cs → Source/Core/Controls/TagSelector.cs
View file

@ -9,7 +9,7 @@ using CodeImp.DoomBuilder.Types;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
internal struct TagInfo
{

0
Source/Core/GZBuilder/Controls/TagSelector.resx → Source/Core/Controls/TagSelector.resx
View file

2
Source/Core/GZBuilder/Controls/TagsSelector.Designer.cs → Source/Core/Controls/TagsSelector.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
partial class TagsSelector
{

2
Source/Core/GZBuilder/Controls/TagsSelector.cs → Source/Core/Controls/TagsSelector.cs
View file

@ -8,7 +8,7 @@ using CodeImp.DoomBuilder.Types;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Controls
namespace CodeImp.DoomBuilder.Controls
{
public partial class TagsSelector : UserControl
{

0
Source/Core/GZBuilder/Controls/TagsSelector.resx → Source/Core/Controls/TagsSelector.resx
View file

6
Source/Core/Controls/ThingBrowserControl.Designer.cs generated
View file

@ -46,7 +46,7 @@ namespace CodeImp.DoomBuilder.Controls
this.tbFilter = new System.Windows.Forms.TextBox();
this.bClear = new System.Windows.Forms.Button();
this.updatetimer = new System.Windows.Forms.Timer(this.components);
this.typelist = new CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview();
this.typelist = new CodeImp.DoomBuilder.Controls.MultiSelectTreeview();
this.spritetex = new CodeImp.DoomBuilder.Controls.ConfigurablePictureBox();
this.typeid = new CodeImp.DoomBuilder.Controls.NumericTextbox();
this.infopanel.SuspendLayout();
@ -277,7 +277,7 @@ namespace CodeImp.DoomBuilder.Controls
this.typelist.Name = "typelist";
this.typelist.SelectedImageIndex = 0;
this.typelist.SelectionBackColor = System.Drawing.SystemColors.Highlight;
this.typelist.SelectionMode = CodeImp.DoomBuilder.GZBuilder.Controls.TreeViewSelectionMode.SingleSelect;
this.typelist.SelectionMode = CodeImp.DoomBuilder.Controls.TreeViewSelectionMode.SingleSelect;
this.typelist.ShowNodeToolTips = true;
this.typelist.Size = new System.Drawing.Size(304, 203);
this.typelist.TabIndex = 22;
@ -353,7 +353,7 @@ namespace CodeImp.DoomBuilder.Controls
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox tbFilter;
private System.Windows.Forms.Button bClear;
private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview typelist;
private CodeImp.DoomBuilder.Controls.MultiSelectTreeview typelist;
private System.Windows.Forms.Panel spritepanel;
private System.Windows.Forms.Timer updatetimer;
private ConfigurablePictureBox spritetex;

1
Source/Core/Controls/ThingBrowserControl.cs
View file

@ -23,7 +23,6 @@ using System.Globalization;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.Controls;
#endregion

4
Source/Core/Controls/ThingInfoPanel.Designer.cs generated
View file

@ -34,7 +34,7 @@ namespace CodeImp.DoomBuilder.Controls
System.Windows.Forms.Label label1;
this.labelaction = new System.Windows.Forms.Label();
this.infopanel = new System.Windows.Forms.GroupBox();
this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.anglecontrol = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.classname = new System.Windows.Forms.Label();
this.labelclass = new System.Windows.Forms.Label();
this.arg5 = new System.Windows.Forms.Label();
@ -435,7 +435,7 @@ namespace CodeImp.DoomBuilder.Controls
private System.Windows.Forms.GroupBox flagsPanel;
private System.Windows.Forms.ListView flags;
private System.Windows.Forms.Label labelaction;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
private CodeImp.DoomBuilder.Controls.AngleControlEx anglecontrol;
private ConfigurablePictureBox spritetex;
private System.Windows.Forms.Label classname;
private System.Windows.Forms.Label labelclass;

1
Source/Core/Data/DataManager.cs
View file

@ -28,7 +28,6 @@ using System.Threading;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.GZDoom;
using CodeImp.DoomBuilder.GZBuilder.MD3;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.IO;

1
Source/Core/Editing/GridSetup.cs
View file

@ -19,7 +19,6 @@
using System;
using System.IO;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Actions;

1
Source/Core/GZBuilder/Data/BoundingBox.cs
View file

@ -1,6 +1,5 @@
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Rendering;
using SlimDX;
namespace CodeImp.DoomBuilder.GZBuilder.Data
{

1
Source/Core/GZBuilder/Data/LinksCollector.cs
View file

@ -1,7 +1,6 @@
using System.Collections.Generic;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.VisualModes;

93
Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs
View file

@ -1,93 +0,0 @@
/*#region ================== Namespaces
using System;
using SlimDX.Direct3D9;
using CodeImp.DoomBuilder.Rendering;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Rendering
{
internal sealed class SizelessVisualThingCage : IDisposable, ID3DResource
{
#region ================== Constants
private const float RADIUS = 1.0f;
#endregion
#region ================== Variables
private VertexBuffer shape;
private bool isdisposed;
#endregion
#region ================== Properties
public VertexBuffer Shape { get { return shape; } }
#endregion
#region ================== Constructor / Disposer
public SizelessVisualThingCage()
{
// Create geometry
ReloadResource();
// Register as resource
General.Map.Graphics.RegisterResource(this);
}
public void Dispose()
{
// Not already disposed?
if(!isdisposed)
{
// Clean up
if(shape != null) shape.Dispose();
shape = null;
// Unregister resource
General.Map.Graphics.UnregisterResource(this);
// Done
isdisposed = true;
}
}
#endregion
#region ================== Methods
// This is called resets when the device is reset
// (when resized or display adapter was changed)
public void ReloadResource()
{
WorldVertex v0 = new WorldVertex(-RADIUS, -RADIUS, 0f);
WorldVertex v1 = new WorldVertex(RADIUS, RADIUS, 0f);
WorldVertex v2 = new WorldVertex(RADIUS, -RADIUS, 0f);
WorldVertex v3 = new WorldVertex(-RADIUS, RADIUS, 0f);
WorldVertex v4 = new WorldVertex(0f, 0f, RADIUS);
WorldVertex v5 = new WorldVertex(0f, 0f, -RADIUS);
WorldVertex[] vs = new[] { v0, v1, v2, v3, v4, v5 };
shape = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * vs.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
shape.Lock(0, WorldVertex.Stride * vs.Length, LockFlags.None).WriteRange(vs);
shape.Unlock();
}
// This is called before a device is reset
// (when resized or display adapter was changed)
public void UnloadResource()
{
// Trash geometry buffer
if(shape != null) shape.Dispose();
shape = null;
}
#endregion
}
}*/

124
Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs
View file

@ -1,124 +0,0 @@
/*#region ================== Namespaces
using System;
using SlimDX.Direct3D9;
using CodeImp.DoomBuilder.Rendering;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Rendering
{
sealed class ThingBoundingBox : IDisposable, ID3DResource
{
#region ================== Variables
private VertexBuffer cage;
private VertexBuffer arrow;
private bool isdisposed;
#endregion
#region ================== Properties
public VertexBuffer Cage { get { return cage; } }
public VertexBuffer Arrow { get { return arrow; } }
#endregion
#region ================== Constructor / Disposer
public ThingBoundingBox()
{
// Create geometry
ReloadResource();
// Register as resource
General.Map.Graphics.RegisterResource(this);
}
public void Dispose()
{
// Not already disposed?
if(!isdisposed)
{
if(arrow != null) arrow.Dispose();
if(cage != null) cage.Dispose();
// Unregister resource
General.Map.Graphics.UnregisterResource(this);
// Done
isdisposed = true;
}
}
#endregion
#region ================== Methods
// This is called resets when the device is reset
// (when resized or display adapter was changed)
public void ReloadResource()
{
WorldVertex v0 = new WorldVertex(-1.0f, -1.0f, 0.0f);
WorldVertex v1 = new WorldVertex(-1.0f, 1.0f, 0.0f);
WorldVertex v2 = new WorldVertex(1.0f, 1.0f, 0.0f);
WorldVertex v3 = new WorldVertex(1.0f, -1.0f, 0.0f);
WorldVertex v4 = new WorldVertex(-1.0f, -1.0f, 1.0f);
WorldVertex v5 = new WorldVertex(-1.0f, 1.0f, 1.0f);
WorldVertex v6 = new WorldVertex(1.0f, 1.0f, 1.0f);
WorldVertex v7 = new WorldVertex(1.0f, -1.0f, 1.0f);
//cage
WorldVertex[] cageVerts = new WorldVertex[] { v0, v1,
v1, v2,
v2, v3,
v3, v0,
v4, v5,
v5, v6,
v6, v7,
v7, v4,
v0, v4,
v1, v5,
v2, v6,
v3, v7 };
cage = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * cageVerts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
cage.Lock(0, WorldVertex.Stride * cageVerts.Length, LockFlags.None).WriteRange(cageVerts);
cage.Unlock();
//arrow
WorldVertex a0 = new WorldVertex(); //start
WorldVertex a1 = new WorldVertex( 0.0f, -1.5f, 0.0f); //end
WorldVertex a2 = new WorldVertex( 0.2f, -1.1f, 0.2f);
WorldVertex a3 = new WorldVertex(-0.2f, -1.1f, 0.2f);
WorldVertex a4 = new WorldVertex( 0.2f, -1.1f, -0.2f);
WorldVertex a5 = new WorldVertex(-0.2f, -1.1f, -0.2f);
WorldVertex[] arrowVerts = new WorldVertex[] {a0, a1,
a1, a2,
a1, a3,
a1, a4,
a1, a5};
arrow = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * arrowVerts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
arrow.Lock(0, WorldVertex.Stride * arrowVerts.Length, LockFlags.None).WriteRange(arrowVerts);
arrow.Unlock();
}
// This is called before a device is reset
// (when resized or display adapter was changed)
public void UnloadResource()
{
// Trash geometry buffers
if(cage != null) cage.Dispose();
if(arrow != null) arrow.Dispose();
cage = null;
arrow = null;
}
#endregion
}
}*/

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

@ -2086,7 +2086,7 @@ namespace CodeImp.DoomBuilder
try
{
// Try handling it in user-friendy way...
GZBuilder.Windows.ExceptionDialog dlg = new GZBuilder.Windows.ExceptionDialog(e);
ExceptionDialog dlg = new ExceptionDialog(e);
dlg.Setup();
if(dlg.ShowDialog() == DialogResult.Cancel) Terminate(false);
}
@ -2113,7 +2113,7 @@ namespace CodeImp.DoomBuilder
try
{
// Try handling it in user-friendy way...
GZBuilder.Windows.ExceptionDialog dlg = new GZBuilder.Windows.ExceptionDialog(e);
ExceptionDialog dlg = new ExceptionDialog(e);
dlg.Setup();
if(dlg.ShowDialog() == DialogResult.Cancel) Terminate(false);
}

1
Source/Core/General/Launcher.cs
View file

@ -24,7 +24,6 @@ using CodeImp.DoomBuilder.Actions;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.VisualModes;
using CodeImp.DoomBuilder.Windows;
#endregion

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

@ -29,12 +29,12 @@ using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
using CodeImp.DoomBuilder.GZBuilder.GZDoom; //mxd
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.VisualModes;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.ZDoom.Scripting;
#endregion

3
Source/Core/GZBuilder/Geometry/Line3D.cs → Source/Core/Geometry/Line3D.cs
View file

@ -1,8 +1,7 @@
using System;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Rendering;
namespace CodeImp.DoomBuilder.GZBuilder.Geometry
namespace CodeImp.DoomBuilder.Geometry
{
public class Line3D
{

2
Source/Core/Geometry/Tools.cs
View file

@ -22,8 +22,6 @@ using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;

1
Source/Core/IO/WAD.cs
View file

@ -18,7 +18,6 @@
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
using System.IO;

1
Source/Core/Map/MapSet.cs
View file

@ -30,7 +30,6 @@ using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.VisualModes;
using CodeImp.DoomBuilder.Data;
#endregion

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

@ -1,7 +1,6 @@
#region ================== Namespaces
using System;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Editing;

1
Source/Core/Rendering/D3DDevice.cs
View file

@ -21,7 +21,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Controls;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using SlimDX;
using SlimDX.Direct3D9;

1
Source/Core/Rendering/IRenderer2D.cs
View file

@ -21,7 +21,6 @@ using System.Drawing;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
#endregion

1
Source/Core/Rendering/IRenderer3D.cs
View file

@ -17,7 +17,6 @@
#region ================== Namespaces
using System.Collections.Generic;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.VisualModes;

1
Source/Core/Rendering/Renderer.cs
View file

@ -17,7 +17,6 @@
#region ================== Namespaces
using System;
using System.Drawing;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Geometry;

1
Source/Core/Rendering/Renderer2D.cs
View file

@ -26,7 +26,6 @@ using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
using CodeImp.DoomBuilder.GZBuilder.Geometry; //mxd
using CodeImp.DoomBuilder.Config; //mxd
#endregion

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

@ -23,9 +23,7 @@ using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.MD3;
using CodeImp.DoomBuilder.GZBuilder.Rendering;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.VisualModes;
using SlimDX;

1
Source/Core/Rendering/ShaderManager.cs
View file

@ -17,7 +17,6 @@
#region ================== Namespaces
using System;
using SlimDX.Direct3D9;
#endregion

9
Source/Core/Rendering/SurfaceManager.cs
View file

@ -18,13 +18,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Drawing;
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using SlimDX.Direct3D9;
using SlimDX;
using System.IO;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Map;
using SlimDX;
using SlimDX.Direct3D9;
#endregion

3
Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs → Source/Core/Rendering/VisualVertexHandle.cs
View file

@ -3,11 +3,10 @@
using System;
using CodeImp.DoomBuilder.VisualModes;
using SlimDX.Direct3D9;
using CodeImp.DoomBuilder.Rendering;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Rendering
namespace CodeImp.DoomBuilder.Rendering
{
internal sealed class VisualVertexHandle : IDisposable, ID3DResource
{

2
Source/Core/GZBuilder/Windows/ExceptionDialog.cs → Source/Core/Windows/ExceptionDialog.cs
View file

@ -8,7 +8,7 @@ using System.Threading;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Windows
namespace CodeImp.DoomBuilder.Windows
{
public partial class ExceptionDialog : Form
{

2
Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs → Source/Core/Windows/ExceptionDialog.designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Windows
namespace CodeImp.DoomBuilder.Windows
{
partial class ExceptionDialog
{

0
Source/Core/GZBuilder/Windows/ExceptionDialog.resx → Source/Core/Windows/ExceptionDialog.resx
View file

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

@ -53,7 +53,7 @@ namespace CodeImp.DoomBuilder.Windows
this.flagsgroup = new System.Windows.Forms.GroupBox();
this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
this.idgroup = new System.Windows.Forms.GroupBox();
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.tagSelector = new CodeImp.DoomBuilder.Controls.TagSelector();
this.frontside = new System.Windows.Forms.CheckBox();
this.frontgroup = new System.Windows.Forms.GroupBox();
this.replaceunusedfronttextures = new System.Windows.Forms.CheckBox();
@ -61,7 +61,7 @@ namespace CodeImp.DoomBuilder.Windows
this.frontlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.frontmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.fronthigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.frontTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
this.frontTextureOffset = new CodeImp.DoomBuilder.Controls.PairedIntControl();
this.backside = new System.Windows.Forms.CheckBox();
this.backgroup = new System.Windows.Forms.GroupBox();
this.replaceunusedbacktextures = new System.Windows.Forms.CheckBox();
@ -69,7 +69,7 @@ namespace CodeImp.DoomBuilder.Windows
this.backlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backhigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
this.backTextureOffset = new CodeImp.DoomBuilder.Controls.PairedIntControl();
this.panel = new System.Windows.Forms.Panel();
this.tooltip = new System.Windows.Forms.ToolTip(this.components);
label2 = new System.Windows.Forms.Label();
@ -650,9 +650,9 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.GroupBox idgroup;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox frontsector;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backsector;
private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl frontTextureOffset;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl backTextureOffset;
private CodeImp.DoomBuilder.Controls.TagSelector tagSelector;
private CodeImp.DoomBuilder.Controls.PairedIntControl frontTextureOffset;
private CodeImp.DoomBuilder.Controls.PairedIntControl backTextureOffset;
private System.Windows.Forms.Panel panel;
private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;
private System.Windows.Forms.ToolTip tooltip;

60
Source/Core/Windows/LinedefEditFormUDMF.Designer.cs generated
View file

@ -56,7 +56,7 @@ namespace CodeImp.DoomBuilder.Windows
this.activationGroup = new System.Windows.Forms.GroupBox();
this.missingactivation = new System.Windows.Forms.PictureBox();
this.idgroup = new System.Windows.Forms.GroupBox();
this.tagsselector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector();
this.tagsselector = new CodeImp.DoomBuilder.Controls.TagsSelector();
this.tabfront = new System.Windows.Forms.TabPage();
this.frontside = new System.Windows.Forms.CheckBox();
this.frontgroup = new System.Windows.Forms.GroupBox();
@ -67,18 +67,18 @@ namespace CodeImp.DoomBuilder.Windows
this.labelFrontScaleBottom = new System.Windows.Forms.Label();
this.labelFrontScaleMid = new System.Windows.Forms.Label();
this.labelFrontScaleTop = new System.Windows.Forms.Label();
this.pfcFrontScaleTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontScaleBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontScaleMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontScaleTop = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcFrontScaleBottom = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcFrontScaleMid = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.labelFrontTextureOffset = new System.Windows.Forms.Label();
this.labelFrontOffsetBottom = new System.Windows.Forms.Label();
this.frontTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
this.frontTextureOffset = new CodeImp.DoomBuilder.Controls.PairedIntControl();
this.labelFrontOffsetMid = new System.Windows.Forms.Label();
this.pfcFrontOffsetTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontOffsetTop = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.labelFrontOffsetTop = new System.Windows.Forms.Label();
this.pfcFrontOffsetMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontOffsetBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcFrontOffsetMid = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcFrontOffsetBottom = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.resetfrontlight = new System.Windows.Forms.Button();
this.frontsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -105,18 +105,18 @@ namespace CodeImp.DoomBuilder.Windows
this.labelBackScaleBottom = new System.Windows.Forms.Label();
this.labelBackScaleMid = new System.Windows.Forms.Label();
this.labelBackScaleTop = new System.Windows.Forms.Label();
this.pfcBackScaleTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcBackScaleBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcBackScaleMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcBackScaleTop = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcBackScaleBottom = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcBackScaleMid = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.labelBackTextureOffset = new System.Windows.Forms.Label();
this.labelBackOffsetBottom = new System.Windows.Forms.Label();
this.labelBackOffsetMid = new System.Windows.Forms.Label();
this.labelBackOffsetTop = new System.Windows.Forms.Label();
this.pfcBackOffsetTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcBackOffsetMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.pfcBackOffsetBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.backTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
this.pfcBackOffsetTop = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcBackOffsetMid = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.pfcBackOffsetBottom = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.backTextureOffset = new CodeImp.DoomBuilder.Controls.PairedIntControl();
this.backlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
this.backhigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
@ -1486,18 +1486,18 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backsector;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lightFront;
private System.Windows.Forms.CheckBox cbLightAbsoluteFront;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontOffsetTop;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontOffsetBottom;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontOffsetMid;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontScaleBottom;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontScaleMid;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontScaleTop;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackScaleBottom;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackScaleMid;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackScaleTop;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetBottom;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetMid;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetTop;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcFrontOffsetTop;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcFrontOffsetBottom;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcFrontOffsetMid;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcFrontScaleBottom;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcFrontScaleMid;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcFrontScaleTop;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcBackScaleBottom;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcBackScaleMid;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcBackScaleTop;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcBackOffsetBottom;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcBackOffsetMid;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl pfcBackOffsetTop;
private System.Windows.Forms.GroupBox groupsettings;
private System.Windows.Forms.ComboBox renderStyle;
private System.Windows.Forms.Label labelLightFront;
@ -1505,8 +1505,8 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Label labelLightBack;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lightBack;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox alpha;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl frontTextureOffset;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl backTextureOffset;
private CodeImp.DoomBuilder.Controls.PairedIntControl frontTextureOffset;
private CodeImp.DoomBuilder.Controls.PairedIntControl backTextureOffset;
private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flagsFront;
private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flagsBack;
private System.Windows.Forms.GroupBox activationGroup;
@ -1543,7 +1543,7 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.TabPage tabcomment;
private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
private CodeImp.DoomBuilder.Controls.ArgumentsControl argscontrol;
private CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector tagsselector;
private CodeImp.DoomBuilder.Controls.TagsSelector tagsselector;
private System.Windows.Forms.Button resetfrontlight;
private System.Windows.Forms.Button resetbacklight;
private System.Windows.Forms.CheckBox replaceunusedfronttextures;

2
Source/Core/Windows/LinedefEditFormUDMF.cs
View file

@ -21,7 +21,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.GZBuilder.Controls;
using CodeImp.DoomBuilder.Controls;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Types;

1
Source/Core/Windows/MainForm.cs
View file

@ -35,7 +35,6 @@ using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Windows;
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Plugins;

4
Source/Core/Windows/SectorEditForm.Designer.cs generated
View file

@ -42,7 +42,7 @@ namespace CodeImp.DoomBuilder.Windows
System.Windows.Forms.Label label4;
this.browseeffect = new System.Windows.Forms.Button();
this.effect = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.tagSelector = new CodeImp.DoomBuilder.Controls.TagSelector();
this.heightoffset = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.ceilingheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -446,7 +446,7 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilingheight;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorheight;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox brightness;
private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
private CodeImp.DoomBuilder.Controls.TagSelector tagSelector;
private System.Windows.Forms.Panel panel1;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox heightoffset;
private System.Windows.Forms.ToolTip tooltip;

36
Source/Core/Windows/SectorEditFormUDMF.Designer.cs generated
View file

@ -44,11 +44,11 @@
System.Windows.Forms.Label label16;
System.Windows.Forms.Label label18;
System.Windows.Forms.Label label19;
this.tagsselector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector();
this.tagsselector = new CodeImp.DoomBuilder.Controls.TagsSelector();
this.soundsequence = new System.Windows.Forms.ComboBox();
this.resetsoundsequence = new System.Windows.Forms.Button();
this.fadeColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
this.lightColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
this.fadeColor = new CodeImp.DoomBuilder.Controls.ColorFieldsControl();
this.lightColor = new CodeImp.DoomBuilder.Controls.ColorFieldsControl();
this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.desaturation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.gravity = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -78,7 +78,7 @@
this.labelFloorOffsets = new System.Windows.Forms.Label();
this.labelFloorScale = new System.Windows.Forms.Label();
this.cbUseFloorLineAngles = new System.Windows.Forms.CheckBox();
this.floorAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.floorAngleControl = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.labelfloorrenderstyle = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.floorAlpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -88,8 +88,8 @@
this.label12 = new System.Windows.Forms.Label();
this.floorBrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.floorRenderStyle = new System.Windows.Forms.ComboBox();
this.floorScale = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.floorOffsets = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.floorScale = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.floorOffsets = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.floortex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.resetceilterrain = new System.Windows.Forms.Button();
@ -99,7 +99,7 @@
this.labelCeilOffsets = new System.Windows.Forms.Label();
this.labelCeilScale = new System.Windows.Forms.Label();
this.cbUseCeilLineAngles = new System.Windows.Forms.CheckBox();
this.ceilAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.ceilAngleControl = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.labelceilrenderstyle = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.ceilAlpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
@ -109,8 +109,8 @@
this.labelLightFront = new System.Windows.Forms.Label();
this.ceilBrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.ceilRenderStyle = new System.Windows.Forms.ComboBox();
this.ceilScale = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.ceilOffsets = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
this.ceilScale = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.ceilOffsets = new CodeImp.DoomBuilder.Controls.PairedFieldsControl();
this.ceilingtex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
this.tabslopes = new System.Windows.Forms.TabPage();
this.groupBox5 = new System.Windows.Forms.GroupBox();
@ -1452,9 +1452,9 @@
private System.Windows.Forms.Button apply;
private System.Windows.Forms.TabPage tabSurfaces;
private System.Windows.Forms.GroupBox groupBox1;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl ceilOffsets;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl ceilOffsets;
private CodeImp.DoomBuilder.Controls.FlatSelectorControl ceilingtex;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl ceilScale;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl ceilScale;
private System.Windows.Forms.ComboBox ceilRenderStyle;
private System.Windows.Forms.Label label4;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilAlpha;
@ -1474,16 +1474,16 @@
private System.Windows.Forms.Label label12;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorBrightness;
private System.Windows.Forms.ComboBox floorRenderStyle;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl floorScale;
private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl floorOffsets;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl floorScale;
private CodeImp.DoomBuilder.Controls.PairedFieldsControl floorOffsets;
private CodeImp.DoomBuilder.Controls.FlatSelectorControl floortex;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl floorAngleControl;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl ceilAngleControl;
private CodeImp.DoomBuilder.Controls.AngleControlEx floorAngleControl;
private CodeImp.DoomBuilder.Controls.AngleControlEx ceilAngleControl;
private System.Windows.Forms.GroupBox groupBox3;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox gravity;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox desaturation;
private CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl fadeColor;
private CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl lightColor;
private CodeImp.DoomBuilder.Controls.ColorFieldsControl fadeColor;
private CodeImp.DoomBuilder.Controls.ColorFieldsControl lightColor;
private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
private System.Windows.Forms.CheckBox cbUseFloorLineAngles;
private System.Windows.Forms.CheckBox cbUseCeilLineAngles;
@ -1502,7 +1502,7 @@
private System.Windows.Forms.ComboBox soundsequence;
private System.Windows.Forms.TabPage tabcomment;
private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
private CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector tagsselector;
private CodeImp.DoomBuilder.Controls.TagsSelector tagsselector;
private System.Windows.Forms.Button resetfloorlight;
private System.Windows.Forms.Button resetceillight;
private System.Windows.Forms.Label label3;

8
Source/Core/Windows/SectorEditFormUDMF.cs
View file

@ -400,12 +400,12 @@ namespace CodeImp.DoomBuilder.Windows
if(s.Fields.GetValue("rotationceiling", 0.0f).ToString() != ceilRotation.Text)
{
ceilRotation.Text = "";
ceilAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
ceilAngleControl.Angle = AngleControlEx.NO_ANGLE;
}
if(s.Fields.GetValue("rotationfloor", 0.0f).ToString() != floorRotation.Text)
{
floorRotation.Text = "";
floorAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
floorAngleControl.Angle = AngleControlEx.NO_ANGLE;
}
//Texture brightness
@ -1039,7 +1039,7 @@ namespace CodeImp.DoomBuilder.Windows
//restore values
if(string.IsNullOrEmpty(floorRotation.Text))
{
floorAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
floorAngleControl.Angle = AngleControlEx.NO_ANGLE;
foreach(Sector s in sectors)
{
@ -1070,7 +1070,7 @@ namespace CodeImp.DoomBuilder.Windows
//restore values
if(string.IsNullOrEmpty(ceilRotation.Text))
{
ceilAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
ceilAngleControl.Angle = AngleControlEx.NO_ANGLE;
foreach(Sector s in sectors)
{

2
Source/Core/GZBuilder/Windows/TagStatisticsForm.Designer.cs → Source/Core/Windows/TagStatisticsForm.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Windows
namespace CodeImp.DoomBuilder.Windows
{
partial class TagStatisticsForm
{

3
Source/Core/GZBuilder/Windows/TagStatisticsForm.cs → Source/Core/Windows/TagStatisticsForm.cs
View file

@ -8,11 +8,10 @@ using System.Windows.Forms;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Windows;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.Windows
namespace CodeImp.DoomBuilder.Windows
{
public partial class TagStatisticsForm : DelayedForm
{

0
Source/Core/GZBuilder/Windows/TagStatisticsForm.resx → Source/Core/Windows/TagStatisticsForm.resx
View file

6
Source/Core/Windows/TextureBrowserForm.Designer.cs generated
View file

@ -33,7 +33,7 @@ namespace CodeImp.DoomBuilder.Windows
this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button();
this.smallimages = new System.Windows.Forms.ImageList(this.components);
this.tvTextureSets = new CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview();
this.tvTextureSets = new CodeImp.DoomBuilder.Controls.MultiSelectTreeview();
this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
this.panel = new System.Windows.Forms.Panel();
this.splitter = new CodeImp.DoomBuilder.Controls.CollapsibleSplitContainer();
@ -96,7 +96,7 @@ namespace CodeImp.DoomBuilder.Windows
this.tvTextureSets.Name = "tvTextureSets";
this.tvTextureSets.SelectedImageIndex = 0;
this.tvTextureSets.SelectionBackColor = System.Drawing.SystemColors.Highlight;
this.tvTextureSets.SelectionMode = CodeImp.DoomBuilder.GZBuilder.Controls.TreeViewSelectionMode.SingleSelect;
this.tvTextureSets.SelectionMode = CodeImp.DoomBuilder.Controls.TreeViewSelectionMode.SingleSelect;
this.tvTextureSets.Size = new System.Drawing.Size(198, 402);
this.tvTextureSets.TabIndex = 4;
this.tvTextureSets.TabStop = false;
@ -188,7 +188,7 @@ namespace CodeImp.DoomBuilder.Windows
private System.Windows.Forms.Button cancel;
private System.Windows.Forms.Button apply;
private System.Windows.Forms.ImageList smallimages;
private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview tvTextureSets;
private CodeImp.DoomBuilder.Controls.MultiSelectTreeview tvTextureSets;
private System.Windows.Forms.Panel panel;
private CodeImp.DoomBuilder.Controls.CollapsibleSplitContainer splitter;
}

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

@ -40,7 +40,7 @@ namespace CodeImp.DoomBuilder.Windows
this.zlabel = new System.Windows.Forms.Label();
this.typegroup = new System.Windows.Forms.GroupBox();
this.thingtype = new CodeImp.DoomBuilder.Controls.ThingBrowserControl();
this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.anglecontrol = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.cbRandomAngle = new System.Windows.Forms.CheckBox();
this.angle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
@ -53,7 +53,7 @@ namespace CodeImp.DoomBuilder.Windows
this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
this.browseaction = new System.Windows.Forms.Button();
this.idgroup = new System.Windows.Forms.GroupBox();
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.tagSelector = new CodeImp.DoomBuilder.Controls.TagSelector();
this.cancel = new System.Windows.Forms.Button();
this.apply = new System.Windows.Forms.Button();
this.hint = new System.Windows.Forms.PictureBox();
@ -498,8 +498,8 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox posX;
private System.Windows.Forms.CheckBox cbAbsoluteHeight;
private System.Windows.Forms.CheckBox cbRandomAngle;
private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
private CodeImp.DoomBuilder.Controls.TagSelector tagSelector;
private CodeImp.DoomBuilder.Controls.AngleControlEx anglecontrol;
private System.Windows.Forms.PictureBox hint;
private System.Windows.Forms.Label hintlabel;
private System.Windows.Forms.PictureBox missingflags;

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

@ -21,6 +21,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Controls;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Types;
@ -313,7 +314,7 @@ namespace CodeImp.DoomBuilder.Windows
{
if(preventchanges) return;
preventchanges = true;
anglecontrol.Angle = angle.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
anglecontrol.Angle = angle.GetResult(AngleControlEx.NO_ANGLE);
preventchanges = false;
if(!preventmapchange) ApplyAngleChange(); //mxd
}

24
Source/Core/Windows/ThingEditFormUDMF.Designer.cs generated
View file

@ -41,7 +41,7 @@
this.labelpitch = new System.Windows.Forms.Label();
this.angle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.labelAngle = new System.Windows.Forms.Label();
this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.anglecontrol = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.labelGravity = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.tabs = new System.Windows.Forms.TabControl();
@ -50,9 +50,9 @@
this.missingflags = new System.Windows.Forms.PictureBox();
this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
this.grouproll = new System.Windows.Forms.GroupBox();
this.rollControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.rollControl = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.grouppitch = new System.Windows.Forms.GroupBox();
this.pitchControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
this.pitchControl = new CodeImp.DoomBuilder.Controls.AngleControlEx();
this.groupangle = new System.Windows.Forms.GroupBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.cbAbsoluteHeight = new System.Windows.Forms.CheckBox();
@ -75,8 +75,8 @@
this.gravity = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.grouprendering = new System.Windows.Forms.GroupBox();
this.labelScale = new System.Windows.Forms.Label();
this.scale = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFloatControl();
this.color = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
this.scale = new CodeImp.DoomBuilder.Controls.PairedFloatControl();
this.color = new CodeImp.DoomBuilder.Controls.ColorFieldsControl();
this.alpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
this.label8 = new System.Windows.Forms.Label();
this.renderStyle = new System.Windows.Forms.ComboBox();
@ -87,7 +87,7 @@
this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
this.browseaction = new System.Windows.Forms.Button();
this.grouptag = new System.Windows.Forms.GroupBox();
this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
this.tagSelector = new CodeImp.DoomBuilder.Controls.TagSelector();
this.tabcomment = new System.Windows.Forms.TabPage();
this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
this.tabcustom = new System.Windows.Forms.TabPage();
@ -1043,9 +1043,9 @@
private CodeImp.DoomBuilder.Controls.ThingBrowserControl thingtype;
private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox angle;
private System.Windows.Forms.Label labelAngle;
private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
private CodeImp.DoomBuilder.Controls.TagSelector tagSelector;
private System.Windows.Forms.Label labelGravity;
private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
private CodeImp.DoomBuilder.Controls.AngleControlEx anglecontrol;
private System.Windows.Forms.PictureBox hint;
private System.Windows.Forms.Label hintlabel;
private System.Windows.Forms.GroupBox groupBox1;
@ -1074,17 +1074,17 @@
private System.Windows.Forms.Label label10;
private Controls.ButtonsNumericTextbox score;
private System.Windows.Forms.Label label9;
private GZBuilder.Controls.ColorFieldsControl color;
private CodeImp.DoomBuilder.Controls.ColorFieldsControl color;
private System.Windows.Forms.GroupBox settingsgroup;
private Controls.CheckboxArrayControl flags;
private Controls.ButtonsNumericTextbox conversationID;
private System.Windows.Forms.Label labelID;
private System.Windows.Forms.GroupBox grouproll;
private GZBuilder.Controls.AngleControl rollControl;
private CodeImp.DoomBuilder.Controls.AngleControlEx rollControl;
private System.Windows.Forms.GroupBox grouppitch;
private GZBuilder.Controls.AngleControl pitchControl;
private CodeImp.DoomBuilder.Controls.AngleControlEx pitchControl;
private System.Windows.Forms.GroupBox groupangle;
private GZBuilder.Controls.PairedFloatControl scale;
private CodeImp.DoomBuilder.Controls.PairedFloatControl scale;
private System.Windows.Forms.PictureBox missingflags;
private System.Windows.Forms.ToolTip tooltip;
private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;

11
Source/Core/Windows/ThingEditFormUDMF.cs
View file

@ -21,6 +21,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Controls;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Types;
@ -375,7 +376,7 @@ namespace CodeImp.DoomBuilder.Windows
{
if(preventchanges) return;
preventchanges = true;
anglecontrol.Angle = angle.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
anglecontrol.Angle = angle.GetResult(AngleControlEx.NO_ANGLE);
preventchanges = false;
if(!preventmapchange) ApplyAngleChange(); //mxd
}
@ -391,9 +392,9 @@ namespace CodeImp.DoomBuilder.Windows
private void pitch_WhenTextChanged(object sender, EventArgs e)
{
if(preventchanges) return;
int p = pitch.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
int p = pitch.GetResult(AngleControlEx.NO_ANGLE);
preventchanges = true;
pitchControl.Angle = (p == GZBuilder.Controls.AngleControl.NO_ANGLE ? p : p + 90);
pitchControl.Angle = (p == AngleControlEx.NO_ANGLE ? p : p + 90);
preventchanges = false;
if(!preventmapchange) ApplyPitchChange();
}
@ -408,9 +409,9 @@ namespace CodeImp.DoomBuilder.Windows
private void roll_WhenTextChanged(object sender, EventArgs e)
{
if(preventchanges) return;
int r = roll.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
int r = roll.GetResult(AngleControlEx.NO_ANGLE);
preventchanges = true;
rollControl.Angle = (r == GZBuilder.Controls.AngleControl.NO_ANGLE ? r : r + 90);
rollControl.Angle = (r == AngleControlEx.NO_ANGLE ? r : r + 90);
preventchanges = false;
if(!preventmapchange) ApplyRollChange();
}

2
Source/Core/GZBuilder/Windows/ThingStatisticsForm.Designer.cs → Source/Core/Windows/ThingStatisticsForm.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace CodeImp.DoomBuilder.GZBuilder.Windows
namespace CodeImp.DoomBuilder.Windows
{
partial class ThingStatisticsForm
{

3
Source/Core/GZBuilder/Windows/ThingStatisticsForm.cs → Source/Core/Windows/ThingStatisticsForm.cs
View file

@ -7,9 +7,8 @@ using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Windows;
namespace CodeImp.DoomBuilder.GZBuilder.Windows
namespace CodeImp.DoomBuilder.Windows
{
public partial class ThingStatisticsForm : DelayedForm
{

0
Source/Core/GZBuilder/Windows/ThingStatisticsForm.resx → Source/Core/Windows/ThingStatisticsForm.resx
View file

3
Source/Core/GZBuilder/GZDoom/GldefsParser.cs → Source/Core/ZDoom/GldefsParser.cs
View file

@ -7,14 +7,13 @@ using System.Collections.Generic;
using System.Globalization;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.ZDoom;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.IO;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom
{
internal sealed class GldefsParser : ZDTextParser
{

3
Source/Core/GZBuilder/GZDoom/MapinfoParser.cs → Source/Core/ZDoom/MapinfoParser.cs
View file

@ -7,12 +7,11 @@ using System.IO;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.ZDoom;
using CodeImp.DoomBuilder.GZBuilder.Data;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom
{
internal sealed class MapinfoParser : ZDTextParser
{

3
Source/Core/GZBuilder/GZDoom/ModeldefParser.cs → Source/Core/ZDoom/ModeldefParser.cs
View file

@ -5,13 +5,12 @@ using System.Collections.Generic;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.ZDoom;
using CodeImp.DoomBuilder.GZBuilder.Data;
using SlimDX;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom
{
internal class ModeldefParser : ZDTextParser
{

2
Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs → Source/Core/ZDoom/ModeldefStructure.cs
View file

@ -9,7 +9,7 @@ using CodeImp.DoomBuilder.GZBuilder.Data;
#endregion
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom
{
internal sealed class ModeldefStructure
{

3
Source/Core/GZBuilder/GZDoom/AcsParserSE.cs → Source/Core/ZDoom/Scripting/AcsParserSE.cs
View file

@ -6,13 +6,12 @@ using System.Collections.Generic;
using System.Globalization;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.ZDoom;
using CodeImp.DoomBuilder.GZBuilder.Data;
#endregion
//mxd. ACS parser used to create ScriptItems for use in script editor's navigator
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom.Scripting
{
internal sealed class AcsParserSE : ZDTextParser
{

3
Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs → Source/Core/ZDoom/Scripting/DecorateParserSE.cs
View file

@ -1,12 +1,11 @@
using System.Collections.Generic;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.ZDoom;
using CodeImp.DoomBuilder.GZBuilder.Data;
//mxd. Decorate parser used to create ScriptItems for use in script editor's navigator
//Should be able to parse actor definitions even from invalid DECORATE and should never fail parsing
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom.Scripting
{
internal sealed class DecorateParserSE : ZDTextParser
{

7
Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs → Source/Core/ZDoom/Scripting/ModeldefParserSE.cs
View file

@ -1,17 +1,16 @@
using CodeImp.DoomBuilder.Data;

#region ================== Namespaces
using System.Collections.Generic;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.ZDoom;
#endregion
//mxd. Modeldef parser used to create ScriptItems for use in script editor's navigator
//Should be parse model definitions even from invalid MODELDEF and should never fail parsing
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom.Scripting
{
internal sealed class ModeldefParserSE : ZDTextParser
{

3
Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs → Source/Core/ZDoom/Scripting/ScriptTypeParserSE.cs
View file

@ -3,12 +3,11 @@
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.ZDoom;
#endregion
//mxd. Parser used to determine which script type given text is.
namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
namespace CodeImp.DoomBuilder.ZDoom.Scripting
{
internal sealed class ScriptTypeParserSE :ZDTextParser
{

1
Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs
View file

@ -23,7 +23,6 @@ using System.Windows.Forms;
using CodeImp.DoomBuilder.Actions;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Windows;

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

@ -27,7 +27,6 @@ using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;

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

@ -25,7 +25,6 @@ using CodeImp.DoomBuilder.BuilderModes.Interface;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;

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

@ -26,7 +26,6 @@ using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;

1
Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
View file

@ -1,7 +1,6 @@
#region ================== Namespaces
using System;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;

1
Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
View file

@ -17,7 +17,6 @@
#region ================== Namespaces
using System;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;

1
Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
View file

@ -17,7 +17,6 @@
#region ================== Namespaces
using System;
using CodeImp.DoomBuilder.Config;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;

1
Source/Plugins/BuilderModes/General/BuilderPlug.cs
View file

@ -31,7 +31,6 @@ using CodeImp.DoomBuilder.Controls;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Plugins;
using CodeImp.DoomBuilder.Rendering;

1
Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
View file

@ -25,7 +25,6 @@ using System.Windows.Forms;
using CodeImp.DoomBuilder.Data;
using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.GZBuilder.Data;
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.VisualModes;

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

@ -18,7 +18,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using CodeImp.DoomBuilder.BuilderModes.Interface;
using CodeImp.DoomBuilder.Windows;

3
Source/Plugins/NodesViewer/BuilderPlug.cs
View file

@ -16,9 +16,6 @@
#region ================== Namespaces
using System;
using System.IO;
#endregion
namespace CodeImp.DoomBuilder.Plugins.NodesViewer

1
Source/Plugins/TagRange/BuilderPlug.cs
View file

@ -16,7 +16,6 @@
#region ================== Namespaces
using System.Windows.Forms;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.Editing;
using CodeImp.DoomBuilder.Plugins;