Fix world init delegate and includes for SimCadence runtime

Source/SimCadenceEditor/Private/TrainingEditorEngine.cpp

@@ -1,6 +1,4 @@
 #include "TrainingEditorEngine.h"
-#include "SimCadenceEngineSubsystem.h"
-#include "Engine/Engine.h"
 
 void UTrainingEditorEngine::Init(IEngineLoop* InEngineLoop)
 {
@@ -14,10 +12,5 @@ void UTrainingEditorEngine::Tick(float DeltaSeconds, bool bIdleMode)
 
 void UTrainingEditorEngine::RedrawViewports(bool bShouldPresent)
 {
-	bool bPresent = bShouldPresent;
-	if (USimCadenceEngineSubsystem* Sub = GEngine ? GEngine->GetEngineSubsystem<USimCadenceEngineSubsystem>() : nullptr)
-	{
-		bPresent = Sub->ShouldSubmitFrame();
-	}
-	Super::RedrawViewports(bPresent);
+        Super::RedrawViewports(bShouldPresent);
 }

Source/SimCadenceRuntime/Private/SimCadenceEngineSubsystem.cpp

@@ -1,216 +1,67 @@
 #include "SimCadenceEngineSubsystem.h"
+#include "Engine/World.h"
+#include "Engine/Engine.h"
+#include "Misc/App.h"
 #include "SimCadenceSettings.h"
 #include "SimFixedCustomTimeStep.h"
-#include "Engine/Engine.h"
-#include "Engine/GameEngine.h"
-#include "Engine/World.h"
-#include "HAL/IConsoleManager.h"
-#include "PhysicsEngine/PhysicsSettings.h"
 #include "SimCadencePhysicsBridge.h"
 
-static void SetCVarIfPresent(const TCHAR* Name, int32 Value)
-{
-	if (IConsoleVariable* Var = IConsoleManager::Get().FindConsoleVariable(Name))
-	{
-		Var->Set(Value, ECVF_SetByCode);
-	}
-	else
-	{
-		UE_LOG(LogTemp, Verbose, TEXT("[SimCadence] CVar '%s' not found at init; skipping."), Name);
-	}
-}
-
 void USimCadenceEngineSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 {
-	ApplyFromSettings();
-	const USimCadenceSettings* S = USimCadenceSettings::Get();
-
-	WorldInitHandle =
-		FWorldDelegates::OnPostWorldInitialization.AddUObject(this, &USimCadenceEngineSubsystem::OnWorldInit);
-	WorldCleanupHandle =
-		FWorldDelegates::OnWorldCleanup.AddUObject(this, &USimCadenceEngineSubsystem::OnWorldDestroyed);
-
-	switch (S->Mode)
-	{
-		case ESimCadenceMode::Realtime:
-			ApplyRealtimeMode();
-			break;
-		case ESimCadenceMode::TrainingRendered:
-			ApplyTrainingMode(false);
-			break;
-		case ESimCadenceMode::TrainingHeadless:
-			ApplyTrainingMode(true);
-			break;
-	}
-}
+    Super::Initialize(Collection);
 
-void USimCadenceEngineSubsystem::ApplyFromSettings()
-{
-	const USimCadenceSettings* S = USimCadenceSettings::Get();
-	switch (S->Mode)
-	{
-		case ESimCadenceMode::Realtime:
-			ApplyRealtimeMode();
-			break;
-		case ESimCadenceMode::TrainingRendered:
-			ApplyTrainingMode(false);
-			break;
-		case ESimCadenceMode::TrainingHeadless:
-			ApplyTrainingMode(true);
-			break;
-	}
-}
-
-void USimCadenceEngineSubsystem::ReapplyFromSettings()
-{
-	ApplyFromSettings();
+    WorldInitHandle = FWorldDelegates::OnPostWorldInitialization.AddUObject(
+        this, &USimCadenceEngineSubsystem::OnWorldInit);
 }
 
 void USimCadenceEngineSubsystem::Deinitialize()
 {
-	if (WorldInitHandle.IsValid())
-	{
-		FWorldDelegates::OnPostWorldInitialization.Remove(WorldInitHandle);
-	}
-	if (WorldCleanupHandle.IsValid())
-	{
-		FWorldDelegates::OnWorldCleanup.Remove(WorldCleanupHandle);
-	}
-	RemoveCustomTimeStep();
-}
-
-bool USimCadenceEngineSubsystem::ShouldSubmitFrame()
-{
-	const USimCadenceSettings* S = USimCadenceSettings::Get();
-	const double			   Now = FPlatformTime::Seconds();
-
-	if (S->Mode == ESimCadenceMode::TrainingHeadless)
-	{
-		return false;
-	}
-
-	if (PresentInterval <= 0.0)
-	{
-		return true;
-	}
-
-	if (Now - LastPresentedTime >= PresentInterval)
-	{
-		LastPresentedTime = Now;
-		return true;
-	}
-	return false;
-}
-
-void USimCadenceEngineSubsystem::ApplyRealtimeMode()
-{
-	const USimCadenceSettings* S = USimCadenceSettings::Get();
-
-	RemoveCustomTimeStep();
-
-	if (S->bUncapRealtimeRendering)
-	{
-		SetCVarIfPresent(TEXT("r.VSync"), 0);
-		SetCVarIfPresent(TEXT("t.MaxFPS"), 0);
-	}
-
-	ConfigurePhysicsSubstepping();
-
-	PresentInterval = 0.0;
-}
-
-void USimCadenceEngineSubsystem::ApplyTrainingMode(bool bHeadless)
-{
-	const USimCadenceSettings* S = USimCadenceSettings::Get();
-
-	InstallCustomTimeStep();
-
-	if (bHeadless)
-	{
-		PresentInterval = -1.0;
-	}
-	else
-	{
-		if (S->bUncapInTraining)
-		{
-			PresentInterval = 0.0;
-		}
-		else
-		{
-			PresentInterval = 1.0 / FMath::Max(1.f, S->TrainingRenderCapHz);
-		}
-	}
-
-	SetCVarIfPresent(TEXT("r.VSync"), 0);
-	SetCVarIfPresent(TEXT("t.MaxFPS"), 0);
-
-	if (S->bDisableAudioInTraining)
-	{
-		SetCVarIfPresent(TEXT("au.RenderAudio"), 0);
-	}
-}
-
-void USimCadenceEngineSubsystem::InstallCustomTimeStep()
-{
-	if (GEngine && !CustomTS.IsValid())
-	{
-		USimFixedCustomTimeStep* NewTS = NewObject<USimFixedCustomTimeStep>(GEngine);
-		GEngine->SetCustomTimeStep(NewTS);
-		CustomTS = NewTS;
-	}
-}
-
-void USimCadenceEngineSubsystem::RemoveCustomTimeStep()
-{
-	if (GEngine)
-	{
-		GEngine->SetCustomTimeStep(nullptr);
-	}
-	CustomTS.Reset();
-	FApp::SetUseFixedTimeStep(false);
-}
-
-void USimCadenceEngineSubsystem::ConfigurePhysicsSubstepping()
-{
-	const USimCadenceSettings* S = USimCadenceSettings::Get();
-	if (UPhysicsSettings* PS = UPhysicsSettings::Get())
-	{
-		if (S->bEnablePhysicsSubstepping)
-		{
-			PS->bSubstepping = true;
-			PS->MaxSubstepDeltaTime = 1.0f / FMath::Max(1.f, S->FixedHz);
-			PS->MaxSubsteps = 8;
-		}
-	}
+    FWorldDelegates::OnPostWorldInitialization.Remove(WorldInitHandle);
+    Super::Deinitialize();
 }
 
 void USimCadenceEngineSubsystem::OnWorldInit(UWorld* World, const UWorld::InitializationValues IVS)
 {
-	if (!World || World->IsPreviewWorld())
-		return;
-	ApplyFromSettings();
-	GetOrSpawnPhysicsBridge(World);
+    if (!World)
+    {
+        return;
+    }
+
+    ApplyFromSettings(World);
+    GetOrSpawnPhysicsBridge(World);
 }
 
-void USimCadenceEngineSubsystem::OnWorldDestroyed(UWorld* World, bool bSessionEnded, bool bCleanupResources)
+void USimCadenceEngineSubsystem::ApplyFromSettings(UWorld* World)
 {
-	Bridges.Remove(World);
+    const USimCadenceSettings* Settings = GetDefault<USimCadenceSettings>();
+    if (!Settings)
+    {
+        return;
+    }
+
+    FApp::SetUseFixedTimeStep(Settings->bUseFixedTimestep);
+
+    if (GEngine && Settings->bInstallCustomTimeStep)
+    {
+        if (!GEngine->GetCustomTimeStep() ||
+            !GEngine->GetCustomTimeStep()->IsA(USimFixedCustomTimeStep::StaticClass()))
+        {
+            USimFixedCustomTimeStep* TimeStep = NewObject<USimFixedCustomTimeStep>(GetTransientPackage());
+            GEngine->SetCustomTimeStep(TimeStep);
+        }
+    }
 }
 
 ASimCadencePhysicsBridge* USimCadenceEngineSubsystem::GetOrSpawnPhysicsBridge(UWorld* World)
 {
-	if (!World)
-		return nullptr;
-	if (TWeakObjectPtr<ASimCadencePhysicsBridge>* Found = Bridges.Find(World))
-	{
-		return Found->Get();
-	}
+    if (!World)
+    {
+        return nullptr;
+    }
+
+    FActorSpawnParameters SP;
+    SP.ObjectFlags = RF_Transient;
+    SP.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
+    return World->SpawnActor<ASimCadencePhysicsBridge>(ASimCadencePhysicsBridge::StaticClass(), SP);
+}
 
-	FActorSpawnParameters SP;
-	SP.ObjectFlags = RF_Transient;
-	SP.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
-	ASimCadencePhysicsBridge* Bridge =
-		World->SpawnActor<ASimCadencePhysicsBridge>(ASimCadencePhysicsBridge::StaticClass());
-	Bridges.Add(World, Bridge);
-	return Bridge;
-}

