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

Classic modes: 3D floor indicators can be disabled in preferences (Preferences -> Appearance -> Mark 3D floors in classic modes).

Browse source 
Updated documentation.
This commit is contained in:
MaxED 2013-08-21 11:20:00 +00:00
parent 7ba352216d
commit a8aa277faa
7 changed files with 53 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Help/gzdb/features/features.html
View file

@ -101,7 +101,8 @@
<li><a href="classic_modes/mode_drawcurve.html"><span class="style1"><strong>[new]</strong></span> Draw Curve mode</a>.</li>
<li><a href="classic_modes/mode_drawbridge.html">Bridge mode</a>.</li>
<li><a href="classic_modes/mode_snapverts.html">Snap vertices mode</a>.</li>
<li><span class="style5">[new]</span> 3D floor indication (color can be changed in <strong>Preferences -&gt; Appearance -&gt; 3D Floors</strong>) <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
<li><span class="style5">[new]</span> 3D floor indication (color can be changed in <strong>Preferences -&gt; Appearance -&gt; 3D Floors</strong>, the setting can be disabled in <a href="../preferences.html#markextrafloors">Preferences</a>)
<input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
<div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"> <img src="classic_modes/3dfloor_marks.jpg" alt="" /></div>
</li>
<li>Line angle and front side direction are displayed when a line is drawn in Draw Geometry mode.</li>

44
Help/gzdb/preferences.html
View file

@ -12,6 +12,10 @@
color: #990000;
font-weight: bold;
}
.style4 {
color: #FFFFFF;
font-weight: bold;
}
-->
</style>
</head>
@ -30,34 +34,42 @@
<p>There are several new options avaliable in GZDoom Builder's <strong>Preferences window</strong> (F5):</p>
<table valign="top" width="100%" border="0" cellspacing="3" cellpadding="3">
<tr valign="top">
<td width="550px"><img src="preferences1.jpg" /></td>
<td style="background-color:#333333" colspan="2"><h3 class="style4">Interface tab</h3></td>
</tr>
<tr valign="top">
<td><p><strong>1. Vertex scale factor:</strong> controls the size of vertex handles.</p>
<p><strong><a name="synch_camera" id="synch_camera"></a>2.<a href="features/all_modes/synch_camera.html"> Sync camera position between 2D and 3D modes</a>:</strong> when enabled, GZDoom Builder will center 2D-mode on Visual Camera position when you leave Visual mode, and will place Visual Camera at cursor position when you toggle from 2D-mode to Visual Mode (unless you have Visual Mode camera thing in your map).</p>
<p><strong>3. Rendering toolbar:</strong> if enabled, <a href="features/general/rendering_toolbar.html">Rendering toolbar</a> will be shown in the main editing window.</p>
</td>
<p><strong>3. Rendering toolbar:</strong> if enabled, <a href="features/general/rendering_toolbar.html">Rendering toolbar</a> will be shown in the main editing window.</p> </td>
<td><img src="preferences1.jpg" alt="" /></td>
</tr>
<tr valign="top">
<td style="background-color:#333333" colspan="2"><h3 class="style4">Appearance tab</h3></td>
<td>&nbsp;</td>
</tr>
<tr valign="top">
<td><img src="preferences2.jpg" /></td>
<td><p><strong>1. Model wireframe color:</strong> lets you choose a color, which is used to render model wireframe in 2D-mode.</p>
<p><strong>2. Color of <a href="features/all_modes/event_lines.html">event lines</a>.</strong></p>
<p><strong>3. Color, used in Classic modes to indicate that sector has 3D floors.</strong></p>
<p><strong>4. Number of newly created sectors</strong> to colourise using different color. Possible values are [0..8].</p>
<p><strong>5. Maximum dynamic lights to render:</strong> lets you choose how many dynamic lights to render in Visual mode. Decrease this to improve performance when Dynamic Lights Rendering is on. Possible values are [1..32].</p>
<p><strong>6. Dynamic light size:</strong> this option mimics GZDoom's &quot;light size&quot; option.</p>
<p><strong>7. Dynamic light intensity:</strong> this option mimics GZDoom's &quot;light intensity&quot; option.</p>
<p><strong>8. Load GZDoom light definitions:</strong> if enabled, GZDoom's built-in GLDEFS dynamic light definitions will be loaded. <span class="style1">Warning:</span> if a map is loaded, you'll need to reload resources after changing this option to apply the changes.</p>
<p><strong>9. Scale models in visual modes:</strong> if enabled, height of models will be scaled down by 15% in Visual mode to mimick GZDoom's way of rendering.</p>
<p><strong>10. Always show selection in visual modes:</strong> if enabled, selected surfaces will be highlighted in Visual mode
even if &quot;Show highlight&quot; mode is disabled Doom Builder 2 behaviour).</p></td>
<p><strong>4. Maximum dynamic lights to render:</strong> lets you choose how many dynamic lights to render in Visual mode. Decrease this to improve performance when Dynamic Lights Rendering is on. Possible values are [1..32].</p>
<p><strong>5. Dynamic light size:</strong> this option mimics GZDoom's &quot;light size&quot; option.</p>
<p><strong>6. Dynamic light intensity:</strong> this option mimics GZDoom's &quot;light intensity&quot; option.</p>
<p><strong>7. Load GZDoom light definitions:</strong> if enabled, GZDoom's built-in GLDEFS dynamic light definitions will be loaded. <span class="style1">Warning:</span> if a map is loaded, you'll need to reload resources after changing this option to apply the changes.</p>
<p><strong>8. Scale models in visual modes:</strong> if enabled, height of models will be scaled down by 15% in Visual mode to mimick GZDoom's way of rendering.</p>
<p><strong>9. Always show selection in visual modes:</strong> if enabled, selected surfaces will be highlighted in Visual mode
even if &quot;Show highlight&quot; mode is disabled Doom Builder 2 behaviour).</p>
<p><strong><a name="markextrafloors" id="markextrafloors"></a>10. Mark 3D floors in classic modes:</strong> when enabled, linedefs of sectors with 3d floors will be marked using &quot;3D Floors&quot; color.</p></td>
<td><img src="preferences2.jpg" alt="" /></td>
</tr>
<tr valign="top">
<td><img src="preferences3.jpg" /></td>
<td style="background-color:#333333" colspan="2"><h3 class="style4">Editing tab</h3></td>
<td>&nbsp;</td>
<tr valign="top">
<td><p><strong>1. Auto-align textures on newly created linedefs.</strong> When enabled, auto texture alignment will be applied to sidedefs created after drawing deometry.</p>
<p><strong>2. Try to align horizontal texture offset of dragged geometry.</strong> When enabled, texture offsets of sidedefs, adjacent to dragged geometry, will be aligned to dragged geometry.</p>
<p><strong>3. Don't move selection if any part of it is outside of map boundary.</strong> When enabled, geometry outisde of map boundaries can not be dragged. When disabled, geometry will be moved inside of map boundary, most likely destroying sector shapes in process (DB2 behaviour).</p>
<p><strong><a name="synch_selection" id="synch_selection"></a>4. <a href="features/all_modes/synch_selection.html">Synchronise selection between Visual and Classic modes</a>.</strong></p>
</td>
</table>
<p><strong><a name="synch_selection" id="synch_selection"></a>4. <a href="features/all_modes/synch_selection.html">Synchronise selection between Visual and Classic modes</a>.</strong></p> </td>
<td><img src="preferences3.jpg" alt="" /></td>
</table>
</div>

