stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2024-11-10 06:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clear out GZBuilder directory a bit

Browse source
This commit is contained in:
spherallic 2023-05-09 00:02:14 +02:00
parent bd87668555
commit a9ca5ae625
28 changed files with 25 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Source/Core/Builder.csproj
View file

@ -184,10 +184,10 @@
<Compile Include="GZBuilder\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="IO\SRB2MapSetIO.cs" />
@ -579,7 +579,7 @@
<EmbeddedResource Include="GZBuilder\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">
@ -927,13 +927,11 @@
<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="Map\MergeGeometryMode.cs" />
<Compile Include="Map\SectorBuilder.cs" />
<Compile Include="GZBuilder\Rendering\VisualVertexHandle.cs" />
<Compile Include="GZBuilder\Geometry\Line3D.cs" />
<Compile Include="Rendering\VisualVertexHandle.cs" />
<Compile Include="Geometry\Line3D.cs" />
<Compile Include="GZBuilder\GZDoom\DecorateParserSE.cs" />
<Compile Include="GZBuilder\GZDoom\GldefsParser.cs" />
<Compile Include="GZBuilder\GZDoom\MapinfoParser.cs" />
@ -945,16 +943,16 @@
<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="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" />
@ -1126,10 +1124,10 @@
<EmbeddedResource Include="GZBuilder\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/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

@ -2073,7 +2073,7 @@ namespace CodeImp.DoomBuilder
{
try
{
GZBuilder.Windows.ExceptionDialog dlg = new GZBuilder.Windows.ExceptionDialog(e);
Windows.ExceptionDialog dlg = new Windows.ExceptionDialog(e);
dlg.Setup();
if(dlg.ShowDialog() == DialogResult.Cancel) Application.Exit();
}
@ -2118,7 +2118,7 @@ namespace CodeImp.DoomBuilder
+ exc.Message + "\n\nInitial exception:\n" + exceptionmsg, "Fatal Non-UI Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
}
GZBuilder.Windows.ExceptionDialog dlg = new GZBuilder.Windows.ExceptionDialog(e);
Windows.ExceptionDialog dlg = new Windows.ExceptionDialog(e);
dlg.Setup();
dlg.ShowDialog();
}

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

@ -2,7 +2,7 @@
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

@ -23,7 +23,7 @@ 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.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;

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

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

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

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
using static System.Windows.Forms.VisualStyles.VisualStyleElement;

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

@ -23,9 +23,8 @@ 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.Rendering;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.VisualModes;
using SlimDX;

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

@ -7,7 +7,7 @@ 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

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

@ -35,7 +35,7 @@ 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.Windows;
using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Plugins;

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
{

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

@ -12,7 +12,7 @@ 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

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
{

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

@ -9,7 +9,7 @@ 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

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

@ -26,7 +26,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/General/Association.cs
View file

@ -26,7 +26,6 @@ using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
using CodeImp.DoomBuilder.Types;
using CodeImp.DoomBuilder.Windows;
using CodeImp.DoomBuilder.GZBuilder.Geometry;
#endregion

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;