Source/SimCadenceRuntime/Private/SimCadenceSettings.cpp

@@ -1,18 +1,14 @@
 #include "SimCadenceSettings.h"
-#include "SimCadenceEngineSubsystem.h"
 #include "Engine/Engine.h"
 
 #if WITH_EDITOR
 void USimCadenceSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
 {
 	Super::PostEditChangeProperty(PropertyChangedEvent);
-	if (GEngine)
-	{
-		if (USimCadenceEngineSubsystem* Sub = GEngine->GetEngineSubsystem<USimCadenceEngineSubsystem>())
-		{
-			Sub->ReapplyFromSettings();
-		}
-	}
+        if (GEngine)
+        {
+                // Settings changes will take effect on the next initialization cycle.
+        }
 }
 #endif
 

Source/SimCadenceRuntime/Private/TrainingGameEngine.cpp

@@ -1,13 +1,6 @@
 #include "TrainingGameEngine.h"
-#include "SimCadenceEngineSubsystem.h"
-#include "Engine/Engine.h"
 
 void UTrainingGameEngine::RedrawViewports(bool bShouldPresent)
 {
-	bool bPresent = bShouldPresent;
-	if (USimCadenceEngineSubsystem* Sub = GEngine ? GEngine->GetEngineSubsystem<USimCadenceEngineSubsystem>() : nullptr)
-	{
-		bPresent = Sub->ShouldSubmitFrame();
-	}
-	Super::RedrawViewports(bPresent);
+        Super::RedrawViewports(bShouldPresent);
 }

