VF-347: Fix vehicle not despawning under certain conditions, breaking pawn rendering after materials are destroyed.

Author: SmashPhil

About/About.xml

@@ -2,7 +2,7 @@
   <name>Vehicle Framework</name>
   <author>Smash Phil</author>
   <packageId>SmashPhil.VehicleFramework</packageId>
-  <modVersion>1.6.2354 rev15208</modVersion>
+  <modVersion>1.6.2354 rev34389</modVersion>
   <description><![CDATA[Framework which allows the creation of vehicles in RimWorld.]]></description>
   <modIconPath>UI/Icons/DefaultVehicleIcon</modIconPath>
   <supportedVersions>

SmashTools

@@ -6,6 +6,7 @@
 using SmashTools.Animations;
 using SmashTools.Rendering;
 using UnityEngine;
+using UnityEngine.Assertions;
 using Vehicles.Rendering;
 using Verse;
 using Transform = SmashTools.Rendering.Transform;
@@ -108,6 +109,7 @@ public Graphic Graphic
     {
       if (graphic is null)
       {
+        Assert.IsTrue(UnityData.IsInMainThread);
         PropertyBlock ??= new MaterialPropertyBlock();
         if (vehicle is { Destroyed: true } && !RGBMaterialPool.GetAll(this).NullOrEmpty())
         {

Source/Vehicles/Components/Rendering/Overlays/GraphicOverlay.cs

@@ -86,11 +86,11 @@ public void DynamicDrawPhaseAt(DrawPhase phase, in Vector3 drawLoc, Rot8 rot, fl
             parallelRenderer.DynamicDrawPhaseAt(phase, in transformData);
             parallelRenderer.IsDirty = false;
           }
-        break;
+          break;
         case DrawPhase.ParallelPreDraw:
         case DrawPhase.Draw:
           parallelRenderer.DynamicDrawPhaseAt(phase, in transformData);
-        break;
+          break;
         default:
           throw new NotImplementedException(nameof(DrawPhase));
       }

Source/Vehicles/Components/Rendering/VehicleDrawTracker.cs

@@ -12,23 +12,11 @@ public sealed class VehicleRenderer : IParallelRenderer
 
   private PreRenderResults results;
 
-  //public VehicleGraphicSet graphics;
-
-  //private Graphic_DynamicShadow shadowGraphic;
-
-  //private PawnFirefoamDrawer firefoamOverlays;
-
   public VehicleRenderer(VehiclePawn vehicle)
   {
     this.vehicle = vehicle;
-    //graphics = new VehicleGraphicSet(vehicle);
-
-    //firefoamOverlays = new PawnFirefoamDrawer(vehicle);
   }
 
-  [Obsolete("Not currently implemented, still WIP. Do not reference.", error: true)]
-  public PawnFirefoamDrawer FirefoamOverlays => throw new NotImplementedException();
-
   bool IParallelRenderer.IsDirty { get; set; }
 
   public void DynamicDrawPhaseAt(DrawPhase phase, in TransformData transformData,
@@ -40,17 +28,17 @@ public void DynamicDrawPhaseAt(DrawPhase phase, in TransformData transformData,
         // Ensure meshes are cached beforehand
         for (int i = 0; i < 4; i++)
           _ = vehicle.VehicleGraphic.MeshAt(new Rot4(i));
-      break;
+        break;
       case DrawPhase.ParallelPreDraw:
         results = ParallelGetPreRenderResults(in transformData);
-      break;
+        break;
       case DrawPhase.Draw:
         // Out of phase drawing must immediately generate pre-render results for valid data.
         if (!results.valid)
           results = ParallelGetPreRenderResults(in transformData);
         Draw();
         results = default;
-      break;
+        break;
       default:
         throw new NotImplementedException();
     }
@@ -70,19 +58,5 @@ private void Draw()
 
     if (vehicle.Spawned && !vehicle.Dead)
       vehicle.vehiclePather.PatherDraw();
-
-    // TODO - Firefoam overlays for vehicle
-    //if (firefoamOverlays.IsCoveredInFoam)
-    //{
-    //	Vector3 overlayPos = rootLoc;
-    //	overlayPos.y += YOffset_CoveredInOverlay;
-    //	firefoamOverlays.RenderPawnOverlay(overlayPos, mesh, quaternion, flags.FlagSet(PawnRenderFlags.DrawNow), PawnOverlayDrawer.OverlayLayer.Body, bodyFacing);
-    //}
-
-    // TODO - pack graphics
-    //if (vehicle.inventory != null && vehicle.inventory.innerContainer.Count > 0 && graphics.packGraphic != null)
-    //{
-    //	Graphics.DrawMesh(mesh, drawLoc, quaternion, graphics.packGraphic.MatAt(bodyFacing, null), 0);
-    //}
   }
 }