mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-02-17 01:22:18 +00:00
Add menu & toolbar toggles for NiGHTS, zoom tube and polyobject rendering
This commit is contained in:
spherallic
parent
79f66f1b9b
commit
b6779c4c8d
9 changed files with 2900 additions and 82 deletions
|
|
@ -906,6 +906,8 @@
|
|||
<EmbeddedResource Include="Resources\MissingTexture3D.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\polycenter.png" />
|
||||
<None Include="Resources\ZoomTube.png" />
|
||||
<None Include="Resources\UZB16.png" />
|
||||
<None Include="Resources\UZB_Splash.png" />
|
||||
<None Include="Resources\UZB.ico" />
|
||||
|
|
@ -1392,6 +1394,7 @@
|
|||
<None Include="Resources\Angle6.png" />
|
||||
<None Include="Resources\Angle7.png" />
|
||||
<None Include="Resources\AboutBack.png" />
|
||||
<None Include="Resources\axis1.png" />
|
||||
<Content Include="Resources\ClassicRendering.png" />
|
||||
<Content Include="Resources\DB2.ico" />
|
||||
<None Include="Resources\GZDB2.ico" />
|
||||
|
|
|
|||
30
Source/Core/Properties/Resources.Designer.cs
generated
30
Source/Core/Properties/Resources.Designer.cs
generated
|
|
@ -1010,6 +1010,16 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap NiGHTSAxis {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("NiGHTSAxis", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -1060,6 +1070,16 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap Polyobject {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Polyobject", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -1789,5 +1809,15 @@ namespace CodeImp.DoomBuilder.Properties {
|
|||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap ZoomTube {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("ZoomTube", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -637,4 +637,13 @@
|
|||
<data name="UZB_Splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\UZB_Splash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="NiGHTSAxis" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\axis1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Polyobject" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\polycenter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ZoomTube" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ZoomTube.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
BIN
Source/Core/Resources/ZoomTube.png
Normal file
BIN
Source/Core/Resources/ZoomTube.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 314 B |
BIN
Source/Core/Resources/axis1.png
Normal file
BIN
Source/Core/Resources/axis1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 405 B |
BIN
Source/Core/Resources/polycenter.png
Normal file
BIN
Source/Core/Resources/polycenter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 399 B |
101
Source/Core/Windows/MainForm.Designer.cs
generated
101
Source/Core/Windows/MainForm.Designer.cs
generated
|
|
@ -293,6 +293,14 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.itemaligngridtolinedef = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.itemsetgridorigintovertex = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.itemresetgrid = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.buttontogglerendernights = new CodeImp.DoomBuilder.Controls.ToolStripActionButton();
|
||||
this.buttontogglerenderzoomtubes = new CodeImp.DoomBuilder.Controls.ToolStripActionButton();
|
||||
this.buttontogglerenderpolyobjects = new CodeImp.DoomBuilder.Controls.ToolStripActionButton();
|
||||
this.itemtogglerendernights = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.itemtogglerenderzoomtubes = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.itemtogglerenderpolyobjects = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.seperatorviewsrb2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.separatorsrb2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||
toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
|
||||
toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
|
||||
|
|
@ -792,6 +800,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.itemviewfloors,
|
||||
this.itemviewceilings,
|
||||
this.seperatorviewviews,
|
||||
this.itemtogglerendernights,
|
||||
this.itemtogglerenderzoomtubes,
|
||||
this.itemtogglerenderpolyobjects,
|
||||
this.seperatorviewsrb2,
|
||||
this.itemfullbrightness,
|
||||
this.itemtogglegrid,
|
||||
this.itemtogglecomments,
|
||||
|
|
@ -1387,6 +1399,10 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.buttonviewbrightness,
|
||||
this.buttonviewfloors,
|
||||
this.buttonviewceilings,
|
||||
this.separatorsrb2,
|
||||
this.buttontogglerendernights,
|
||||
this.buttontogglerenderzoomtubes,
|
||||
this.buttontogglerenderpolyobjects,
|
||||
this.separatorgeomergemodes,
|
||||
this.buttonmergegeoclassic,
|
||||
this.buttonmergegeo,
|
||||
|
|
@ -2858,6 +2874,83 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.itemdynamicgridsize.Text = "Dynamic Grid Size";
|
||||
this.itemdynamicgridsize.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// buttontogglerendernights
|
||||
//
|
||||
this.buttontogglerendernights.CheckOnClick = true;
|
||||
this.buttontogglerendernights.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.buttontogglerendernights.Image = global::CodeImp.DoomBuilder.Properties.Resources.NiGHTSAxis;
|
||||
this.buttontogglerendernights.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.buttontogglerendernights.Name = "buttontogglerendernights";
|
||||
this.buttontogglerendernights.Size = new System.Drawing.Size(23, 20);
|
||||
this.buttontogglerendernights.Tag = "builder_srb2togglenights";
|
||||
this.buttontogglerendernights.Text = "Render NiGHTS track";
|
||||
this.buttontogglerendernights.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// buttontogglerenderzoomtubes
|
||||
//
|
||||
this.buttontogglerenderzoomtubes.CheckOnClick = true;
|
||||
this.buttontogglerenderzoomtubes.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.buttontogglerenderzoomtubes.Image = global::CodeImp.DoomBuilder.Properties.Resources.ZoomTube;
|
||||
this.buttontogglerenderzoomtubes.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.buttontogglerenderzoomtubes.Name = "buttontogglerenderzoomtubes";
|
||||
this.buttontogglerenderzoomtubes.Size = new System.Drawing.Size(23, 20);
|
||||
this.buttontogglerenderzoomtubes.Tag = "builder_srb2togglezoomtubes";
|
||||
this.buttontogglerenderzoomtubes.Text = "Render zoom tube waypoints";
|
||||
this.buttontogglerenderzoomtubes.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// buttontogglerenderpolyobjects
|
||||
//
|
||||
this.buttontogglerenderpolyobjects.CheckOnClick = true;
|
||||
this.buttontogglerenderpolyobjects.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.buttontogglerenderpolyobjects.Image = global::CodeImp.DoomBuilder.Properties.Resources.Polyobject;
|
||||
this.buttontogglerenderpolyobjects.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.buttontogglerenderpolyobjects.Name = "buttontogglerenderpolyobjects";
|
||||
this.buttontogglerenderpolyobjects.Size = new System.Drawing.Size(23, 20);
|
||||
this.buttontogglerenderpolyobjects.Tag = "builder_srb2togglepolyobjects";
|
||||
this.buttontogglerenderpolyobjects.Text = "Render polyobjects";
|
||||
this.buttontogglerenderpolyobjects.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// itemtogglerendernights
|
||||
//
|
||||
this.itemtogglerendernights.CheckOnClick = true;
|
||||
this.itemtogglerendernights.Image = global::CodeImp.DoomBuilder.Properties.Resources.NiGHTSAxis;
|
||||
this.itemtogglerendernights.Name = "itemtogglerendernights";
|
||||
this.itemtogglerendernights.Size = new System.Drawing.Size(273, 22);
|
||||
this.itemtogglerendernights.Tag = "builder_srb2rendernights";
|
||||
this.itemtogglerendernights.Text = "Render NiGHTS track";
|
||||
this.itemtogglerendernights.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// itemtogglerenderzoomtubes
|
||||
//
|
||||
this.itemtogglerenderzoomtubes.CheckOnClick = true;
|
||||
this.itemtogglerenderzoomtubes.Image = global::CodeImp.DoomBuilder.Properties.Resources.ZoomTube;
|
||||
this.itemtogglerenderzoomtubes.Name = "itemtogglerenderzoomtubes";
|
||||
this.itemtogglerenderzoomtubes.Size = new System.Drawing.Size(273, 22);
|
||||
this.itemtogglerenderzoomtubes.Tag = "builder_srb2renderzoomtubes";
|
||||
this.itemtogglerenderzoomtubes.Text = "Render zoom tube waypoints";
|
||||
this.itemtogglerenderzoomtubes.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// itemtogglerenderpolyobjects
|
||||
//
|
||||
this.itemtogglerenderpolyobjects.CheckOnClick = true;
|
||||
this.itemtogglerenderpolyobjects.Image = global::CodeImp.DoomBuilder.Properties.Resources.Polyobject;
|
||||
this.itemtogglerenderpolyobjects.Name = "itemtogglerenderpolyobjects";
|
||||
this.itemtogglerenderpolyobjects.Size = new System.Drawing.Size(273, 22);
|
||||
this.itemtogglerenderpolyobjects.Tag = "builder_srb2togglepolyobjects";
|
||||
this.itemtogglerenderpolyobjects.Text = "Render polyobjects";
|
||||
this.itemtogglerenderpolyobjects.Click += new System.EventHandler(this.InvokeTaggedAction);
|
||||
//
|
||||
// seperatorviewsrb2
|
||||
//
|
||||
this.seperatorviewsrb2.Name = "seperatorviewsrb2";
|
||||
this.seperatorviewsrb2.Size = new System.Drawing.Size(212, 6);
|
||||
//
|
||||
// separatorsrb2
|
||||
//
|
||||
this.separatorsrb2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
|
||||
this.separatorsrb2.Name = "separatorsrb2";
|
||||
this.separatorsrb2.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
|
|
@ -3117,6 +3210,14 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
private System.Windows.Forms.ToolStripMenuItem itemtoggleclassicrendering;
|
||||
private System.Windows.Forms.ToolStripMenuItem itemtoggleeventlines;
|
||||
private System.Windows.Forms.ToolStripMenuItem itemtogglevisualverts;
|
||||
private CodeImp.DoomBuilder.Controls.ToolStripActionButton buttontogglerendernights;
|
||||
private CodeImp.DoomBuilder.Controls.ToolStripActionButton buttontogglerenderzoomtubes;
|
||||
private CodeImp.DoomBuilder.Controls.ToolStripActionButton buttontogglerenderpolyobjects;
|
||||
private System.Windows.Forms.ToolStripMenuItem itemtogglerendernights;
|
||||
private System.Windows.Forms.ToolStripMenuItem itemtogglerenderzoomtubes;
|
||||
private System.Windows.Forms.ToolStripMenuItem itemtogglerenderpolyobjects;
|
||||
private System.Windows.Forms.ToolStripSeparator seperatorviewsrb2;
|
||||
private System.Windows.Forms.ToolStripSeparator separatorsrb2;
|
||||
private ToolStripMenuItem itemimport;
|
||||
private ToolStripMenuItem itemexport;
|
||||
private ToolStripSeparator separatorio;
|
||||
|
|
|
|||
|
|
@ -2196,6 +2196,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
buttonautoclearsidetextures.Visible = General.Settings.ToolbarGeometry && maploaded; //mxd
|
||||
buttontest.Visible = General.Settings.ToolbarTesting && maploaded;
|
||||
buttontoggleclassicrendering.Visible = General.Settings.ToolbarViewModes && maploaded;
|
||||
buttontogglerendernights.Visible = General.Settings.ToolbarViewModes && maploaded;
|
||||
buttontogglerenderzoomtubes.Visible = General.Settings.ToolbarViewModes && maploaded;
|
||||
buttontogglerenderpolyobjects.Visible = General.Settings.ToolbarViewModes && maploaded;
|
||||
|
||||
//mxd
|
||||
modelrendermode.Visible = General.Settings.GZToolbarGZDoom && maploaded;
|
||||
|
|
@ -2377,6 +2380,9 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
buttontoggleeventlines.Checked = General.Settings.GZShowEventLines;
|
||||
buttontogglevisualvertices.Visible = General.Map.UDMF;
|
||||
buttontogglevisualvertices.Checked = General.Settings.GZShowVisualVertices;
|
||||
buttontogglerendernights.Checked = General.Settings.SRB2RenderNiGHTS;
|
||||
buttontogglerenderzoomtubes.Checked = General.Settings.SRB2RenderZoomTubes;
|
||||
buttontogglerenderpolyobjects.Checked = General.Settings.SRB2RenderPolyobjects;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3222,9 +3228,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
itemtoggleeventlines.Checked = General.Settings.GZShowEventLines;
|
||||
itemtogglevisualverts.Visible = (General.Map != null && General.Map.UDMF);
|
||||
itemtogglevisualverts.Checked = General.Settings.GZShowVisualVertices;
|
||||
itemtogglerendernights.Checked = General.Settings.SRB2RenderNiGHTS;
|
||||
itemtogglerenderzoomtubes.Checked = General.Settings.SRB2RenderZoomTubes;
|
||||
itemtogglerenderpolyobjects.Checked = General.Settings.SRB2RenderPolyobjects;
|
||||
|
||||
// Update Model Rendering Mode items...
|
||||
foreach(ToolStripMenuItem item in itemmodelmodes.DropDownItems)
|
||||
foreach (ToolStripMenuItem item in itemmodelmodes.DropDownItems)
|
||||
{
|
||||
item.Checked = ((ModelRenderMode)item.Tag == General.Settings.GZDrawModelsMode);
|
||||
if(item.Checked) itemmodelmodes.Image = item.Image;
|
||||
|
|
@ -3354,8 +3363,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
{
|
||||
General.Settings.SRB2RenderNiGHTS = !General.Settings.SRB2RenderNiGHTS;
|
||||
|
||||
//itemtogglerendernights.Checked = General.Settings.SRB2RenderNiGHTS;
|
||||
//buttontogglerendernights.Checked = General.Settings.SRB2RenderNiGHTS;
|
||||
itemtogglerendernights.Checked = General.Settings.SRB2RenderNiGHTS;
|
||||
buttontogglerendernights.Checked = General.Settings.SRB2RenderNiGHTS;
|
||||
|
||||
General.MainWindow.DisplayStatus(StatusType.Action, "NiGHTS track rendering " + (General.Settings.SRB2RenderNiGHTS ? "ENABLED" : "DISABLED"));
|
||||
General.MainWindow.RedrawDisplay();
|
||||
|
|
@ -3367,8 +3376,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
{
|
||||
General.Settings.SRB2RenderZoomTubes = !General.Settings.SRB2RenderZoomTubes;
|
||||
|
||||
//itemtogglerenderzoomtubes.Checked = General.Settings.SRB2RenderZoomTubes;
|
||||
//buttontogglerenderzoomtubes.Checked = General.Settings.SRB2RenderZoomTubes;
|
||||
itemtogglerenderzoomtubes.Checked = General.Settings.SRB2RenderZoomTubes;
|
||||
buttontogglerenderzoomtubes.Checked = General.Settings.SRB2RenderZoomTubes;
|
||||
|
||||
General.MainWindow.DisplayStatus(StatusType.Action, "Zoom tube waypoint rendering is " + (General.Settings.SRB2RenderZoomTubes ? "ENABLED" : "DISABLED"));
|
||||
General.MainWindow.RedrawDisplay();
|
||||
|
|
@ -3380,8 +3389,8 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
{
|
||||
General.Settings.SRB2RenderPolyobjects = !General.Settings.SRB2RenderPolyobjects;
|
||||
|
||||
//itemtogglerenderpolyobjects.Checked = General.Settings.SRB2RenderPolyobjects;
|
||||
//buttontogglerenderpolyobjects.Checked = General.Settings.SRB2RenderPolyobjects;
|
||||
itemtogglerenderpolyobjects.Checked = General.Settings.SRB2RenderPolyobjects;
|
||||
buttontogglerenderpolyobjects.Checked = General.Settings.SRB2RenderPolyobjects;
|
||||
|
||||
General.MainWindow.DisplayStatus(StatusType.Action, "Polyobject preview rendering is " + (General.Settings.SRB2RenderPolyobjects ? "ENABLED" : "DISABLED"));
|
||||
General.MainWindow.RedrawDisplay();
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue