Merge branch 'Facepunch:master' into nodeeditor-valueeditor-additions

Author: QuackCola

.github/workflows/pull_request.yml

@@ -1,4 +1,4 @@
-name: Pull Request
+name: PR Triage
 on:
   pull_request_target:
     types: [ labeled ]
@@ -8,10 +8,56 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.label.name == 'triaged'
     steps:
+      - name: Ensure PR checks passed
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const requiredChecks = ['Tests', 'Formatting'];
+
+            const pr = context.payload.pull_request;
+            if (!pr) {
+              throw new Error('No pull request found in event payload.');
+            }
+
+            const { data } = await github.rest.checks.listForRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: pr.head.sha,
+              per_page: 100
+            });
+
+            const checkRuns = data.check_runs ?? [];
+            for (const requiredCheck of requiredChecks) {
+              const match = checkRuns.find(run => (run.name ?? '') === requiredCheck);
+
+              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.');
+              }
+            }
+
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v4
+        uses: actions/github-script@v7
+        env:
+          DISPATCH_CONTEXT: ${{ toJson(github) }}
         with:
-          token: ${{ secrets.SBOXBOT_TOKEN }}
-          repository: Facepunch/sbox
-          event-type: pr-triaged
-          client-payload: '{"github": ${{ toJson(github) }}}'
+          github-token: ${{ secrets.SBOXBOT_TOKEN }}
+          script: |
+            const clientPayload = JSON.parse(process.env.DISPATCH_CONTEXT);
+
+            await github.rest.repos.createDispatchEvent({
+              owner: 'Facepunch',
+              repo: 'sbox',
+              event_type: 'pr-triaged',
+              client_payload: { github: clientPayload }
+            });

.github/workflows/pull_request_checks.yml

@@ -1,4 +1,4 @@
-name: Pull Request Checks
+name: Tests
 
 on:
   pull_request:
@@ -15,18 +15,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           clean: true
-          fetch-depth: 1
+          fetch-depth: 0
           persist-credentials: false
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0.x'
 
-      - name: Format
-        run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- format --verify
-
-      - name: Bootstrap
-        run: .\Bootstrap.bat
+      - name: Build
+        run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- build --config Developer
 
       - name: Test
         run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- test

.github/workflows/pull_request_formatting.yml

@@ -0,0 +1,27 @@
+name: Formatting
+
+on:
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  format:
+    runs-on: [ windows-latest ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          clean: true
+          fetch-depth: 1
+          persist-credentials: false
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: '10.0.x'
+
+      - name: Format
+        run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- format --verify

engine/Definitions/common/Physics/IPhysicsJoint.def

@@ -79,6 +79,43 @@ native class IPhysicsJoint as NativeEngine.IPhysicsJoint
 	float Motor_GetAngularDampingRatio();
 	float Motor_GetMaxSpringForce();
 	float Motor_GetMaxSpringTorque();
+
+	void Wheel_EnableSuspension( bool flag );
+	bool Wheel_IsSuspensionEnabled();
+	void Wheel_SetSuspensionHertz( float hertz );
+	float Wheel_GetSuspensionHertz();
+	void Wheel_SetSuspensionDampingRatio( float dampingRatio );
+	float Wheel_GetSuspensionDampingRatio();
+	void Wheel_EnableSuspensionLimit( bool flag );
+	bool Wheel_IsSuspensionLimitEnabled();
+	float Wheel_GetLowerSuspensionLimit();
+	float Wheel_GetUpperSuspensionLimit();
+	void Wheel_SetSuspensionLimits( float lower, float upper );
+	void Wheel_EnableSpinMotor( bool flag );
+	bool Wheel_IsSpinMotorEnabled();
+	void Wheel_SetSpinMotorSpeed( float speed );
+	float Wheel_GetSpinMotorSpeed();
+	void Wheel_SetMaxSpinTorque( float torque );
+	float Wheel_GetMaxSpinTorque();
+	void Wheel_EnableSteering( bool flag );
+	bool Wheel_IsSteeringEnabled();
+	void Wheel_SetSteeringHertz( float hertz );
+	float Wheel_GetSteeringHertz();
+	void Wheel_SetSteeringDampingRatio( float dampingRatio );
+	float Wheel_GetSteeringDampingRatio();
+	void Wheel_SetMaxSteeringTorque( float torque );
+	float Wheel_GetMaxSteeringTorque();
+	void Wheel_EnableSteeringLimit( bool flag );
+	bool Wheel_IsSteeringLimitEnabled();
+	float Wheel_GetLowerSteeringLimit();
+	float Wheel_GetUpperSteeringLimit();
+	void Wheel_SetSteeringLimits( float lowerRadians, float upperRadians );
+	void Wheel_SetTargetSteeringAngle( float radians );
+	float Wheel_GetTargetSteeringAngle();
+	float Wheel_GetSpinSpeed();
+	float Wheel_GetSpinTorque();
+	float Wheel_GetSteeringAngle();
+	float Wheel_GetSteeringTorque();
 }
 
 managed static class Sandbox.Physics.PhysicsEngine