BIN
Help/gzdb/preferences2.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 111 KiB

6
Source/Core/Config/ProgramConfiguration.cs
View file

@ -111,6 +111,7 @@ namespace CodeImp.DoomBuilder.Config
private bool gzLoadDefaultLightDefinitions;
private bool gzForceDefaultTextures;
private string lastUsedConfigName;
private bool gzMarkExtraFloors;
// These are not stored in the configuration, only used at runtime
private string defaulttexture;
@ -196,7 +197,8 @@ namespace CodeImp.DoomBuilder.Config
public bool GZLoadDefaultLightDefinitions { get { return gzLoadDefaultLightDefinitions; } internal set { gzLoadDefaultLightDefinitions = value; } }
public bool GZForceDefaultTextures { get { return gzForceDefaultTextures; } internal set { gzForceDefaultTextures = value; } }
public string LastUsedConfigName { get { return lastUsedConfigName; } internal set { lastUsedConfigName = value; } }
public bool GZMarkExtraFloors { get { return gzMarkExtraFloors; } internal set { gzMarkExtraFloors = value; } }
public string DefaultTexture { get { return defaulttexture; } set { defaulttexture = value; } }
public string DefaultFloorTexture { get { return defaultfloortexture; } set { defaultfloortexture = value; } }
public string DefaultCeilingTexture { get { return defaultceiltexture; } set { defaultceiltexture = value; } }
@ -296,6 +298,7 @@ namespace CodeImp.DoomBuilder.Config
gzVisualVertexSize = cfg.ReadSetting("gzvisualvertexsize", 6);
gzLoadDefaultLightDefinitions = cfg.ReadSetting("gzloaddefaultlightdefinitions", true);
lastUsedConfigName = cfg.ReadSetting("lastusedconfigname", "");
gzMarkExtraFloors = cfg.ReadSetting("gzmarkextrafloors", true);
// Success
return true;
@ -374,6 +377,7 @@ namespace CodeImp.DoomBuilder.Config
cfg.WriteSetting("gzshowvisualvertices", gzShowVisualVertices);
cfg.WriteSetting("gzvisualvertexsize", gzVisualVertexSize);
cfg.WriteSetting("gzloaddefaultlightdefinitions", gzLoadDefaultLightDefinitions);
cfg.WriteSetting("gzmarkextrafloors", gzMarkExtraFloors);
if(!string.IsNullOrEmpty(lastUsedConfigName))
cfg.WriteSetting("lastusedconfigname", lastUsedConfigName);

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

