mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-26 13:51:40 +00:00
- Increased max view distance from 9000 to 64000 map units. Step size increased from 200 to 500 map units
@ Improved performance of VisualBlockMap.GetFrustumRange so that high view distances is actually usable. This does not do anything to the rendering speed, so that's still slow
This commit is contained in:
biwa
parent
560d23894d
commit
4b86f5458f
4 changed files with 2407 additions and 2365 deletions
|
|
@ -21,6 +21,8 @@ using System.Collections.Generic;
|
|||
using CodeImp.DoomBuilder.Map;
|
||||
using CodeImp.DoomBuilder.Geometry;
|
||||
using System.Drawing;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
|
||||
#endregion
|
||||
|
||||
|
|
@ -105,15 +107,13 @@ namespace CodeImp.DoomBuilder.VisualModes
|
|||
public VisualBlockEntry GetBlock(Point p)
|
||||
{
|
||||
ulong k = GetBlockKey(p);
|
||||
if(blockmap.ContainsKey(k))
|
||||
{
|
||||
return blockmap[k];
|
||||
}
|
||||
VisualBlockEntry vbe;
|
||||
|
||||
if (blockmap.TryGetValue(k, out vbe))
|
||||
return vbe;
|
||||
else
|
||||
{
|
||||
return (blockmap[k] = new VisualBlockEntry());
|
||||
}
|
||||
}
|
||||
|
||||
// This clears the blockmap
|
||||
public void Clear()
|
||||
|
|
@ -148,18 +148,54 @@ namespace CodeImp.DoomBuilder.VisualModes
|
|||
{
|
||||
// Make square range from frustum circle
|
||||
// This will be the range in which we will test blocks
|
||||
Point lt = GetBlockCoordinates(frustum.Center - frustum.Radius);
|
||||
Point rb = GetBlockCoordinates(frustum.Center + frustum.Radius);
|
||||
Point lb = GetBlockCoordinates(frustum.Center - frustum.Radius);
|
||||
Point rt = GetBlockCoordinates(frustum.Center + frustum.Radius);
|
||||
|
||||
Vector2D maplb = new Vector2D();
|
||||
Vector2D maprt = new Vector2D();
|
||||
|
||||
Vertex firstvertex = General.Map.Map.Vertices.OfType<Vertex>().FirstOrDefault();
|
||||
|
||||
if (firstvertex != null)
|
||||
maplb = maprt = firstvertex.Position;
|
||||
|
||||
// Get maximum dimensions of the map. First vertices...
|
||||
foreach (Vertex v in General.Map.Map.Vertices)
|
||||
{
|
||||
if (v.Position.x < maplb.x) maplb.x = v.Position.x;
|
||||
if (v.Position.y < maplb.y) maplb.y = v.Position.y;
|
||||
if (v.Position.x > maprt.x) maprt.x = v.Position.x;
|
||||
if (v.Position.y > maprt.y) maprt.y = v.Position.y;
|
||||
}
|
||||
|
||||
// ... then things
|
||||
foreach (Thing t in General.Map.Map.Things)
|
||||
{
|
||||
if (t.Position.x < maplb.x) maplb.x = t.Position.x;
|
||||
if (t.Position.y < maplb.y) maplb.y = t.Position.y;
|
||||
if (t.Position.x > maprt.x) maprt.x = t.Position.x;
|
||||
if (t.Position.y > maprt.y) maprt.y = t.Position.y;
|
||||
}
|
||||
|
||||
Point mlb = GetBlockCoordinates(maplb);
|
||||
Point mrt = GetBlockCoordinates(maprt);
|
||||
|
||||
// Make sure that the checked region does not exceed the dimensions where something is to be displayed
|
||||
if (lb.X < mlb.X) lb.X = mlb.X;
|
||||
if (lb.Y < mlb.Y) lb.Y = mlb.Y;
|
||||
if (rt.X > mrt.X) rt.X = mrt.X;
|
||||
if (rt.Y > mrt.Y) rt.Y = mrt.Y;
|
||||
|
||||
// Constants we need
|
||||
float blockfrustumdistance2 = (frustum.Radius * frustum.Radius) + (BLOCK_RADIUS * BLOCK_RADIUS);
|
||||
|
||||
// Go through the range to make a list
|
||||
int entriescount = (rb.X - lt.X) * (rb.Y - lt.Y);
|
||||
int entriescount = (rt.X - lb.X) * (rt.Y - lb.Y);
|
||||
List<VisualBlockEntry> entries = new List<VisualBlockEntry>(entriescount);
|
||||
for(int x = lt.X; x <= rb.X; x++)
|
||||
|
||||
for (int x = lb.X; x <= rt.X; x++)
|
||||
{
|
||||
for(int y = lt.Y; y <= rb.Y; y++)
|
||||
for(int y = lb.Y; y <= rt.Y; y++)
|
||||
{
|
||||
// First check if the block circle is intersecting the frustum circle
|
||||
Point block = new Point(x, y);
|
||||
|
|
|
|||
74
Source/Core/Windows/PreferencesForm.Designer.cs
generated
74
Source/Core/Windows/PreferencesForm.Designer.cs
generated
|
|
@ -341,13 +341,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// recentFiles
|
||||
//
|
||||
this.recentFiles.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.recentFiles.BackColor = System.Drawing.Color.Transparent;
|
||||
this.recentFiles.LargeChange = 1;
|
||||
this.recentFiles.Location = new System.Drawing.Point(127, 156);
|
||||
this.recentFiles.Maximum = 25;
|
||||
this.recentFiles.Minimum = 8;
|
||||
this.recentFiles.Name = "recentFiles";
|
||||
this.recentFiles.Size = new System.Drawing.Size(116, 42);
|
||||
this.recentFiles.Size = new System.Drawing.Size(116, 45);
|
||||
this.recentFiles.TabIndex = 5;
|
||||
this.recentFiles.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.recentFiles.Value = 8;
|
||||
|
|
@ -393,12 +393,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// vertexScale
|
||||
//
|
||||
this.vertexScale.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.vertexScale.BackColor = System.Drawing.Color.Transparent;
|
||||
this.vertexScale.LargeChange = 1;
|
||||
this.vertexScale.Location = new System.Drawing.Point(127, 119);
|
||||
this.vertexScale.Minimum = 1;
|
||||
this.vertexScale.Name = "vertexScale";
|
||||
this.vertexScale.Size = new System.Drawing.Size(116, 42);
|
||||
this.vertexScale.Size = new System.Drawing.Size(116, 45);
|
||||
this.vertexScale.TabIndex = 4;
|
||||
this.vertexScale.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.vertexScale.Value = 1;
|
||||
|
|
@ -436,12 +436,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// zoomfactor
|
||||
//
|
||||
this.zoomfactor.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.zoomfactor.BackColor = System.Drawing.Color.Transparent;
|
||||
this.zoomfactor.LargeChange = 1;
|
||||
this.zoomfactor.Location = new System.Drawing.Point(127, 82);
|
||||
this.zoomfactor.Minimum = 1;
|
||||
this.zoomfactor.Name = "zoomfactor";
|
||||
this.zoomfactor.Size = new System.Drawing.Size(116, 42);
|
||||
this.zoomfactor.Size = new System.Drawing.Size(116, 45);
|
||||
this.zoomfactor.TabIndex = 3;
|
||||
this.zoomfactor.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.zoomfactor.Value = 3;
|
||||
|
|
@ -467,12 +467,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// autoscrollspeed
|
||||
//
|
||||
this.autoscrollspeed.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.autoscrollspeed.BackColor = System.Drawing.Color.Transparent;
|
||||
this.autoscrollspeed.LargeChange = 1;
|
||||
this.autoscrollspeed.Location = new System.Drawing.Point(127, 45);
|
||||
this.autoscrollspeed.Maximum = 5;
|
||||
this.autoscrollspeed.Name = "autoscrollspeed";
|
||||
this.autoscrollspeed.Size = new System.Drawing.Size(116, 42);
|
||||
this.autoscrollspeed.Size = new System.Drawing.Size(116, 45);
|
||||
this.autoscrollspeed.TabIndex = 2;
|
||||
this.autoscrollspeed.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.autoscrollspeed.ValueChanged += new System.EventHandler(this.autoscrollspeed_ValueChanged);
|
||||
|
|
@ -1052,13 +1052,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// vertexScale3D
|
||||
//
|
||||
this.vertexScale3D.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.vertexScale3D.BackColor = System.Drawing.Color.Transparent;
|
||||
this.vertexScale3D.LargeChange = 1;
|
||||
this.vertexScale3D.Location = new System.Drawing.Point(116, 133);
|
||||
this.vertexScale3D.Maximum = 15;
|
||||
this.vertexScale3D.Minimum = 2;
|
||||
this.vertexScale3D.Name = "vertexScale3D";
|
||||
this.vertexScale3D.Size = new System.Drawing.Size(150, 42);
|
||||
this.vertexScale3D.Size = new System.Drawing.Size(150, 45);
|
||||
this.vertexScale3D.TabIndex = 3;
|
||||
this.vertexScale3D.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.vertexScale3D.Value = 10;
|
||||
|
|
@ -1075,13 +1075,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// viewdistance
|
||||
//
|
||||
this.viewdistance.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.viewdistance.BackColor = System.Drawing.Color.Transparent;
|
||||
this.viewdistance.LargeChange = 2;
|
||||
this.viewdistance.Location = new System.Drawing.Point(116, 169);
|
||||
this.viewdistance.Maximum = 45;
|
||||
this.viewdistance.Maximum = 128;
|
||||
this.viewdistance.Minimum = 1;
|
||||
this.viewdistance.Name = "viewdistance";
|
||||
this.viewdistance.Size = new System.Drawing.Size(150, 42);
|
||||
this.viewdistance.Size = new System.Drawing.Size(150, 45);
|
||||
this.viewdistance.TabIndex = 4;
|
||||
this.viewdistance.TickFrequency = 2;
|
||||
this.viewdistance.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
|
|
@ -1090,12 +1090,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// movespeed
|
||||
//
|
||||
this.movespeed.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.movespeed.BackColor = System.Drawing.Color.Transparent;
|
||||
this.movespeed.Location = new System.Drawing.Point(116, 96);
|
||||
this.movespeed.Maximum = 20;
|
||||
this.movespeed.Minimum = 1;
|
||||
this.movespeed.Name = "movespeed";
|
||||
this.movespeed.Size = new System.Drawing.Size(150, 42);
|
||||
this.movespeed.Size = new System.Drawing.Size(150, 45);
|
||||
this.movespeed.TabIndex = 2;
|
||||
this.movespeed.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.movespeed.Value = 1;
|
||||
|
|
@ -1103,12 +1103,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// mousespeed
|
||||
//
|
||||
this.mousespeed.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.mousespeed.BackColor = System.Drawing.Color.Transparent;
|
||||
this.mousespeed.Location = new System.Drawing.Point(116, 57);
|
||||
this.mousespeed.Maximum = 20;
|
||||
this.mousespeed.Minimum = 1;
|
||||
this.mousespeed.Name = "mousespeed";
|
||||
this.mousespeed.Size = new System.Drawing.Size(150, 42);
|
||||
this.mousespeed.Size = new System.Drawing.Size(150, 45);
|
||||
this.mousespeed.TabIndex = 1;
|
||||
this.mousespeed.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.mousespeed.Value = 1;
|
||||
|
|
@ -1116,13 +1116,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// fieldofview
|
||||
//
|
||||
this.fieldofview.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.fieldofview.BackColor = System.Drawing.Color.Transparent;
|
||||
this.fieldofview.LargeChange = 1;
|
||||
this.fieldofview.Location = new System.Drawing.Point(116, 20);
|
||||
this.fieldofview.Maximum = 17;
|
||||
this.fieldofview.Minimum = 5;
|
||||
this.fieldofview.Name = "fieldofview";
|
||||
this.fieldofview.Size = new System.Drawing.Size(150, 42);
|
||||
this.fieldofview.Size = new System.Drawing.Size(150, 45);
|
||||
this.fieldofview.TabIndex = 0;
|
||||
this.fieldofview.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.fieldofview.Value = 5;
|
||||
|
|
@ -1471,11 +1471,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// activethingsalpha
|
||||
//
|
||||
this.activethingsalpha.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.activethingsalpha.BackColor = System.Drawing.Color.Transparent;
|
||||
this.activethingsalpha.LargeChange = 3;
|
||||
this.activethingsalpha.Location = new System.Drawing.Point(199, 57);
|
||||
this.activethingsalpha.Name = "activethingsalpha";
|
||||
this.activethingsalpha.Size = new System.Drawing.Size(154, 42);
|
||||
this.activethingsalpha.Size = new System.Drawing.Size(154, 45);
|
||||
this.activethingsalpha.TabIndex = 1;
|
||||
this.activethingsalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.activethingsalpha.ValueChanged += new System.EventHandler(this.activethingsalpha_ValueChanged);
|
||||
|
|
@ -1509,12 +1509,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// antialiasing
|
||||
//
|
||||
this.antialiasing.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.antialiasing.BackColor = System.Drawing.Color.Transparent;
|
||||
this.antialiasing.LargeChange = 1;
|
||||
this.antialiasing.Location = new System.Drawing.Point(199, 327);
|
||||
this.antialiasing.Maximum = 3;
|
||||
this.antialiasing.Name = "antialiasing";
|
||||
this.antialiasing.Size = new System.Drawing.Size(154, 42);
|
||||
this.antialiasing.Size = new System.Drawing.Size(154, 45);
|
||||
this.antialiasing.TabIndex = 9;
|
||||
this.antialiasing.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.antialiasing.Value = 3;
|
||||
|
|
@ -1531,12 +1531,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// anisotropicfiltering
|
||||
//
|
||||
this.anisotropicfiltering.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.anisotropicfiltering.BackColor = System.Drawing.Color.Transparent;
|
||||
this.anisotropicfiltering.LargeChange = 1;
|
||||
this.anisotropicfiltering.Location = new System.Drawing.Point(199, 282);
|
||||
this.anisotropicfiltering.Maximum = 4;
|
||||
this.anisotropicfiltering.Name = "anisotropicfiltering";
|
||||
this.anisotropicfiltering.Size = new System.Drawing.Size(154, 42);
|
||||
this.anisotropicfiltering.Size = new System.Drawing.Size(154, 45);
|
||||
this.anisotropicfiltering.TabIndex = 8;
|
||||
this.anisotropicfiltering.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.anisotropicfiltering.Value = 4;
|
||||
|
|
@ -1582,13 +1582,13 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// tbDynLightCount
|
||||
//
|
||||
this.tbDynLightCount.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.tbDynLightCount.BackColor = System.Drawing.Color.Transparent;
|
||||
this.tbDynLightCount.LargeChange = 1;
|
||||
this.tbDynLightCount.Location = new System.Drawing.Point(199, 237);
|
||||
this.tbDynLightCount.Maximum = 16;
|
||||
this.tbDynLightCount.Minimum = 1;
|
||||
this.tbDynLightCount.Name = "tbDynLightCount";
|
||||
this.tbDynLightCount.Size = new System.Drawing.Size(154, 42);
|
||||
this.tbDynLightCount.Size = new System.Drawing.Size(154, 45);
|
||||
this.tbDynLightCount.TabIndex = 5;
|
||||
this.tbDynLightCount.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.tbDynLightCount.Value = 1;
|
||||
|
|
@ -1596,11 +1596,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// imagebrightness
|
||||
//
|
||||
this.imagebrightness.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.imagebrightness.BackColor = System.Drawing.Color.Transparent;
|
||||
this.imagebrightness.LargeChange = 3;
|
||||
this.imagebrightness.Location = new System.Drawing.Point(199, 192);
|
||||
this.imagebrightness.Name = "imagebrightness";
|
||||
this.imagebrightness.Size = new System.Drawing.Size(154, 42);
|
||||
this.imagebrightness.Size = new System.Drawing.Size(154, 45);
|
||||
this.imagebrightness.TabIndex = 4;
|
||||
this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged);
|
||||
|
|
@ -1617,33 +1617,33 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
//
|
||||
// hiddenthingsalpha
|
||||
//
|
||||
this.hiddenthingsalpha.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.hiddenthingsalpha.BackColor = System.Drawing.Color.Transparent;
|
||||
this.hiddenthingsalpha.LargeChange = 3;
|
||||
this.hiddenthingsalpha.Location = new System.Drawing.Point(199, 147);
|
||||
this.hiddenthingsalpha.Name = "hiddenthingsalpha";
|
||||
this.hiddenthingsalpha.Size = new System.Drawing.Size(154, 42);
|
||||
this.hiddenthingsalpha.Size = new System.Drawing.Size(154, 45);
|
||||
this.hiddenthingsalpha.TabIndex = 3;
|
||||
this.hiddenthingsalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.hiddenthingsalpha.ValueChanged += new System.EventHandler(this.hiddenthingsalpha_ValueChanged);
|
||||
//
|
||||
// inactivethingsalpha
|
||||
//
|
||||
this.inactivethingsalpha.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.inactivethingsalpha.BackColor = System.Drawing.Color.Transparent;
|
||||
this.inactivethingsalpha.LargeChange = 3;
|
||||
this.inactivethingsalpha.Location = new System.Drawing.Point(199, 102);
|
||||
this.inactivethingsalpha.Name = "inactivethingsalpha";
|
||||
this.inactivethingsalpha.Size = new System.Drawing.Size(154, 42);
|
||||
this.inactivethingsalpha.Size = new System.Drawing.Size(154, 45);
|
||||
this.inactivethingsalpha.TabIndex = 2;
|
||||
this.inactivethingsalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.inactivethingsalpha.ValueChanged += new System.EventHandler(this.inactivethingsalpha_ValueChanged);
|
||||
//
|
||||
// doublesidedalpha
|
||||
//
|
||||
this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.doublesidedalpha.BackColor = System.Drawing.Color.Transparent;
|
||||
this.doublesidedalpha.LargeChange = 3;
|
||||
this.doublesidedalpha.Location = new System.Drawing.Point(199, 12);
|
||||
this.doublesidedalpha.Name = "doublesidedalpha";
|
||||
this.doublesidedalpha.Size = new System.Drawing.Size(154, 42);
|
||||
this.doublesidedalpha.Size = new System.Drawing.Size(154, 45);
|
||||
this.doublesidedalpha.TabIndex = 0;
|
||||
this.doublesidedalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.doublesidedalpha.ValueChanged += new System.EventHandler(this.doublesidedalpha_ValueChanged);
|
||||
|
|
@ -1843,7 +1843,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.tabscripteditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.tabscripteditor.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabscripteditor.Name = "tabscripteditor";
|
||||
this.tabscripteditor.Size = new System.Drawing.Size(662, 484);
|
||||
this.tabscripteditor.Size = new System.Drawing.Size(680, 501);
|
||||
this.tabscripteditor.TabIndex = 4;
|
||||
this.tabscripteditor.Text = "Script Editor";
|
||||
this.tabscripteditor.UseVisualStyleBackColor = true;
|
||||
|
|
@ -2336,7 +2336,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
this.tabpasting.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabpasting.Name = "tabpasting";
|
||||
this.tabpasting.Padding = new System.Windows.Forms.Padding(5);
|
||||
this.tabpasting.Size = new System.Drawing.Size(662, 484);
|
||||
this.tabpasting.Size = new System.Drawing.Size(680, 501);
|
||||
this.tabpasting.TabIndex = 3;
|
||||
this.tabpasting.Text = "Pasting ";
|
||||
this.tabpasting.UseVisualStyleBackColor = true;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,12 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
{
|
||||
internal partial class PreferencesForm : DelayedForm
|
||||
{
|
||||
#region ================== Constants
|
||||
|
||||
private const float VIEW_DISTANCE_STEP_SIZE = 500.0f;
|
||||
|
||||
#endregion
|
||||
|
||||
#region ================== Variables
|
||||
|
||||
private PreferencesController controller;
|
||||
|
|
@ -71,7 +77,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
mousespeed.Value = General.Clamp(General.Settings.MouseSpeed / 100, mousespeed.Minimum, mousespeed.Maximum);
|
||||
movespeed.Value = General.Clamp(General.Settings.MoveSpeed / 100, movespeed.Minimum, movespeed.Maximum);
|
||||
vertexScale3D.Value = General.Clamp((int)(General.Settings.GZVertexScale3D * 10), vertexScale3D.Minimum, vertexScale3D.Maximum); //mxd
|
||||
viewdistance.Value = General.Clamp((int)(General.Settings.ViewDistance / 200.0f), viewdistance.Minimum, viewdistance.Maximum);
|
||||
viewdistance.Value = General.Clamp((int)(General.Settings.ViewDistance / VIEW_DISTANCE_STEP_SIZE), viewdistance.Minimum, viewdistance.Maximum);
|
||||
invertyaxis.Checked = General.Settings.InvertYAxis;
|
||||
autoscrollspeed.Value = General.Clamp(General.Settings.AutoScrollSpeed, autoscrollspeed.Minimum, autoscrollspeed.Maximum);
|
||||
zoomfactor.Value = General.Clamp(General.Settings.ZoomFactor, zoomfactor.Minimum, zoomfactor.Maximum);
|
||||
|
|
@ -301,7 +307,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
General.Settings.MouseSpeed = mousespeed.Value * 100;
|
||||
General.Settings.MoveSpeed = movespeed.Value * 100;
|
||||
General.Settings.GZVertexScale3D = vertexScale3D.Value * 0.1f; //mxd
|
||||
General.Settings.ViewDistance = viewdistance.Value * 200.0f;
|
||||
General.Settings.ViewDistance = viewdistance.Value * VIEW_DISTANCE_STEP_SIZE;
|
||||
General.Settings.InvertYAxis = invertyaxis.Checked;
|
||||
General.Settings.AutoScrollSpeed = autoscrollspeed.Value;
|
||||
General.Settings.ZoomFactor = zoomfactor.Value;
|
||||
|
|
@ -500,7 +506,7 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
|
||||
private void viewdistance_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
int value = viewdistance.Value * 200;
|
||||
int value = viewdistance.Value * (int)VIEW_DISTANCE_STEP_SIZE;
|
||||
viewdistancelabel.Text = value + " mp";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,33 +112,33 @@
|
|||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="groupBox1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="groupBox1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label29.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="label29.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label27.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="label27.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>False</value>
|
||||
</metadata>
|
||||
<data name="scriptallmanstyle.ToolTip" xml:space="preserve">
|
||||
|
|
@ -152,7 +152,7 @@ markers in snippets will be replaced
|
|||
with newline characters, otherwise
|
||||
they will be replaced with tabs/spaces.</value>
|
||||
</data>
|
||||
<metadata name="browseScreenshotsFolderDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="browseScreenshotsFolderDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>114, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
Loading…
Reference in a new issue