Merge branch 'Facepunch:master' into master

Author: Marky-S

engine/Sandbox.Engine/Game/Navigation/NavMesh/NavMesh.Cache.cs

@@ -32,6 +32,11 @@ public NavMeshAreaDefinition AreaIdToDefinition( int id )
 		return areaIdToDefinition[id];
 	}
 
+	public bool HasTile( Vector2Int tilePosition )
+	{
+		return tileCache.ContainsKey( tilePosition );
+	}
+
 	public void RemoveTile( Vector2Int tilePosition )
 	{
 		tileCache.Remove( tilePosition );

engine/Sandbox.Engine/Game/Navigation/NavMesh/NavMesh.Generate.cs

@@ -167,8 +167,8 @@ await Task.Run( async () =>
 					{
 						CompactHeightfield heightField;
 
-						// If not yet loaded and we have a cached heightfield from baked data, use it directly
-						if ( !IsLoaded && tile.IsHeightFieldValid )
+						// Use baked heightfield data directly if available, avoiding expensive geometry collection
+						if ( tile.IsBakedHeightField && tile.IsHeightFieldValid )
 						{
 							heightField = tile.DecompressCachedHeightField();
 						}
@@ -227,6 +227,11 @@ internal void LoadTileOnMainThread( NavMeshTile targetTile, DtMeshData data )
 	{
 		ThreadSafe.AssertIsMainThread();
 
+		// Tile may have been evicted (via UnloadTile) while an async build was in flight.
+		// Don't re-add it to the navmesh if it's no longer in the cache.
+		if ( !tileCache.HasTile( targetTile.TilePosition ) )
+			return;
+
 		var tileRef = navmeshInternal.GetTileRefAt( targetTile.TilePosition.x, targetTile.TilePosition.y, 0 );
 
 		if ( data == null )
@@ -262,6 +267,79 @@ internal void UnloadTileOnMainThread( Vector2Int tilePosition )
 		}
 	}
 
+	/// <summary>
+	/// Removes the navmesh tile at the given world position.
+	/// </summary>
+	public void UnloadTile( Vector3 worldPosition )
+	{
+		ThreadSafe.AssertIsMainThread();
+
+		if ( !IsEnabled ) return;
+
+		var tilePosition = WorldPositionToTilePosition( worldPosition );
+		UnloadTileOnMainThread( tilePosition );
+		tileCache.RemoveTile( tilePosition );
+	}
+
+	/// <summary>
+	/// Removes all navmesh tiles overlapping with the given bounds.
+	/// </summary>
+	public void UnloadTiles( BBox bounds )
+	{
+		ThreadSafe.AssertIsMainThread();
+
+		if ( !IsEnabled ) return;
+
+		var minMaxTileCoords = CalculateMinMaxTileCoords( bounds );
+
+		for ( int x = minMaxTileCoords.Left; x <= minMaxTileCoords.Right; x++ )
+		{
+			for ( int y = minMaxTileCoords.Top; y <= minMaxTileCoords.Bottom; y++ )
+			{
+				var tilePosition = new Vector2Int( x, y );
+				UnloadTileOnMainThread( tilePosition );
+				tileCache.RemoveTile( tilePosition );
+			}
+		}
+	}
+
+	/// <summary>
+	/// Queues the navmesh tile at the given world position for incremental generation
+	/// over subsequent frames. Fire-and-forget alternative to <see cref="GenerateTile"/>.
+	/// </summary>
+	public void RequestTileGeneration( Vector3 worldPosition )
+	{
+		ThreadSafe.AssertIsMainThread();
+
+		if ( !IsEnabled ) return;
+
+		var tilePosition = WorldPositionToTilePosition( worldPosition );
+		var tile = tileCache.GetOrAddTile( tilePosition );
+		tile.RequestFullRebuild();
+	}
+
+	/// <summary>
+	/// Queues all navmesh tiles overlapping with the given bounds for incremental generation
+	/// over subsequent frames. Fire-and-forget alternative to <see cref="GenerateTiles"/>.
+	/// </summary>
+	public void RequestTilesGeneration( BBox bounds )
+	{
+		ThreadSafe.AssertIsMainThread();
+
+		if ( !IsEnabled ) return;
+
+		var minMaxTileCoords = CalculateMinMaxTileCoords( bounds );
+
+		for ( int x = minMaxTileCoords.Left; x <= minMaxTileCoords.Right; x++ )
+		{
+			for ( int y = minMaxTileCoords.Top; y <= minMaxTileCoords.Bottom; y++ )
+			{
+				var tile = tileCache.GetOrAddTile( new Vector2Int( x, y ) );
+				tile.RequestFullRebuild();
+			}
+		}
+	}
+
 	internal Vector2Int WorldPositionToTilePosition( Vector3 worldPosition )
 	{
 		var tileLocationFloat = (worldPosition - TileOrigin) / TileSizeWorldSpace;

engine/Sandbox.Engine/Game/Navigation/NavMesh/NavMesh.Serialize.cs

@@ -32,6 +32,7 @@ internal JsonObject Serialize()
 		jso["AgentMaxSlope"] = AgentMaxSlope;
 		jso["ExcludedBodies"] = Json.ToNode( ExcludedBodies, typeof( TagSet ) );
 		jso["IncludedBodies"] = Json.ToNode( IncludedBodies, typeof( TagSet ) );
+		jso["DeferGeneration"] = DeferGeneration;
 		jso["CustomBounds"] = CustomBounds;
 		if ( CustomBounds ) jso["Bounds"] = Json.ToNode( Bounds, typeof( BBox ) );
 
@@ -63,6 +64,7 @@ internal void Deserialize( JsonObject jso )
 
 		ExcludedBodies = Json.FromNode<TagSet>( jso["ExcludedBodies"] ) ?? ExcludedBodies;
 		IncludedBodies = Json.FromNode<TagSet>( jso["IncludedBodies"] ) ?? IncludedBodies;
+		DeferGeneration = (bool)(jso["DeferGeneration"] ?? DeferGeneration);
 		CustomBounds = (bool)(jso["CustomBounds"] ?? CustomBounds);
 		Bounds = CustomBounds && jso["Bounds"] is not null ? Json.FromNode<BBox>( jso["Bounds"] ) : default;
 

engine/Sandbox.Engine/Game/Navigation/NavMesh/NavMesh.Tile.cs

@@ -17,6 +17,11 @@ internal class NavMeshTile : IDisposable
 
 	public bool IsHeightFieldValid => _compressedHeightField != null;
 
+	/// <summary>
+	/// True if the cached heightfield originates from baked data rather than live geometry.
+	/// </summary>
+	public bool IsBakedHeightField { get; private set; }
+
 	public byte[] CompressedHeightField => _compressedHeightField;
 
 	public void HeightfieldBuildComplete()
@@ -81,11 +86,13 @@ public void SetCachedHeightField( CompactHeightfield chf )
 		// a window where concurrent readers see null
 		var compressed = Compress( chf );
 		_compressedHeightField = compressed;
+		IsBakedHeightField = false;
 	}
 
 	internal void SetCompressedHeightField( byte[] compressedData )
 	{
 		_compressedHeightField = compressedData;
+		IsBakedHeightField = true;
 	}
 
 	public void DispatchNavmeshBuild( NavMesh navMesh )

engine/Sandbox.Engine/Game/Navigation/NavMesh/NavMesh.cs

@@ -88,6 +88,12 @@ public bool IsEnabled
 	/// </summary>
 	public TagSet IncludedBodies { get; set; } = new();
 
+	/// <summary>
+	/// Skip tile generation during scene load. Tiles can then be generated on demand
+	/// via <see cref="GenerateTile"/>, <see cref="RequestTileGeneration"/>, etc.
+	/// </summary>
+	public bool DeferGeneration { get; set; } = false;
+
 	/// <summary>
 	/// By Default , the navmesh will calculate bounds based on the world geometry, but if you want to override that, you can set custom bounds here.
 	/// </summary>
@@ -273,11 +279,23 @@ internal async Task<bool> Load( PhysicsWorld world )
 
 			Init();
 
-			await LoadFromBake();
+			if ( !DeferGeneration )
+			{
+				await LoadFromBake();
 
-			if ( !CustomBounds ) Bounds = CalculateWorldBounds( world );
+				if ( !CustomBounds ) Bounds = CalculateWorldBounds( world );
 
-			await GenerateTiles( world, Bounds );
+				await GenerateTiles( world, Bounds );
+			}
+			else
+			{
+				if ( !string.IsNullOrEmpty( _bakedDataPath ) )
+				{
+					Log.Warning( "NavMesh: Baked data is ignored when DeferGeneration is enabled" );
+				}
+
+				if ( !CustomBounds ) Bounds = CalculateWorldBounds( world );
+			}
 		}
 		finally
 		{

engine/Sandbox.Engine/Scene/Components/Mesh/PolygonMesh.Serialize.cs

@@ -34,6 +34,9 @@ public static object JsonRead( ref Utf8JsonReader reader, Type typeToConvert )
 				var propertyName = reader.GetString();
 				reader.Read();
 
+				// Legacy: Position/Rotation are no longer written. They were world-space values
+				// that got overwritten by MeshComponent on enable. Kept for backward compat with
+				// old data that may not have TextureCoord and needs these to reconstruct UVs.
 				if ( propertyName == "Position" )
 					mesh._transform = mesh.Transform.WithPosition( JsonSerializer.Deserialize<Vector3>( ref reader ) );
 
@@ -70,6 +73,9 @@ public static object JsonRead( ref Utf8JsonReader reader, Type typeToConvert )
 				else if ( propertyName == "TextureRotation" )
 					mesh.TextureRotationUnused.CopyFrom( JsonSerializer.Deserialize<Rotation[]>( ref reader ) );
 
+				// Legacy: Texture parameters are no longer written. They are world-space derived
+				// values recomputed at runtime from TextureCoord via ComputeFaceTextureParametersFromCoordinates().
+				// Kept for backward compat with old data that lacks TextureCoord.
 				else if ( propertyName == nameof( TextureUAxis ) )
 					mesh.TextureUAxis.CopyFrom( JsonSerializer.Deserialize<Vector3[]>( ref reader ) );
 
@@ -156,11 +162,10 @@ public static void JsonWrite( object value, Utf8JsonWriter writer )
 		writer.WritePropertyName( nameof( mesh.Topology ) );
 		writer.WriteBase64StringValue( ms.ToArray() );
 
-		writer.WritePropertyName( "Position" );
-		JsonSerializer.Serialize( writer, mesh.Transform.Position );
-
-		writer.WritePropertyName( "Rotation" );
-		JsonSerializer.Serialize( writer, mesh.Transform.Rotation );
+		// Position, Rotation, TextureUAxis, TextureVAxis, TextureScale, TextureOffset are not
+		// serialized because they are world-space dependent and derived at runtime.
+		// MeshComponent sets Mesh.Transform = WorldTransform on enable/transform change, which
+		// triggers ComputeFaceTextureParametersFromCoordinates() to recompute them from TextureCoord.
 
 		writer.WritePropertyName( nameof( mesh.Positions ) );
 		JsonSerializer.Serialize( writer, mesh.Positions );
@@ -174,18 +179,6 @@ public static void JsonWrite( object value, Utf8JsonWriter writer )
 		writer.WritePropertyName( nameof( mesh.TextureCoord ) );
 		JsonSerializer.Serialize( writer, mesh.TextureCoord );
 
-		writer.WritePropertyName( nameof( mesh.TextureUAxis ) );
-		JsonSerializer.Serialize( writer, mesh.TextureUAxis );
-
-		writer.WritePropertyName( nameof( mesh.TextureVAxis ) );
-		JsonSerializer.Serialize( writer, mesh.TextureVAxis );
-
-		writer.WritePropertyName( nameof( mesh.TextureScale ) );
-		JsonSerializer.Serialize( writer, mesh.TextureScale );
-
-		writer.WritePropertyName( nameof( mesh.TextureOffset ) );
-		JsonSerializer.Serialize( writer, mesh.TextureOffset );
-
 		writer.WritePropertyName( nameof( mesh.MaterialIndex ) );
 		JsonSerializer.Serialize( writer, mesh.MaterialIndex );
 

engine/Sandbox.Engine/Scene/Components/PostProcessing/Effects/Bloom.cs

@@ -32,7 +32,7 @@ public enum FilterMode
 
 	[Property] public FilterMode Filter { get; set; } = FilterMode.Bilinear;
 
-	CommandList command = new CommandList();
+	CommandList command = new CommandList( "Bloom" );
 
 	private static Material Shader = Material.FromShader( "postprocess_bloom.shader" );
 

engine/Sandbox.Engine/Systems/Networking/Networking.Thread.cs

@@ -1,17 +1,14 @@
-using System.Diagnostics;
-using System.Threading;
+using System.Threading;
 
 namespace Sandbox;
 
 public static partial class Networking
 {
-	private static volatile bool s_isClosing;
-	private static readonly ManualResetEventSlim ShutdownEvent = new( false );
+	private static bool _isClosing;
 
 	internal static void StartThread()
 	{
-		s_isClosing = false;
-		ShutdownEvent.Reset();
+		_isClosing = false;
 
 		var thread = new Thread( RunThread )
 		{
@@ -24,25 +21,16 @@ internal static void StartThread()
 
 	internal static void StopThread()
 	{
-		s_isClosing = true;
-		ShutdownEvent.Set();
+		_isClosing = true;
 	}
 
-	static readonly Lock NetworkThreadLock = new Lock();
-
-	/// <summary>
-	/// The target tick rate for the networking thread, updated from the main thread
-	/// each frame to avoid thread safety issues with ProjectSettings.
-	/// </summary>
-	private static volatile int s_threadTickRate = 30;
+	static Lock NetworkThreadLock = new Lock();
 
 	private static void RunThread()
 	{
 		try
 		{
-			var stopwatch = Stopwatch.StartNew();
-
-			while ( !s_isClosing )
+			while ( !_isClosing )
 			{
 				var system = System;
 
@@ -54,24 +42,10 @@ private static void RunThread()
 					}
 				}
 
-				var targetMs = 1000.0 / s_threadTickRate;
-				var elapsed = stopwatch.Elapsed.TotalMilliseconds;
-
-				stopwatch.Restart();
-
-				var remainingMs = targetMs - elapsed;
-
-				if ( remainingMs > 1.0 )
-				{
-					ShutdownEvent.Wait( (int)remainingMs );
-				}
-				else if ( remainingMs > 0 )
-				{
-					Thread.Yield();
-				}
+				Thread.Sleep( 1 );
 			}
 		}
-		catch ( Exception e )
+		catch ( System.Exception e )
 		{
 			Log.Error( e, "Network Thread Error" );
 		}

engine/Sandbox.Engine/Systems/Networking/Networking.cs

@@ -371,8 +371,6 @@ private static void UpdateLocalStats()
 
 	internal static void PreFrameTick()
 	{
-		s_threadTickRate = (int)ProjectSettings.Networking.UpdateRate.Clamp( 1, 500 );
-
 		UpdateFakeLag();
 
 		try