Fixed memory and performance issues in Visual Mode for things with 0 with or height. (note to developers: VisualMode::GetVisualThing(t) may return null!)

Source/Core/VisualModes/VisualMode.cs

@@ -164,11 +164,11 @@ namespace CodeImp.DoomBuilder.VisualModes
 			
 			// Dispose
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
-				vs.Value.Dispose();
+				if(vs.Value != null) vs.Value.Dispose();
 
 			// Dispose
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-				vt.Value.Dispose();	
+				if(vt.Value != null) vt.Value.Dispose();	
 			
 			// Apply camera position to thing
 			General.Map.VisualCamera.ApplyToThing();
@@ -368,7 +368,7 @@ namespace CodeImp.DoomBuilder.VisualModes
 							{
 								// Create new visual thing
 								vt = CreateVisualThing(t);
-								if(vt != null) allthings.Add(t, vt);
+								allthings.Add(t, vt);
 							}
 
 							if(vt != null)
@@ -658,10 +658,10 @@ namespace CodeImp.DoomBuilder.VisualModes
 		{
 			// Dispose
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
-				vs.Value.Dispose();
+				if(vs.Value != null) vs.Value.Dispose();
 				
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-				vt.Value.Dispose();
+				if(vt.Value != null) vt.Value.Dispose();
 				
 			// Clear collections
 			allsectors.Clear();
@@ -723,17 +723,20 @@ namespace CodeImp.DoomBuilder.VisualModes
 			
 			// Dispose if source was disposed or marked
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					if(vs.Key.IsDisposed || vs.Key.Marked)
 						vs.Value.Dispose();
 					else
 						newsectors.Add(vs.Key, vs.Value);
 				}
+			}
 			
 			// Things depend on the sector they are in and because we can't
 			// easily determine which ones changed, we dispose all things
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-				vt.Value.Dispose();
+				if(vt.Value != null) vt.Value.Dispose();
 			
 			// Apply new lists
 			allsectors = newsectors;
@@ -775,12 +778,12 @@ namespace CodeImp.DoomBuilder.VisualModes
 		/// <summary>
 		/// Returns True when a VisualSector has been created for the specified Sector.
 		/// </summary>
-		public bool VisualSectorExists(Sector s) { return allsectors.ContainsKey(s); }
+		public bool VisualSectorExists(Sector s) { return allsectors.ContainsKey(s) && (allsectors[s] != null); }
 
 		/// <summary>
 		/// Returns True when a VisualThing has been created for the specified Thing.
 		/// </summary>
-		public bool VisualThingExists(Thing t) { return allthings.ContainsKey(t); }
+		public bool VisualThingExists(Thing t) { return allthings.ContainsKey(t) && (allthings[t] != null); }
 
 		/// <summary>
 		/// This is called when the blockmap needs to be refilled, because it was invalidated.

Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs

@@ -289,6 +289,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			// Make list of selected objects
 			selectedobjects = new List<IVisualEventReceiver>();
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
 					if((bvs.Floor != null) && bvs.Floor.Selected) selectedobjects.Add(bvs.Floor);
@@ -302,13 +304,17 @@ namespace CodeImp.DoomBuilder.BuilderModes
 						}
 					}
 				}
+			}
 
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
 				{
 					BaseVisualThing bvt = (BaseVisualThing)vt.Value;
 					if(bvt.Selected) selectedobjects.Add(bvt);
 				}
 			}
+		}
 
 		// This creates a visual sector
 		protected override VisualSector CreateVisualSector(Sector s)
@@ -396,17 +402,23 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		private void UpdateChangedObjects()
 		{
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
 					if(bvs.Changed) bvs.Rebuild();
 				}
+			}
 
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
 				{
 					BaseVisualThing bvt = (BaseVisualThing)vt.Value;
 					if(bvt.Changed) bvt.Rebuild();
 				}
 			}
+		}
 		
 		#endregion
 		
@@ -602,14 +614,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
 					// No sectors or geometry changed. So we only have
 					// to update things when they have changed.
 					foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-						if(vt.Key.Marked) (vt.Value as BaseVisualThing).Rebuild();
+						if((vt.Value != null) && vt.Key.Marked) (vt.Value as BaseVisualThing).Rebuild();
 				}
 				else
 				{
 					// Things depend on the sector they are in and because we can't
 					// easily determine which ones changed, we dispose all things
 					foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-						vt.Value.Dispose();
+						if(vt.Value != null) vt.Value.Dispose();
 					
 					// Apply new lists
 					allthings = new Dictionary<Thing, VisualThing>(allthings.Count);
@@ -898,6 +910,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			selectedobjects = new List<IVisualEventReceiver>();
 			
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
 					if(bvs.Floor != null) bvs.Floor.Selected = false;
@@ -911,13 +925,17 @@ namespace CodeImp.DoomBuilder.BuilderModes
 						}
 					}
 				}
