feature/grab-mode

.gitignore

@@ -0,0 +1,11 @@
+/Content/Terrain/TerrainMaterialLibrary
+/Content/Shape/ContactMaterialLibrary
+/Content/Shape/ShapeMaterialLibrary
+/Content/Sensor/Lidar/AmbientMaterialLibrary
+/license/agx.lic
+/Source/AGXUnreal/Public/AGX_BuildInfo.h
+/Source/ThirdParty/agx
+/Source/AGXUnrealBarrier/Public/AGX_BuildInfo.generated.h
+Binaries
+DerivedDataCache
+Intermediate

Source/AGXUnreal/Public/AGX_Simulation.h

@@ -13,6 +13,7 @@
 #include "Containers/Map.h"
 #include "CoreMinimal.h"
 #include "Engine/EngineTypes.h"
+#include "Framework/Commands/InputChord.h"
 #include "Misc/EngineVersionComparison.h"
 #include "Subsystems/GameInstanceSubsystem.h"
 
@@ -247,7 +248,6 @@ class AGXUNREAL_API UAGX_Simulation : public UGameInstanceSubsystem
 	UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "AGX Lidar")
 	int32 RaytraceDeviceIndex {0};
 
-
 #if WITH_EDITORONLY_DATA
 	/**
 	 * Set to true to write an AGX Dynamics for Unreal archive of the initial state.
@@ -343,9 +343,17 @@ class AGXUNREAL_API UAGX_Simulation : public UGameInstanceSubsystem
 	 * Whether or not to override each AGX Shape with the selected AdditionalUnrealCollision
 	 * setting. If this is set to false, the setting on each AGX Shape is used instead.
 	 */
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Other")
+	UPROPERTY(Config, EditAnywhere, BlueprintReadOnly, Category = "Other")
 	bool bOverrideAdditionalUnrealCollision {false};
 
+	/**
+	 * Keyboard shortcut to enable Grab Mode, making it possible to grab a Rigid Body in the
+	 * viewport with the mouse.
+	 * Note: if changed, the Unreal Editor must be restarted for the change to take effect.
+	 */
+	UPROPERTY(Config, EditAnywhere, Category = "Other")
+	FInputChord GrabModeKeyboardShortcut {EKeys::Insert};
+
 	/**
 	 * Additional Unreal Collision Geometry to use for all AGX Shapes.
 	 * Does not affect AGX Dynamics, but can be used to get support for e.g. LineTrace (Query) or
@@ -355,7 +363,7 @@ class AGXUNREAL_API UAGX_Simulation : public UGameInstanceSubsystem
 	 * true, otherwise the AdditionalUnrealCollision setting belonging to each AGX Shape is used.
 	 */
 	UPROPERTY(
-		EditAnywhere, BlueprintReadOnly, Category = "Other",
+		Config, EditAnywhere, BlueprintReadOnly, Category = "Other",
 		Meta = (EditCondition = "bOverrideAdditionalUnrealCollision"))
 	TEnumAsByte<enum ECollisionEnabled::Type> AdditionalUnrealCollision {
 		ECollisionEnabled::QueryOnly};

Source/AGXUnrealEditor/Private/AGXUnrealEditor.cpp

@@ -6,10 +6,12 @@
 #include "AssetToolsModule.h"
 #include "AssetTypeCategories.h"
 #include "Editor/UnrealEdEngine.h"
+#include "Framework/Commands/Commands.h"
 #include "IAssetTools.h"
 #include "IAssetTypeActions.h"
 #include "IPlacementModeModule.h"
 #include "ISettingsModule.h"
+#include "LevelEditor.h"
 #include "Modules/ModuleManager.h"
 #include "PropertyEditorModule.h"
 #include "UnrealEdGlobals.h"
@@ -27,6 +29,7 @@
 #include "AGX_RigidBodyReference.h"
 #include "AGX_Real.h"
 #include "AGX_RealDetails.h"
+#include "AGX_RuntimeStyle.h"
 #include "AGX_ModelSourceComponent.h"
 #include "AGX_ModelSourceComponentCustomization.h"
 #include "AGX_Simulation.h"