engine/Definitions/common/Physics/IPhysicsWorld.def

@@ -43,6 +43,7 @@ native class IPhysicsWorld
 	IPhysicsJoint AddPrismaticJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
 	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 );
 
 	//
 	// Sets the collision rules using a json serialized Sandbox.Internal.CollisionRules

engine/Definitions/common/Render/renderdevice.def

@@ -69,6 +69,8 @@ native accessor g_pRenderDevice
 
 	bool IsTextureRenderTarget( ITexture texture );
 
+	bool IsRayTracingSupported();
+
 	inline RenderBufferHandle_t CreateGPUBuffer( RenderBufferType_t nType, BufferDesc_t desc, RenderBufferFlags_t usage, string pDebugName )
 	{
 		desc.m_pDebugName = pDebugName;

engine/Definitions/common/SceneSystem/IRayTraceSceneWorld.def

@@ -0,0 +1,19 @@
+#include "scenesystem/iscenesystem.h"
+
+native class IRayTraceSceneWorld as NativeEngine.IRayTraceSceneWorld
+{
+    void BeginBuild();
+    void AddSceneWorldToBuild( ISceneWorld pWorld, IRenderContext pRenderContext );
+	bool EndBuild( IRenderContext pRenderContext, CRenderAttributes attrs );
+
+    inline bool BuildTLASForWorld( ISceneWorld pWorld, CRenderAttributes attrs )
+    {
+        CRenderContextPtr pRenderContext( g_pRenderDevice, "sceneinfo_gpu" );
+
+        this->BeginBuild();
+        this->AddSceneWorldToBuild( pWorld, pRenderContext );
+        this->EndBuild( pRenderContext, attrs );
+
+        return true;
+    } 
+}

engine/Definitions/common/SceneSystem/g_pSceneSystem.def

@@ -160,4 +160,8 @@ native accessor g_pSceneSystem as NativeEngine.CSceneSystem
 	void RenderTiledLightCulling( IRenderContext pCtx, ISceneView pView, RenderViewport viewport );
 
 	void BindTransformSlot( IRenderContext pCtx, int nVBSlot, int nTransformSlotIndex );
+
+	// Ray Tracing
+	IRayTraceSceneWorld CreateRayTraceWorld( string pWorldDebugName, int nMaxRayTypes );
+	void DestroyRayTraceWorld( IRayTraceSceneWorld pRayTraceSceneWorld );
 }

engine/Definitions/engine/Render/RenderTools.def

@@ -17,6 +17,8 @@ native static class RenderTools as NativeEngine.RenderTools
 	//
 	void Compute( IRenderContext renderContext, CRenderAttributes attributes, IMaterialMode pMode, int tx, int ty, int tz );
 	void ComputeIndirect( IRenderContext renderContext, CRenderAttributes attributes, IMaterialMode pMode, RenderBufferHandle_t hIndirectBuffer, uint nIndirectBufferOffset );
+	void TraceRays( IRenderContext renderContext, CRenderAttributes attributes, IMaterialMode pMode, uint tx, uint ty, uint tz );
+	void TraceRaysIndirect( IRenderContext renderContext, CRenderAttributes attributes, IMaterialMode pMode, RenderBufferHandle_t hIndirectBuffer, uint nIndirectBufferOffset );
 	void SetDynamicConstantBufferData( CRenderAttributes attributes, StringToken nTokenID, IRenderContext renderContext, void* data, int dataSize );
 
 	void CopyTexture( IRenderContext renderContext, ITexture sourceTexture, ITexture destTexture, Rect_t pSrcRect, int nDestX, int nDestY, uint nSrcMipSlice, uint nSrcArraySlice, uint nDstMipSlice, uint nDstArraySlice );

engine/Definitions/tools/widgetutil.def

@@ -25,6 +25,7 @@ native static class WidgetUtil Native.WidgetUtil
 	// Text measuring tools
 	//
 	Vector4 MeasureText( QRect rect, int flags, string text );
+	QString ElidedText( string text, int width, int mode, int flags );
 
 
 	static void ConstrainToScreen( QWidget widget );