Merge remote-tracking branch 'upstream/master' into meshcomponent-renderlayer

Author: Remscar

.editorconfig

@@ -375,4 +375,7 @@ dotnet_naming_style.s_camelcase.word_separator =
 dotnet_naming_style.s_camelcase.capitalization = camel_case
 
 # RS2008: Enable analyzer release tracking
-dotnet_diagnostic.RS2008.severity = suggestion
+dotnet_diagnostic.RS2008.severity = suggestion
+dotnet_diagnostic.CA2000.severity = error
+# Ugh... but trying to enforce this on textures is a lost cause
+dotnet_code_quality.CA2000.excluded_symbol_names = Texture

.github/workflows/pull_request.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const requiredChecks = ['Tests', 'Formatting'];
+            const requiredChecks = ['format', 'tests'];
 
             const pr = context.payload.pull_request;
             if (!pr) {
@@ -33,16 +33,8 @@ jobs:
 
               if (!match || match.conclusion !== 'success') {
                 const status = match ? (match.conclusion ?? match.status ?? 'unknown') : 'missing';
-                core.warning(`Required check '${requiredCheck}' did not pass (${status}). Removing triaged label.`);
-
-                await github.rest.issues.removeLabel({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: pr.number,
-                  name: 'triaged'
-                });
-
-                throw new Error('Cannot triage until required checks succeed.');
+                core.warning(`Required check '${requiredCheck}' did not pass (${status}).`);
+                throw new Error('Cannot triage until required checks succeed. Remove and re-add the triaged label to retry.');
               }
             }
 

.github/workflows/pull_request_checks.yml

@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 jobs:
-  format:
+  tests:
     runs-on: [ windows-latest ]
     steps:
       - name: Full Checkout

engine/Benchmark/Benchmarks/ByteStream.cs

@@ -8,17 +8,87 @@
 
 
 [MemoryDiagnoser]
-[ThreadingDiagnoser]
 public class ByteStreamTest
 {
 	Guid Guid = Guid.NewGuid();
 	byte[] byteBuffer = new byte[34];
-	int initialBuffer = 512;
+	byte[] readByteBuffer = new byte[34];
+	int initialBuffer = 4096;
+	byte[] intData = Array.Empty<byte>();
+	byte[] byteData = Array.Empty<byte>();
+	byte[] guidData = Array.Empty<byte>();
+	byte[] stringData = Array.Empty<byte>();
 
 	[GlobalSetup]
 	public void Setup()
 	{
+		{
+			var writer = ByteStream.Create( initialBuffer );
+			try
+			{
+				for ( int i = 0; i < 512; i++ )
+				{
+					writer.Write( i );
+				}
+
+				intData = writer.ToArray();
+			}
+			finally
+			{
+				writer.Dispose();
+			}
+		}
+
+		{
+			var writer = ByteStream.Create( initialBuffer );
+			try
+			{
+				for ( int i = 0; i < 512; i++ )
+				{
+					writer.Write( byteBuffer );
+				}
+
+				byteData = writer.ToArray();
+			}
+			finally
+			{
+				writer.Dispose();
+			}
+		}
+
+		{
+			var writer = ByteStream.Create( initialBuffer );
+			try
+			{
+				for ( int i = 0; i < 512; i++ )
+				{
+					writer.Write( Guid );
+				}
 
+				guidData = writer.ToArray();
+			}
+			finally
+			{
+				writer.Dispose();
+			}
+		}
+
+		{
+			var writer = ByteStream.Create( initialBuffer );
+			try
+			{
+				for ( int i = 0; i < 512; i++ )
+				{
+					writer.Write( "Hello there" );
+				}
+
+				stringData = writer.ToArray();
+			}
+			finally
+			{
+				writer.Dispose();
+			}
+		}
 	}
 
 	[Benchmark]
@@ -65,6 +135,63 @@ public void ByteStreamString()
 		}
 	}
 
+	[Benchmark]
+	public int ByteStreamReadInt()
+	{
+		using var reader = ByteStream.CreateReader( intData );
+		int sum = 0;
+
+		for ( int i = 0; i < 512; i++ )
+		{
+			sum += reader.Read<int>();
+		}
+
+		return sum;
+	}
+
+	[Benchmark]
+	public int ByteStreamReadByte()
+	{
+		using var reader = ByteStream.CreateReader( byteData );
+		int sum = 0;
+		for ( int i = 0; i < 512; i++ )
+		{
+			reader.Read( readByteBuffer, 0, readByteBuffer.Length );
+			sum += readByteBuffer[0];
+		}
+
+		return sum;
+	}
+
+	[Benchmark]
+	public int ByteStreamReadGuid()
+	{
+		using var reader = ByteStream.CreateReader( guidData );
+		int hash = 0;
+
+		for ( int i = 0; i < 512; i++ )
+		{
+			hash ^= reader.Read<Guid>().GetHashCode();
+		}
+
+		return hash;
+	}
+
+	[Benchmark]
+	public int ByteStreamReadString()
+	{
+		using var reader = ByteStream.CreateReader( stringData );
+		int totalLength = 0;
+
+		for ( int i = 0; i < 512; i++ )
+		{
+			var value = reader.Read<string>();
+			totalLength += value?.Length ?? 0;
+		}
+
+		return totalLength;
+	}
+
 	[Benchmark]
 	public void PooledMemoryStreamInt()
 	{
@@ -173,3 +300,87 @@ protected override void Dispose( bool disposing )
 	}
 
 }