@@ -41,6 +44,7 @@
 #include "AgxEdMode/AGX_AgxEdModeFileCustomization.h"
 #include "AgxEdMode/AGX_AgxEdModeTerrain.h"
 #include "AgxEdMode/AGX_AgxEdModeTerrainCustomization.h"
+#include "AgxEdMode/AGX_GrabMode.h"
 #include "AMOR/AGX_ConstraintMergeSplitThresholdsTypeActions.h"
 #include "AMOR/AGX_ShapeContactMergeSplitThresholdsTypeActions.h"
 #include "AMOR/AGX_WireMergeSplitThresholdsTypeActions.h"
@@ -110,6 +114,7 @@
 #include "Tires/AGX_TwoBodyTireComponent.h"
 #include "Tires/AGX_TwoBodyTireActor.h"
 #include "Tires/AGX_TwoBodyTireComponentCustomization.h"
+#include "Utilities/AGX_EditorUtilities.h"
 #include "Vehicle/AGX_TrackComponent.h"
 #include "Vehicle/AGX_TrackComponentDetails.h"
 #include "Vehicle/AGX_TrackComponentVisualizer.h"
@@ -128,6 +133,37 @@
 
 #define LOCTEXT_NAMESPACE "FAGXUnrealEditorModule"
 
+class FAGX_GlobalKeyboardCommands : public TCommands<FAGX_GlobalKeyboardCommands>
+{
+public:
+	FAGX_GlobalKeyboardCommands()
+		: TCommands<FAGX_GlobalKeyboardCommands>(
+			  TEXT("FAGXUnrealEditorModule"), LOCTEXT("FAGXUnrealEditorModule", "AGX UE Editor"),
+			  NAME_None, FAGX_RuntimeStyle::GetStyleSetName())
+	{
+	}
+
+	virtual void RegisterCommands() override
+	{
+		auto Sim = Cast<UAGX_Simulation>(UAGX_Simulation::StaticClass()->GetDefaultObject());
+		if (Sim == nullptr)
+		{
+			UE_LOG(
+				LogAGX, Warning,
+				TEXT("RegisterCommands failed in AGXUnrealEditor, could not get the AGX Simulation "
+					 "CDO. Keyboard commands may not work as expected."));
+			return;
+		}
+
+		UI_COMMAND(
+			ActivateGrabCommand, "Activate AGX Grab", "Activate AGX Grab",
+			EUserInterfaceActionType::Button, Sim->GrabModeKeyboardShortcut);
+	}
+
+public:
+	TSharedPtr<FUICommandInfo> ActivateGrabCommand;
+};
+
 void FAGXUnrealEditorModule::StartupModule()
 {
 	FAGX_EditorStyle::Initialize();
@@ -189,12 +225,26 @@ void FAGXUnrealEditorModule::UnregisterProjectSettings()
 
 void FAGXUnrealEditorModule::RegisterCommands()
 {
-	// Nothing here yet.
+	FAGX_GlobalKeyboardCommands::Register();
+
+	FLevelEditorModule& LevelEditorModule =
+		FModuleManager::GetModuleChecked<FLevelEditorModule>(TEXT("LevelEditor"));
+
+	const auto GrabModeCommands = FAGX_GlobalKeyboardCommands::Get();
+	if (!LevelEditorModule.GetGlobalLevelEditorActions()->IsActionMapped(
+			GrabModeCommands.ActivateGrabCommand))
+	{
+		LevelEditorModule.GetGlobalLevelEditorActions()->MapAction(
+			GrabModeCommands.ActivateGrabCommand,
+			FExecuteAction::CreateRaw(this, &FAGXUnrealEditorModule::OnGrabModeCommand),
+			FCanExecuteAction::CreateRaw(
+				this, &FAGXUnrealEditorModule::OnCanExecuteGrabModeCommand));
+	}
 }
 
 void FAGXUnrealEditorModule::UnregisterCommands()
 {
-	// Nothing here yet.
+	FAGX_GlobalKeyboardCommands::Unregister();
 }
 
 void FAGXUnrealEditorModule::RegisterAssetTypeActions()
@@ -632,11 +682,16 @@ void FAGXUnrealEditorModule::RegisterModes()
 			FAGX_EditorStyle::GetStyleSetName(), FAGX_EditorStyle::AgxIcon,
 			FAGX_EditorStyle::AgxIconSmall),
 		/*bVisisble*/ true);