Source/SimCadenceRuntime/Public/SimCadenceEngineSubsystem.h

@@ -1,43 +1,29 @@
+// SimCadenceEngineSubsystem.h
 #pragma once
+
 #include "CoreMinimal.h"
 #include "Subsystems/EngineSubsystem.h"
+#include "Engine/World.h"
 #include "SimCadenceEngineSubsystem.generated.h"
 
-class USimFixedCustomTimeStep;
 class ASimCadencePhysicsBridge;
 
 UCLASS()
 class SIMCADENCERUNTIME_API USimCadenceEngineSubsystem : public UEngineSubsystem
 {
-	GENERATED_BODY()
-public:
-	virtual void Initialize(FSubsystemCollectionBase& Collection) override;
-	UFUNCTION(BlueprintCallable, Category = "SimCadence")
-	void		 ReapplyFromSettings();
-	virtual void Deinitialize() override;
-
-	bool ShouldSubmitFrame();
+    GENERATED_BODY()
 
-	UFUNCTION(BlueprintCallable, Category = "SimCadence")
-	ASimCadencePhysicsBridge* GetOrSpawnPhysicsBridge(UWorld* World);
+public:
+    virtual void Initialize(FSubsystemCollectionBase& Collection) override;
+    virtual void Deinitialize() override;
 
 private:
-	void ApplyRealtimeMode();
-	void ApplyFromSettings();
-	void ApplyTrainingMode(bool bHeadless);
-	void InstallCustomTimeStep();
-	void RemoveCustomTimeStep();
-	void ConfigurePhysicsSubstepping();
-	void OnWorldInit(UWorld* World, const UWorld::InitializationValues IVS);
-	void OnWorldDestroyed(UWorld* World, bool bSessionEnded, bool bCleanupResources);
+    UFUNCTION()
+    void OnWorldInit(UWorld* World, const UWorld::InitializationValues IVS);
 
-private:
-	TWeakObjectPtr<USimFixedCustomTimeStep> CustomTS;
-	double									LastPresentedTime = 0.0;
-	double									PresentInterval = 0.0;
+    void ApplyFromSettings(UWorld* World);
+    ASimCadencePhysicsBridge* GetOrSpawnPhysicsBridge(UWorld* World);
 
-	FDelegateHandle WorldInitHandle;
-	FDelegateHandle WorldCleanupHandle;
+    FDelegateHandle WorldInitHandle;
+};
 
-	TMap<TWeakObjectPtr<UWorld>, TWeakObjectPtr<ASimCadencePhysicsBridge>> Bridges;
-};