+			}
 
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
 				{
 					BaseVisualThing bvt = (BaseVisualThing)vt.Value;
 					bvt.Selected = false;
 				}
 			}
+		}
 
 		[BeginAction("visualselect", BaseAction = true)]
 		public void BeginSelect()

Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs

@@ -77,7 +77,15 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		{
 			this.mode = mode;
 
-			Rebuild();
+			// Find thing information
+			info = General.Map.Data.GetThingInfo(Thing.Type);
+
+			// Find sprite texture
+			if(info.Sprite.Length > 0)
+			{
+				sprite = General.Map.Data.GetSpriteImage(info.Sprite);
+				if(sprite != null) sprite.AddReference();
+			}
 
 			// We have no destructor
 			GC.SuppressFinalize(this);
@@ -232,16 +240,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 		// This forces to rebuild the whole thing
 		public void Rebuild()
 		{
-			// Find thing information
-			info = General.Map.Data.GetThingInfo(Thing.Type);
-
-			// Find sprite texture
-			if(info.Sprite.Length > 0)
-			{
-				sprite = General.Map.Data.GetSpriteImage(info.Sprite);
-				if(sprite != null) sprite.AddReference();
-			}
-			
 			// Setup visual thing
 			Setup();
 		}

Source/Plugins/GZDoomEditing/VisualModes/BaseVisualMode.cs

@@ -295,6 +295,8 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 			// Make list of selected objects
 			selectedobjects = new List<IVisualEventReceiver>();
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
 					if((bvs.Floor != null) && bvs.Floor.Selected) selectedobjects.Add(bvs.Floor);
@@ -308,13 +310,17 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 						}
 					}
 				}
+			}
 
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
 				{
 					BaseVisualThing bvt = (BaseVisualThing)vt.Value;
 					if(bvt.Selected) selectedobjects.Add(bvt);
 				}
 			}
+		}
 
 		// This creates a visual sector
 		protected override VisualSector CreateVisualSector(Sector s)
@@ -412,17 +418,23 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 		private void UpdateChangedObjects()
 		{
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
 					if(bvs.Changed) bvs.Rebuild();
 				}
+			}
 
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
 				{
 					BaseVisualThing bvt = (BaseVisualThing)vt.Value;
 					if(bvt.Changed) bvt.Rebuild();
 				}
 			}
+		}
 		
 		#endregion
 
@@ -824,14 +836,14 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 					// No sectors or geometry changed. So we only have
 					// to update things when they have changed.
 					foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-						if(vt.Key.Marked) (vt.Value as BaseVisualThing).Rebuild();
+						if((vt.Value != null) && vt.Key.Marked) (vt.Value as BaseVisualThing).Rebuild();
 				}
 				else
 				{
 					// Things depend on the sector they are in and because we can't
 					// easily determine which ones changed, we dispose all things
 					foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
-						vt.Value.Dispose();
+						if(vt.Value != null) vt.Value.Dispose();
 					
 					// Apply new lists
 					allthings = new Dictionary<Thing, VisualThing>(allthings.Count);
@@ -1123,6 +1135,8 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 			selectedobjects = new List<IVisualEventReceiver>();
 			
 			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
 				{
 					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
 					if(bvs.Floor != null) bvs.Floor.Selected = false;
@@ -1138,13 +1152,17 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 						}
 					}
 				}
+			}
 
 			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
 				{
 					BaseVisualThing bvt = (BaseVisualThing)vt.Value;
 					bvt.Selected = false;
 				}
 			}
+		}
 
 		[BeginAction("visualselect", BaseAction = true)]
 		public void BeginSelect()

Source/Plugins/GZDoomEditing/VisualModes/BaseVisualThing.cs

@@ -77,7 +77,15 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 		{
 			this.mode = mode;
 
-			Rebuild();
+			// Find thing information
+			info = General.Map.Data.GetThingInfo(Thing.Type);
+
+			// Find sprite texture
+			if(info.Sprite.Length > 0)
+			{
+				sprite = General.Map.Data.GetSpriteImage(info.Sprite);
+				if(sprite != null) sprite.AddReference();
+			}
 
 			// We have no destructor
 			GC.SuppressFinalize(this);