+
+[MemoryDiagnoser]
+public class ByteStreamPoolingBenchmarks
+{
+	const int BatchSize = 100;
+	readonly int[] randomInitialSizes = new int[BatchSize];
+	readonly byte[][] payloads = new byte[BatchSize][];
+	readonly byte[] mediumPayload = new byte[4096];
+	readonly byte[] largePayload = new byte[64 * 1024];
+
+	[GlobalSetup]
+	public void Setup()
+	{
+		var rng = new Random( 42 );
+
+		for ( int i = 0; i < BatchSize; i++ )
+		{
+			// Keep sizes inside typical pool buckets to surface contention
+			var size = rng.Next( 64, 64 * 1024 );
+			randomInitialSizes[i] = size;
+
+			var payloadLength = rng.Next( 16, 512 );
+			var payload = new byte[payloadLength];
+			rng.NextBytes( payload );
+			payloads[i] = payload;
+		}
+
+		rng.NextBytes( mediumPayload );
+		rng.NextBytes( largePayload );
+	}
+
+	[Benchmark( Description = "Create 100 random streams sequentially" )]
+	public void CreateRandomBatchSequential()
+	{
+		for ( int i = 0; i < BatchSize; i++ )
+		{
+			using var stream = ByteStream.Create( randomInitialSizes[i] );
+			stream.Write( payloads[i] );
+		}
+	}
+
+	[Benchmark( Description = "Hold 100 random streams simultaneously" )]
+	public void CreateRandomBatchHeld()
+	{
+		CreateBatchRecursive( 0 );
+	}
+
+	[Benchmark( Description = "Stress growth with large payload writes" )]
+	public int LargePayloadWriteAndCopy()
+	{
+		using var stream = ByteStream.Create( 128 );
+
+		for ( int i = 0; i < 8; i++ )
+		{
+			stream.Write( largePayload );
+		}
+
+		return stream.ToArray().Length;
+	}
+
+	[Benchmark( Description = "Rapid reuse of pooled buffers" )]
+	public void RapidReuseMixedSizes()
+	{
+		for ( int i = 0; i < BatchSize; i++ )
+		{
+			using var stream = ByteStream.Create( 256 );
+			stream.Write( mediumPayload );
+			stream.Write( payloads[i] );
+		}
+	}
+
+	void CreateBatchRecursive( int index )
+	{
+		if ( index >= BatchSize )
+		{
+			return;
+		}
+
+		using var stream = ByteStream.Create( randomInitialSizes[index] );
+		stream.Write( payloads[index] );
+
+		CreateBatchRecursive( index + 1 );
+	}
+}

engine/Benchmark/Benchmarks/MemoryAlloc.cs

@@ -43,11 +43,4 @@ public void NativeMemoryAlloc()
 		var data = NativeMemory.Alloc( allocSize );
 		NativeMemory.Free( data );
 	}
-
-	[Benchmark]
-	public void NativeMemoryBlock()
-	{
-		using var ptr = Sandbox.NativeMemoryBlock.GetOrCreatePooled( allocSize );
-	}
-
 }

engine/Definitions/common/Physics/IPhysicsBody.def

@@ -123,4 +123,8 @@ native class IPhysicsBody as NativeEngine.IPhysicsBody
 	bool IsTouching( IPhysicsShape pShape, bool bTriggers );
 
 	void SetTrigger( bool trigger );
+
+	void ResetProxy();
+
+	void SetBullet( bool bEnabled );
 }

engine/Definitions/common/Physics/IPhysicsShape.def

@@ -83,4 +83,6 @@ native class IPhysicsShape as NativeEngine.IPhysicsShape
 	}
 
 	bool IsTouching( IPhysicsShape pShape, bool bTriggers );
+
+	void ResetProxy();
 }

engine/Definitions/common/Physics/IPhysicsWorld.def

@@ -44,6 +44,7 @@ native class IPhysicsWorld
 	IPhysicsJoint AddSphericalJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
 	IPhysicsJoint AddMotorJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
 	IPhysicsJoint AddWheelJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
+	IPhysicsJoint AddFilterJoint( IPhysicsBody pBody1, IPhysicsBody pBody2 );
 
 	//
 	// Sets the collision rules using a json serialized Sandbox.Internal.CollisionRules

engine/Definitions/common/Render/Graphics.def

@@ -20,4 +20,9 @@ managed static class Sandbox.Rendering.RenderPipeline
 {
 	void InternalAddLayersToView( ISceneView view, RenderViewport viewport, HSceneViewRenderTarget hColor, HSceneViewRenderTarget hDepth, RenderMultisampleType nMSAA, CRenderAttributes pipelineAttributes, RenderViewport screenDimensions );
 	void InternalPipelineEnd( ISceneView view, RenderViewport viewport, HSceneViewRenderTarget hColor, HSceneViewRenderTarget hDepth, RenderMultisampleType nMSAA, CRenderAttributes pipelineAttributes, RenderViewport screenDimensions );
+}
+
+managed static class Sandbox.Rendering.Skybox3DPipeline
+{
+	void InternalAddLayersToView( ISceneView view, RenderViewport viewport, HSceneViewRenderTarget hColor, HSceneViewRenderTarget hDepth, CRenderAttributes pipelineAttributes );
 }

engine/Definitions/common/SceneSystem/ISceneLayer.def

@@ -31,6 +31,7 @@ native class ISceneLayer as NativeEngine.ISceneLayer
     }
 
     void SetAttr( StringToken nTokenID, HSceneViewRenderTarget hRenderTarget, SceneLayerMSAAMode_t msaa, uint flags );
+    void SetLayerNoCull( bool enabled );
 
     void SetBoundingVolumeSizeCullThresholdInPercent( float flSizeCullThreshold );