diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index 7aa86254..d0d4cfa4 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -663,13 +663,12 @@ - + - @@ -1126,7 +1125,6 @@ - diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs index 18b95bae..c4d05635 100644 --- a/Source/Core/Config/ProgramConfiguration.cs +++ b/Source/Core/Config/ProgramConfiguration.cs @@ -53,7 +53,6 @@ namespace CodeImp.DoomBuilder.Config private byte doublesidedalphabyte; private float backgroundalpha; private bool qualitydisplay; - private bool squarethings; private bool testmonsters; private int defaultviewmode; private bool classicbilinear; @@ -141,7 +140,6 @@ namespace CodeImp.DoomBuilder.Config public float VisualMouseSensX { get { return visualmousesensx; } internal set { visualmousesensx = value; } } public float VisualMouseSensY { get { return visualmousesensy; } internal set { visualmousesensy = value; } } public bool QualityDisplay { get { return qualitydisplay; } internal set { qualitydisplay = value; } } - public bool SquareThings { get { return squarethings; } internal set { squarethings = value; } } public bool TestMonsters { get { return testmonsters; } internal set { testmonsters = value; } } public int DefaultViewMode { get { return defaultviewmode; } internal set { defaultviewmode = value; } } public bool ClassicBilinear { get { return classicbilinear; } internal set { classicbilinear = value; } } @@ -252,7 +250,6 @@ namespace CodeImp.DoomBuilder.Config doublesidedalphabyte = (byte)(doublesidedalpha * 255f); backgroundalpha = cfg.ReadSetting("backgroundalpha", 1.0f); qualitydisplay = cfg.ReadSetting("qualitydisplay", true); - squarethings = cfg.ReadSetting("squarethings", false); testmonsters = cfg.ReadSetting("testmonsters", true); defaultviewmode = cfg.ReadSetting("defaultviewmode", (int)ViewMode.Normal); classicbilinear = cfg.ReadSetting("classicbilinear", false); @@ -343,7 +340,6 @@ namespace CodeImp.DoomBuilder.Config cfg.WriteSetting("visualmousesensy", visualmousesensy); cfg.WriteSetting("imagebrightness", imagebrightness); cfg.WriteSetting("qualitydisplay", qualitydisplay); - cfg.WriteSetting("squarethings", squarethings); cfg.WriteSetting("testmonsters", testmonsters); cfg.WriteSetting("doublesidedalpha", doublesidedalpha); cfg.WriteSetting("backgroundalpha", backgroundalpha); diff --git a/Source/Core/Map/MapSet.cs b/Source/Core/Map/MapSet.cs index c16c9089..57a7363b 100644 --- a/Source/Core/Map/MapSet.cs +++ b/Source/Core/Map/MapSet.cs @@ -2745,7 +2745,8 @@ namespace CodeImp.DoomBuilder.Map RectangleF range = RectangleF.FromLTRB(pos.x - maxrange, pos.y - maxrange, pos.x + maxrange, pos.y + maxrange); Thing closest = null; float distance = float.MaxValue; - float d, px, py; + float size = float.MaxValue; //mxd + float d, px, py, s; // Go for all things in selection foreach(Thing t in selection) @@ -2756,13 +2757,15 @@ namespace CodeImp.DoomBuilder.Map //mxd. Within range? if(px < range.Left - t.Size || px > range.Right + t.Size || py < range.Top - t.Size || py > range.Bottom + t.Size) continue; - // Close than previous find? + // Closer than previous find? mxd. Or smaller when distance is the same? d = Math.Abs(px - pos.x) + Math.Abs(py - pos.y); - if(d < distance) + s = ((t.FixedSize && General.Map.Renderer2D.Scale > 1.0f) ? t.Size / General.Map.Renderer2D.Scale : t.Size); //mxd + if(d < distance || (d == distance && s < size)) { // This one is closer closest = t; distance = d; + size = s; //mxd } } diff --git a/Source/Core/Map/Thing.cs b/Source/Core/Map/Thing.cs index 3b437a6b..53eb31fe 100644 --- a/Source/Core/Map/Thing.cs +++ b/Source/Core/Map/Thing.cs @@ -67,6 +67,7 @@ namespace CodeImp.DoomBuilder.Map private float pitchrad; //mxd private float rollrad; //mxd private bool isModel; //mxd + private bool highlighted; //mxd // Configuration private float size; @@ -102,6 +103,7 @@ namespace CodeImp.DoomBuilder.Map public Sector Sector { get { return sector; } } public bool IsModel { get { return isModel; } } //mxd public bool IsDirectional { get { return directional; } } //mxd + public bool Highlighted { get { return highlighted; } set { highlighted = value; } } //mxd #endregion diff --git a/Source/Core/Rendering/Presentation.cs b/Source/Core/Rendering/Presentation.cs index d9aea608..bd100f38 100644 --- a/Source/Core/Rendering/Presentation.cs +++ b/Source/Core/Rendering/Presentation.cs @@ -30,6 +30,7 @@ namespace CodeImp.DoomBuilder.Rendering // Constants for static instances public const float THINGS_BACK_ALPHA = 0.3f; public const float THINGS_HIDDEN_ALPHA = 0.66f; + public const float THINGS_ALPHA = 0.8f; //mxd // Static instances private static Presentation standard; diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs index ebe161ee..a59c1f43 100644 --- a/Source/Core/Rendering/Renderer2D.cs +++ b/Source/Core/Rendering/Renderer2D.cs @@ -45,8 +45,8 @@ namespace CodeImp.DoomBuilder.Rendering #region ================== Constants private const float FSAA_FACTOR = 0.6f; - private const float THING_ARROW_SIZE = 1.5f; - private const float THING_ARROW_SHRINK = 2f; + private const float THING_ARROW_SIZE = 1.4f; + //private const float THING_ARROW_SHRINK = 2f; //private const float THING_CIRCLE_SIZE = 1f; private const float THING_SPRITE_SHRINK = 2f; private const int THING_BUFFER_SIZE = 100; @@ -57,7 +57,6 @@ namespace CodeImp.DoomBuilder.Rendering private const int FONT_WIDTH = 0; private const int FONT_HEIGHT = 0; - private const int NUM_THING_TEXTURES = 2; internal const int NUM_VIEW_MODES = 4; #endregion @@ -103,7 +102,7 @@ namespace CodeImp.DoomBuilder.Rendering private SurfaceManager surfaces; // Images - private ResourceImage[] thingtexture; + private ResourceImage thingtexture; // View settings (world coordinates) private ViewMode viewmode; @@ -146,15 +145,10 @@ namespace CodeImp.DoomBuilder.Rendering // Constructor internal Renderer2D(D3DDevice graphics) : base(graphics) { - // Load thing textures - thingtexture = new ResourceImage[NUM_THING_TEXTURES]; - for(int i = 0; i < NUM_THING_TEXTURES; i++) - { - thingtexture[i] = new ResourceImage("CodeImp.DoomBuilder.Resources.Thing2D_" + i.ToString(CultureInfo.InvariantCulture) + ".png"); - thingtexture[i].UseColorCorrection = false; - thingtexture[i].LoadImage(); - thingtexture[i].CreateTexture(); - } + //mxd. Load thing texture + thingtexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Thing2D.png") { UseColorCorrection = false }; + thingtexture.LoadImage(); + thingtexture.CreateTexture(); // Create surface manager surfaces = new SurfaceManager(); @@ -174,7 +168,7 @@ namespace CodeImp.DoomBuilder.Rendering { // Destroy rendertargets DestroyRendertargets(); - foreach(ResourceImage i in thingtexture) i.Dispose(); + thingtexture.Dispose(); //mxd // Dispose surface manager surfaces.Dispose(); @@ -996,7 +990,7 @@ namespace CodeImp.DoomBuilder.Rendering private void CreateThingArrowVerts(Thing t, ref FlatVertex[] verts, Vector2D screenpos, int offset) { // Determine size - float arrowsize = (t.FixedSize && (scale > 1.0f) ? (t.Size - THING_ARROW_SHRINK) * THING_ARROW_SIZE : (t.Size - THING_ARROW_SHRINK) * scale * THING_ARROW_SIZE); + float arrowsize = (t.FixedSize && (scale > 1.0f) ? t.Size : t.Size * scale) * THING_ARROW_SIZE; //mxd // Setup rotated rect for arrow float sinarrowsize = (float)Math.Sin(t.Angle + Angle2D.PI * 0.25f) * arrowsize; @@ -1005,20 +999,20 @@ namespace CodeImp.DoomBuilder.Rendering verts[offset].x = screenpos.x + sinarrowsize; verts[offset].y = screenpos.y + cosarrowsize; verts[offset].c = -1; - verts[offset].u = 0.51f; - verts[offset].v = 0.01f; + verts[offset].u = 0.501f; + verts[offset].v = 0.001f; offset++; verts[offset].x = screenpos.x - cosarrowsize; verts[offset].y = screenpos.y + sinarrowsize; verts[offset].c = -1; - verts[offset].u = 0.99f; - verts[offset].v = 0.01f; + verts[offset].u = 0.999f; + verts[offset].v = 0.001f; offset++; verts[offset].x = screenpos.x + cosarrowsize; verts[offset].y = screenpos.y - sinarrowsize; verts[offset].c = -1; - verts[offset].u = 0.51f; - verts[offset].v = 0.99f; + verts[offset].u = 0.501f; + verts[offset].v = 0.999f; offset++; verts[offset] = verts[offset - 2]; offset++; @@ -1027,8 +1021,8 @@ namespace CodeImp.DoomBuilder.Rendering verts[offset].x = screenpos.x - sinarrowsize; verts[offset].y = screenpos.y - cosarrowsize; verts[offset].c = -1; - verts[offset].u = 0.99f; - verts[offset].v = 0.99f; + verts[offset].u = 0.999f; + verts[offset].v = 0.999f; } //mxd @@ -1067,13 +1061,12 @@ namespace CodeImp.DoomBuilder.Rendering // This draws a set of things private void RenderThingsBatch(ICollection things, float alpha, bool fixedcolor, PixelColor c) { - int thingtextureindex = 0; - PixelColor tc; - DataStream stream; - // Anything to render? if(things.Count > 0) { + PixelColor tc; + DataStream stream; + // Make alpha color Color4 alphacolor = new Color4(alpha, 1.0f, 1.0f, 1.0f); @@ -1088,10 +1081,9 @@ namespace CodeImp.DoomBuilder.Rendering graphics.Device.SetRenderState(RenderState.TextureFactor, alphacolor.ToArgb()); graphics.Device.SetStreamSource(0, thingsvertices, 0, FlatVertex.Stride); - // Determine things texture to use - if(General.Settings.SquareThings) thingtextureindex = 1; - graphics.Device.SetTexture(0, thingtexture[thingtextureindex].Texture); - graphics.Shaders.Things2D.Texture1 = thingtexture[thingtextureindex].Texture; + // Set things texture + graphics.Device.SetTexture(0, thingtexture.Texture); + graphics.Shaders.Things2D.Texture1 = thingtexture.Texture; SetWorldTransformation(false); graphics.Shaders.Things2D.SetSettings(alpha); @@ -1113,6 +1105,9 @@ namespace CodeImp.DoomBuilder.Rendering int totalcount = 0; foreach(Thing t in things) { + //mxd. Highlighted thing should be rendered separately + if(!fixedcolor && t.Highlighted) continue; + //collect models if (t.IsModel) { @@ -1167,7 +1162,6 @@ namespace CodeImp.DoomBuilder.Rendering //mxd. Render sprites int selectionColor = General.Colors.Selection.ToInt(); graphics.Shaders.Things2D.BeginPass(1); - float spriteShrink = General.Settings.SquareThings ? THING_SPRITE_SHRINK : THING_SPRITE_SHRINK * 2; foreach(KeyValuePair> group in thingsByType) { @@ -1202,17 +1196,17 @@ namespace CodeImp.DoomBuilder.Rendering if(sprite.Width > sprite.Height) { - spriteWidth = info.Radius * spriteScale - spriteShrink * spriteScale; + spriteWidth = info.Radius * spriteScale - THING_SPRITE_SHRINK * spriteScale; spriteHeight = spriteWidth * ((float)sprite.Height / sprite.Width); } else if(sprite.Width < sprite.Height) { - spriteHeight = info.Radius * spriteScale - spriteShrink * spriteScale; + spriteHeight = info.Radius * spriteScale - THING_SPRITE_SHRINK * spriteScale; spriteWidth = spriteHeight * ((float)sprite.Width / sprite.Height); } else { - spriteWidth = info.Radius * spriteScale - spriteShrink * spriteScale; + spriteWidth = info.Radius * spriteScale - THING_SPRITE_SHRINK * spriteScale; spriteHeight = spriteWidth; } @@ -1260,8 +1254,8 @@ namespace CodeImp.DoomBuilder.Rendering graphics.Shaders.Things2D.EndPass(); //mxd. Render thing arrows - graphics.Device.SetTexture(0, thingtexture[thingtextureindex].Texture); - graphics.Shaders.Things2D.Texture1 = thingtexture[thingtextureindex].Texture; + graphics.Device.SetTexture(0, thingtexture.Texture); + graphics.Shaders.Things2D.Texture1 = thingtexture.Texture; graphics.Shaders.Things2D.BeginPass(0); // Determine next lock size diff --git a/Source/Core/Resources/Thing2D.png b/Source/Core/Resources/Thing2D.png new file mode 100644 index 00000000..5cdbedd8 Binary files /dev/null and b/Source/Core/Resources/Thing2D.png differ diff --git a/Source/Core/Resources/Thing2D_0.png b/Source/Core/Resources/Thing2D_0.png deleted file mode 100644 index 00de624c..00000000 Binary files a/Source/Core/Resources/Thing2D_0.png and /dev/null differ diff --git a/Source/Core/Resources/Thing2D_1.png b/Source/Core/Resources/Thing2D_1.png deleted file mode 100644 index 53384faa..00000000 Binary files a/Source/Core/Resources/Thing2D_1.png and /dev/null differ diff --git a/Source/Core/Resources/ThingBox.png b/Source/Core/Resources/ThingBox.png deleted file mode 100644 index 132dc5e0..00000000 Binary files a/Source/Core/Resources/ThingBox.png and /dev/null differ diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs index a700f56c..c70cfe41 100644 --- a/Source/Core/Windows/PreferencesForm.Designer.cs +++ b/Source/Core/Windows/PreferencesForm.Designer.cs @@ -79,7 +79,6 @@ namespace CodeImp.DoomBuilder.Windows this.colorhighlight = new CodeImp.DoomBuilder.Controls.ColorControl(); this.colorlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl(); this.cbStretchView = new System.Windows.Forms.CheckBox(); - this.squarethings = new System.Windows.Forms.CheckBox(); this.qualitydisplay = new System.Windows.Forms.CheckBox(); this.cancel = new System.Windows.Forms.Button(); this.apply = new System.Windows.Forms.Button(); @@ -751,16 +750,6 @@ namespace CodeImp.DoomBuilder.Windows "g\r\nvertical scale of the world geometry and \r\nsprites by 15%.\r\n"); this.cbStretchView.UseVisualStyleBackColor = true; // - // squarethings - // - this.squarethings.AutoSize = true; - this.squarethings.Location = new System.Drawing.Point(25, 170); - this.squarethings.Name = "squarethings"; - this.squarethings.Size = new System.Drawing.Size(91, 17); - this.squarethings.TabIndex = 8; - this.squarethings.Text = "Square things"; - this.squarethings.UseVisualStyleBackColor = true; - // // qualitydisplay // this.qualitydisplay.AutoSize = true; @@ -1432,7 +1421,6 @@ namespace CodeImp.DoomBuilder.Windows this.appearancegroup1.Controls.Add(label21); this.appearancegroup1.Controls.Add(this.labelDynLightIntensity); this.appearancegroup1.Controls.Add(this.cbStretchView); - this.appearancegroup1.Controls.Add(this.squarethings); this.appearancegroup1.Controls.Add(this.tbDynLightIntensity); this.appearancegroup1.Controls.Add(label20); this.appearancegroup1.Controls.Add(this.qualitydisplay); @@ -1458,7 +1446,7 @@ namespace CodeImp.DoomBuilder.Windows // capitalizetexturenames // this.capitalizetexturenames.AutoSize = true; - this.capitalizetexturenames.Location = new System.Drawing.Point(236, 212); + this.capitalizetexturenames.Location = new System.Drawing.Point(236, 191); this.capitalizetexturenames.Name = "capitalizetexturenames"; this.capitalizetexturenames.Size = new System.Drawing.Size(140, 17); this.capitalizetexturenames.TabIndex = 36; @@ -1482,7 +1470,7 @@ namespace CodeImp.DoomBuilder.Windows // cbOldHighlightMode // this.cbOldHighlightMode.AutoSize = true; - this.cbOldHighlightMode.Location = new System.Drawing.Point(236, 254); + this.cbOldHighlightMode.Location = new System.Drawing.Point(236, 233); this.cbOldHighlightMode.Name = "cbOldHighlightMode"; this.cbOldHighlightMode.Size = new System.Drawing.Size(207, 17); this.cbOldHighlightMode.TabIndex = 33; @@ -1560,7 +1548,7 @@ namespace CodeImp.DoomBuilder.Windows // animatevisualselection // this.animatevisualselection.AutoSize = true; - this.animatevisualselection.Location = new System.Drawing.Point(236, 233); + this.animatevisualselection.Location = new System.Drawing.Point(236, 212); this.animatevisualselection.Name = "animatevisualselection"; this.animatevisualselection.Size = new System.Drawing.Size(184, 17); this.animatevisualselection.TabIndex = 23; @@ -1570,7 +1558,7 @@ namespace CodeImp.DoomBuilder.Windows // blackbrowsers // this.blackbrowsers.AutoSize = true; - this.blackbrowsers.Location = new System.Drawing.Point(236, 191); + this.blackbrowsers.Location = new System.Drawing.Point(25, 170); this.blackbrowsers.Name = "blackbrowsers"; this.blackbrowsers.Size = new System.Drawing.Size(195, 17); this.blackbrowsers.TabIndex = 4; @@ -2025,7 +2013,6 @@ namespace CodeImp.DoomBuilder.Windows private Dotnetrix.Controls.TrackBar previewsize; private System.Windows.Forms.Label previewsizelabel; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox squarethings; private Dotnetrix.Controls.TrackBar autoscrollspeed; private System.Windows.Forms.Label autoscrollspeedlabel; private System.Windows.Forms.Label label15; diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs index bba141ad..23b9f1e6 100644 --- a/Source/Core/Windows/PreferencesForm.cs +++ b/Source/Core/Windows/PreferencesForm.cs @@ -63,7 +63,6 @@ namespace CodeImp.DoomBuilder.Windows // Interface imagebrightness.Value = General.Settings.ImageBrightness; - squarethings.Checked = General.Settings.SquareThings; doublesidedalpha.Value = General.Clamp((int)((1.0f - General.Settings.DoubleSidedAlpha) * 10.0f), doublesidedalpha.Minimum, doublesidedalpha.Maximum); defaultviewmode.SelectedIndex = General.Settings.DefaultViewMode; fieldofview.Value = General.Clamp(General.Settings.VisualFOV / 10, fieldofview.Minimum, fieldofview.Maximum); @@ -232,7 +231,6 @@ namespace CodeImp.DoomBuilder.Windows // Apply interface General.Settings.ImageBrightness = imagebrightness.Value; - General.Settings.SquareThings = squarethings.Checked; General.Settings.DoubleSidedAlpha = 1.0f - (doublesidedalpha.Value * 0.1f); General.Settings.DefaultViewMode = defaultviewmode.SelectedIndex; General.Settings.VisualFOV = fieldofview.Value * 10; diff --git a/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs b/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs index c3af4d82..956208da 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs @@ -374,7 +374,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes // Render things if (renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs index 36158de6..c0959175 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs @@ -248,7 +248,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Render things if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs index a91970a6..bd7a148b 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs @@ -127,7 +127,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Start rendering things if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); } } @@ -159,8 +159,8 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(unselectedthings, 1.0f); - renderer.RenderThingSet(selectedthings, 1.0f); + renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA); + renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs index 4cf86004..dea169c2 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs @@ -138,7 +138,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); } } @@ -171,8 +171,8 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(unselectedthings, 1.0f); - renderer.RenderThingSet(selectedthings, 1.0f); + renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA); + renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs index 5c1d1442..edcdcfa5 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs @@ -312,13 +312,13 @@ namespace CodeImp.DoomBuilder.BuilderModes { // Render things renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(unselectedthings, 1.0f); - renderer.RenderThingSet(selectedthings, 1.0f); + renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA); + renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA); // Draw the dragged item highlighted // This is important to know, because this item is used // for snapping to the grid and snapping to nearest items - renderer.RenderThing(dragitem, General.Colors.Highlight, 1.0f); + renderer.RenderThing(dragitem, General.Colors.Highlight, Presentation.THINGS_ALPHA); // Done renderer.Finish(); diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs index 3004eb97..65b832dc 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs @@ -115,7 +115,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); } } @@ -147,8 +147,8 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(unselectedthings, 1.0f); - renderer.RenderThingSet(selectedthings, 1.0f); + renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA); + renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs index 7dc37da2..2c516d7b 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs @@ -560,7 +560,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Render things if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs index 1fbae723..da62b745 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs @@ -343,7 +343,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { if(renderer.StartThings(false)) { - renderer.RenderThing((highlighted as Thing), renderer.DetermineThingColor((highlighted as Thing)), 1.0f); + renderer.RenderThing((highlighted as Thing), renderer.DetermineThingColor((highlighted as Thing)), Presentation.THINGS_ALPHA); renderer.Finish(); } } @@ -367,7 +367,7 @@ namespace CodeImp.DoomBuilder.BuilderModes { if(renderer.StartThings(false)) { - renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, 1.0f); + renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, Presentation.THINGS_ALPHA); renderer.Finish(); } } @@ -1561,8 +1561,8 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); - if(highlighted is Thing) renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); + if(highlighted is Thing) renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs index 99f68c46..a84d5f65 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs @@ -136,7 +136,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Render things if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); foreach(ErrorResult result in selection) result.RenderThingsSelection(renderer); //mxd renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs b/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs index d11c6862..aa2c7c49 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs @@ -139,7 +139,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Render things if(renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); if(BuilderPlug.Me.FindReplaceForm.Finder != null) BuilderPlug.Me.FindReplaceForm.Finder.RenderThingsSelection(renderer, selection); renderer.Finish(); diff --git a/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs b/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs index 458f034d..920cee5c 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs @@ -876,7 +876,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs index 1109a4c7..2e928c30 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs @@ -407,7 +407,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs b/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs index f4d79cd4..07e84cd8 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs @@ -357,7 +357,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs index 079d4857..cbfd2cee 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs @@ -752,7 +752,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs index f945dce1..a43d97e9 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs @@ -148,6 +148,10 @@ namespace CodeImp.DoomBuilder.BuilderModes highlighted.Selected = true; } } + } + else if(highlighted != null) //mxd + { + highlighted.Highlighted = false; } // Hide highlight info and tooltip @@ -177,12 +181,12 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.RenderAssociations(renderer, association[i], eventlines); if((highlighted != null) && !highlighted.IsDisposed) { - renderer.RenderThing(highlighted, General.Colors.Highlight, 1.0f); + renderer.RenderThing(highlighted, General.Colors.Highlight, Presentation.THINGS_ALPHA); BuilderPlug.RenderReverseAssociations(renderer, highlightasso, eventlines); //mxd } @@ -222,15 +226,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // This highlights a new item protected void Highlight(Thing t) { - bool completeredraw = false; LinedefActionInfo action = null; - - // Often we can get away by simply undrawing the previous - // highlight and drawing the new highlight. But if associations - // are or were drawn we need to redraw the entire display. - - // Previous association highlights something? - if((highlighted != null) && (highlighted.Tag != 0)) completeredraw = true; // Set highlight association if(t != null && t.Tag != 0) @@ -238,11 +234,12 @@ namespace CodeImp.DoomBuilder.BuilderModes else highlightasso.Set(new Vector2D(), 0, 0); - // New association highlights something? - if((t != null) && (t.Tag != 0)) completeredraw = true; + if(highlighted != null) highlighted.Highlighted = false; //mxd if(t != null) { + t.Highlighted = true; //mxd + // Check if we can find the linedefs action if((t.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(t.Action)) action = General.Map.Config.LinedefActions[t.Action]; @@ -251,63 +248,16 @@ namespace CodeImp.DoomBuilder.BuilderModes // Determine linedef associations for(int i = 0; i < Thing.NUM_ARGS; i++) { - // Previous association highlights something? - if((association[i].Type == UniversalType.SectorTag) || - (association[i].Type == UniversalType.LinedefTag) || - (association[i].Type == UniversalType.ThingTag)) completeredraw = true; - // Make new association if(action != null) association[i].Set(t.Position, t.Args[i], action.Args[i].Type); else association[i].Set(new Vector2D(), 0, 0); - - // New association highlights something? - if((association[i].Type == UniversalType.SectorTag) || - (association[i].Type == UniversalType.LinedefTag) || - (association[i].Type == UniversalType.ThingTag)) completeredraw = true; } - // If we're changing associations, then we - // need to redraw the entire display - if(completeredraw) - { - // Set new highlight and redraw completely - highlighted = t; - General.Interface.RedrawDisplay(); - } - else - { - // Update display - if(renderer.StartThings(false)) - { - // Undraw previous highlight - Thing possiblecommentthing = t ?? highlighted; //mxd - if((highlighted != null) && !highlighted.IsDisposed) - renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), 1.0f); - - // Set new highlight - highlighted = t; - - // Render highlighted item - if((highlighted != null) && !highlighted.IsDisposed) - renderer.RenderThing(highlighted, General.Colors.Highlight, 1.0f); - - // Done with highlight - renderer.Finish(); - - //mxd. Update comment highlight? - if(General.Map.UDMF && General.Settings.RenderComments - && possiblecommentthing != null && !possiblecommentthing.IsDisposed - && renderer.StartOverlay(false)) - { - RenderComment(possiblecommentthing); - renderer.Finish(); - } - - renderer.Present(); - } - } + // Set new highlight and redraw display + highlighted = t; + General.Interface.RedrawDisplay(); // Show highlight info if((highlighted != null) && !highlighted.IsDisposed) @@ -339,7 +289,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(false)) { // Redraw highlight to show selection - renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), 1.0f); + renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), Presentation.THINGS_ALPHA); renderer.Finish(); renderer.Present(); } @@ -364,7 +314,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(false)) { // Render highlighted item - renderer.RenderThing(highlighted, General.Colors.Highlight, 1.0f); + renderer.RenderThing(highlighted, General.Colors.Highlight, Presentation.THINGS_ALPHA); renderer.Finish(); renderer.Present(); } @@ -407,7 +357,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(false)) { // Redraw highlight to show selection - renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), 1.0f); + renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), Presentation.THINGS_ALPHA); renderer.Finish(); renderer.Present(); } diff --git a/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs b/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs index ebebccbd..ce9d8d80 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs @@ -155,7 +155,7 @@ namespace CodeImp.DoomBuilder.BuilderModes if(renderer.StartThings(true)) { renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA); - renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f); + renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs index 0b045ac5..f24118bf 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs @@ -75,7 +75,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Rendering public override void RenderOverlaySelection(IRenderer2D renderer) { - renderer.RenderThing(thing, General.Colors.Selection, 0.8f); + renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA); } // mxd. More rencering diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs index 48932c41..f9e35fad 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs @@ -84,8 +84,8 @@ namespace CodeImp.DoomBuilder.BuilderModes // Rendering public override void RenderOverlaySelection(IRenderer2D renderer) { - renderer.RenderThing(thing1, General.Colors.Selection, 1.0f); - renderer.RenderThing(thing2, General.Colors.Selection, 1.0f); + renderer.RenderThing(thing1, General.Colors.Selection, Presentation.THINGS_ALPHA); + renderer.RenderThing(thing2, General.Colors.Selection, Presentation.THINGS_ALPHA); } // This removes the first thing diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs index fa06b934..fcb39c4e 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs @@ -73,7 +73,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Rendering public override void RenderOverlaySelection(IRenderer2D renderer) { - renderer.RenderThing(thing, General.Colors.Selection, 1.0f); + renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA); } // This removes the thing diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs index a8a049af..c7350fc6 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs @@ -57,7 +57,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Rendering public override void RenderOverlaySelection(IRenderer2D renderer) { - renderer.RenderThing(thing, General.Colors.Selection, 1.0f); + renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA); } // This removes the thing diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs index abebd7d9..b870cace 100644 --- a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs +++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs @@ -59,7 +59,7 @@ namespace CodeImp.DoomBuilder.BuilderModes // Rendering public override void RenderOverlaySelection(IRenderer2D renderer) { - renderer.RenderThing(thing, General.Colors.Selection, 1.0f); + renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA); } // This removes the thing diff --git a/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs b/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs index 5b399b37..a6d0bba2 100644 --- a/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs +++ b/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs @@ -34,7 +34,7 @@ namespace CodeImp.DoomBuilder.BuilderModes public override void RenderThingsSelection(IRenderer2D renderer, FindReplaceObject[] selection) { foreach(FindReplaceObject o in selection) - renderer.RenderThing(o.Thing, General.Colors.Selection, 1.0f); + renderer.RenderThing(o.Thing, General.Colors.Selection, Presentation.THINGS_ALPHA); } // Edit objects diff --git a/Source/Plugins/BuilderModes/General/BuilderPlug.cs b/Source/Plugins/BuilderModes/General/BuilderPlug.cs index a273b3cd..31cb5d71 100644 --- a/Source/Plugins/BuilderModes/General/BuilderPlug.cs +++ b/Source/Plugins/BuilderModes/General/BuilderPlug.cs @@ -568,7 +568,7 @@ namespace CodeImp.DoomBuilder.BuilderModes foreach(Thing t in General.Map.Map.Things) { if(!asso.Tags.Contains(t.Tag)) continue; - renderer.RenderThing(t, General.Colors.Indication, 1.0f); + renderer.RenderThing(t, General.Colors.Indication, Presentation.THINGS_ALPHA); if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(asso.Center, t.Position)); //mxd } break; @@ -646,7 +646,7 @@ namespace CodeImp.DoomBuilder.BuilderModes ((action.Args[3].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[3]))) || ((action.Args[4].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[4])))) { - renderer.RenderThing(t, General.Colors.Indication, 1.0f); + renderer.RenderThing(t, General.Colors.Indication, Presentation.THINGS_ALPHA); if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(t.Position, asso.Center)); //mxd } } diff --git a/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs b/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs index 5d9a5d77..26f7dff7 100644 --- a/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs +++ b/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs @@ -312,12 +312,12 @@ namespace CodeImp.DoomBuilder.SoundPropagationMode { foreach (SoundEnvironment se in BuilderPlug.Me.SoundEnvironments) { - if (se.Things.Count > 0) renderer.RenderThingSet(se.Things, 1.0f); + if(se.Things.Count > 0) renderer.RenderThingSet(se.Things, Presentation.THINGS_ALPHA); } } //mxd. Render highlighted thing - if(highlightedthing != null) renderer.RenderThing(highlightedthing, General.Colors.Selection, 1.0f); + if(highlightedthing != null) renderer.RenderThing(highlightedthing, General.Colors.Selection, Presentation.THINGS_ALPHA); renderer.Finish(); } diff --git a/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs b/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs index 8e3bf572..11337e99 100644 --- a/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs +++ b/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs @@ -280,7 +280,7 @@ namespace CodeImp.DoomBuilder.SoundPropagationMode renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_HIDDEN_ALPHA); foreach (Thing thing in huntingThings) { - renderer.RenderThing(thing, General.Colors.Selection, 1.0f); + renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA); } renderer.Finish(); diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs b/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs index 7e58d70f..437c798f 100644 --- a/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs +++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs @@ -1416,7 +1416,7 @@ namespace CodeImp.DoomBuilder.StairSectorBuilderMode // Render things if (renderer.StartThings(true)) { - renderer.RenderThingSet(General.Map.Map.Things, 1.0f); + renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA); renderer.Finish(); }