+
+	FEditorModeRegistry::Get().RegisterMode<FAGX_GrabMode>(
+		FAGX_GrabMode::EM_AGX_GrabModeId, LOCTEXT("AGXGrabMode", "Grab Mode"), FSlateIcon(),
+		/*bVisisble*/ false);
 }
 
 void FAGXUnrealEditorModule::UnregisterModes()
 {
 	FEditorModeRegistry::Get().UnregisterMode(FAGX_AgxEdMode::EM_AGX_AgxEdModeId);
+	FEditorModeRegistry::Get().UnregisterMode(FAGX_GrabMode::EM_AGX_GrabModeId);
 }
 
 void FAGXUnrealEditorModule::RegisterPlacementCategory()
@@ -693,6 +748,17 @@ void FAGXUnrealEditorModule::InitializeAssets()
 	AGX_MaterialLibrary::InitializeLidarAmbientMaterialAssetLibrary();
 }
 
+void FAGXUnrealEditorModule::OnGrabModeCommand() const
+{
+	FAGX_GrabMode::Activate();
+}
+
+bool FAGXUnrealEditorModule::OnCanExecuteGrabModeCommand() const
+{
+	const UWorld* World = FAGX_EditorUtilities::GetCurrentWorld();
+	return World != nullptr && World->IsGameWorld();
+}
+
 #undef LOCTEXT_NAMESPACE
 
 IMPLEMENT_MODULE(FAGXUnrealEditorModule, AGXUnrealEditor);

Source/AGXUnrealEditor/Private/AGX_EditorStyle.cpp

@@ -15,13 +15,16 @@ TSharedPtr<FSlateStyleSet> FAGX_EditorStyle::StyleInstance = nullptr;
 const FName FAGX_EditorStyle::AgxIcon("AgxIcon");
 const FName FAGX_EditorStyle::AgxIconSmall("AgxIcon.Small");
 const FName FAGX_EditorStyle::AgxIconTiny("AgxIcon.Tiny");
-const FName FAGX_EditorStyle::JointIcon("JointIcon");
-const FName FAGX_EditorStyle::JointIconSmall("JointIcon.Small");
+const FName FAGX_EditorStyle::GrabIcon("GrabIcon");
 const FName FAGX_EditorStyle::FileIcon("FileIcon");
 const FName FAGX_EditorStyle::FileIconSmall("FileIcon.Small");
+const FName FAGX_EditorStyle::JointIcon("JointIcon");
+const FName FAGX_EditorStyle::JointIconSmall("JointIcon.Small");
+const FName FAGX_EditorStyle::LicenseKeyIcon("LicenseKey");
 const FName FAGX_EditorStyle::TerrainIcon("TerrainIcon");
 const FName FAGX_EditorStyle::TerrainIconSmall("TerrainIcon.Small");