@ -1592,7 +1592,7 @@ namespace CodeImp.DoomBuilder.Rendering
Vector2D v2 = l.End.Position.GetTransformed(translatex, translatey, scale, -scale);
// Draw line. mxd: added 3d-floor indication
if(l.ExtraFloorFlag) {
if(l.ExtraFloorFlag && General.Settings.GZMarkExtraFloors) {
plotter.DrawLine3DFloor(v1, v2, ref c, General.Colors.ThreeDFloor);
} else {
plotter.DrawLineSolid((int)v1.x, (int)v1.y, (int)v2.x, (int)v2.y, ref c);

15
Source/Core/Windows/PreferencesForm.Designer.cs generated
View file

@ -159,6 +159,7 @@ namespace CodeImp.DoomBuilder.Windows
this.label16 = new System.Windows.Forms.Label();
this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.cbMarkExtraFloors = new System.Windows.Forms.CheckBox();
label7 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label();
@ -1271,6 +1272,7 @@ namespace CodeImp.DoomBuilder.Windows
this.appearancegroup1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.appearancegroup1.Controls.Add(this.cbMarkExtraFloors);
this.appearancegroup1.Controls.Add(this.cbLoadGameGldefs);
this.appearancegroup1.Controls.Add(this.cbOldHighlightMode);
this.appearancegroup1.Controls.Add(label21);
@ -1717,6 +1719,18 @@ namespace CodeImp.DoomBuilder.Windows
this.pasteoptions.Size = new System.Drawing.Size(666, 427);
this.pasteoptions.TabIndex = 0;
//
// cbMarkExtraFloors
//
this.cbMarkExtraFloors.AutoSize = true;
this.cbMarkExtraFloors.Location = new System.Drawing.Point(236, 254);
this.cbMarkExtraFloors.Name = "cbMarkExtraFloors";
this.cbMarkExtraFloors.Size = new System.Drawing.Size(179, 18);
this.cbMarkExtraFloors.TabIndex = 35;
this.cbMarkExtraFloors.Text = "Mark 3D floors in classic modes";
this.toolTip1.SetToolTip(this.cbMarkExtraFloors, "When enabled, linedefs of sectors with 3d floors will be marked using \"3D Floors\"" +
" color.");
this.cbMarkExtraFloors.UseVisualStyleBackColor = true;
//
// PreferencesForm
//
this.AcceptButton = this.apply;
@ -1900,5 +1914,6 @@ namespace CodeImp.DoomBuilder.Windows
private CodeImp.DoomBuilder.Controls.ColorControl color3dFloors;
private System.Windows.Forms.TextBox actiondescription;
private System.Windows.Forms.RichTextBox fontpreview;
private System.Windows.Forms.CheckBox cbMarkExtraFloors;
}
}

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

@ -104,6 +104,7 @@ namespace CodeImp.DoomBuilder.Windows
vertexScale.Value = General.Clamp((int)(General.Settings.GZVertexScale2D), vertexScale.Minimum, vertexScale.Maximum);
vertexScaleLabel.Text = vertexScale.Value * 100 + "%" + (vertexScale.Value == 1 ? " (default)" : "");
cbLoadGameGldefs.Checked = General.Settings.GZLoadDefaultLightDefinitions;
cbMarkExtraFloors.Checked = General.Settings.GZMarkExtraFloors;
// Fill fonts list
scriptfontname.BeginUpdate();
@ -289,6 +290,7 @@ namespace CodeImp.DoomBuilder.Windows
General.Settings.GZVertexScale2D = vertexScale.Value;
General.Settings.GZOldHighlightMode = cbOldHighlightMode.Checked;
General.Settings.GZLoadDefaultLightDefinitions = cbLoadGameGldefs.Checked;
General.Settings.GZMarkExtraFloors = cbMarkExtraFloors.Checked;
// Paste options
General.Settings.PasteOptions = pasteoptions.GetOptions();