-const FName FAGX_EditorStyle::LicenseKeyIcon("LicenseKey");
+
+
 
 void FAGX_EditorStyle::Initialize()
 {
@@ -99,6 +102,7 @@ TSharedRef<class FSlateStyleSet> FAGX_EditorStyle::Create()
 	Style->Set(TerrainIcon, new IMAGE_BRUSH("Icons/Terrain_64x64", IconSize64));
 	Style->Set(TerrainIconSmall, new IMAGE_BRUSH("Icons/Terrain_32x32", IconSize32));
 	Style->Set(LicenseKeyIcon, new IMAGE_BRUSH("Icons/license_key_16x16", IconSize16));
+	Style->Set(GrabIcon, new IMAGE_BRUSH("Icons/grab_32x32", IconSize16));
 
 	// Component icons, visible in the Components list/hierarchy of an Actor and in the Add
 	// Component dialog / list. Bodies.

Source/AGXUnrealEditor/Private/AGX_TopMenu.cpp

@@ -7,6 +7,7 @@
 #include "AGX_LogCategory.h"
 #include "AGX_RigidBodyComponent.h"
 #include "AgxEdMode/AGX_AgxEdModeFile.h"
+#include "AgxEdMode/AGX_GrabMode.h"
 #include "AGXUnrealEditor.h"
 #include "Constraints/AGX_ConstraintComponent.h"
 #include "Constraints/AGX_BallConstraintActor.h"
@@ -196,6 +197,21 @@ FAGX_TopMenu::~FAGX_TopMenu()
 
 	Builder.AddMenuSeparator();
 
+	{
+		const FSlateIcon GrabIcon(
+			FAGX_EditorStyle::GetStyleSetName(), FAGX_EditorStyle::GrabIcon,
+			FAGX_EditorStyle::GrabIcon);
+		Builder.AddSubMenu(
+			LOCTEXT("GrabModeMenuLabel", "Grab Mode"),
+			LOCTEXT(
+				"GrabModeMenuTooltip",
+				"Activate/Deactivate the Grab mode, making it possible to grab a "
+				"Rigid Body in the Level by clicking and dragging the mouse in the viewport."),
+			FNewMenuDelegate::CreateRaw(this, &FAGX_TopMenu::FillGrabModeMenu), false, GrabIcon);
+	}
+
+	Builder.AddMenuSeparator();
+
 	{
 		const FSlateIcon AgxIcon(
 			FAGX_EditorStyle::GetStyleSetName(), FAGX_EditorStyle::AgxIconSmall,
@@ -332,6 +348,22 @@ void FAGX_TopMenu::FillLicenseMenu(FMenuBuilder& Builder)
 		[&]() { FAGX_TopMenu::OnOpenGenerateRuntimeActivationDialogClicked(); });
 }
 
+void FAGX_TopMenu::FillGrabModeMenu(FMenuBuilder& Builder)
+{
+	AddFileMenuEntry(
+		Builder, LOCTEXT("StartGrabModeMenuLabel", "Start"),
+		LOCTEXT(
+			"StartGrabModeMenuLabelToolTip",
+			"Activate the Grab mode, making it possible to grab a "
+			"Rigid Body in the Level by clicking and dragging the mouse in the viewport."),
+		[&]() { FAGX_TopMenu::OnStartGrabModeDialogClicked(); });
+
+	AddFileMenuEntry(
+		Builder, LOCTEXT("StopGrabModeMenuLabel", "Stop"),
+		LOCTEXT("StopGrabModeMenuLabelToolTip", "Deactivate the Grab mode."),
+		[&]() { FAGX_TopMenu::OnStopGrabModeDialogClicked(); });
+}
+
 void FAGX_TopMenu::OnCreateConstraintClicked(UClass* ConstraintClass)
 {
 	AActor* Actor1 = nullptr;
@@ -490,4 +522,25 @@ void FAGX_TopMenu::OnOpenGenerateRuntimeActivationDialogClicked()
 	FSlateApplication::Get().AddModalWindow(Window, nullptr);
 }
 
+void FAGX_TopMenu::OnStartGrabModeDialogClicked()
+{
+	UWorld* World = FAGX_EditorUtilities::GetCurrentWorld();
+	if (World == nullptr)
+		return;
+
+	if (!World->IsGameWorld())
+	{
+		FAGX_NotificationUtilities::ShowDialogBoxWithErrorLog(
+			"Grab mode if only supported during play.");
+		return;
+	}
+
+	FAGX_GrabMode::Activate();
+}
+
+void FAGX_TopMenu::OnStopGrabModeDialogClicked()
+{
+	FAGX_GrabMode::Deactivate();
+}
+
 #undef LOCTEXT_NAMESPACE

Source/AGXUnrealEditor/Private/AgxEdMode/AGX_AgxEdMode.cpp

@@ -8,6 +8,7 @@
 #include "AgxEdMode/AGX_AgxEdModeTerrain.h"
 #include "AgxEdMode/AGX_AgxEdModeToolkit.h"
 #include "Toolkits/ToolkitManager.h"
+#include "Utilities/AGX_EditorUtilities.h"
 
 // Unreal Engine includes.
 #include "EditorModeManager.h"