Merge remote-tracking branch 'origin/main' into fmod-integration

hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp

@@ -4,6 +4,7 @@
 #include "HYPlayerCharacController.h"
 #include "HYGameStateBase.h"
 #include "hwanyoung2Character.h"
+#include "EnhancedInputComponent.h"
 
 AHYPlayerCharacController::AHYPlayerCharacController()
 {
@@ -48,9 +49,15 @@ void AHYPlayerCharacController::SetupInputComponent()
 {
 	Super::SetupInputComponent();
 
-	InputComponent->BindAction(
+	if (UEnhancedInputComponent* EnhancedInputComponent = CastChecked<UEnhancedInputComponent>(InputComponent)) {
-		"Interact", IE_Pressed, this, 
+		EnhancedInputComponent->BindAction(
-		&AHYPlayerCharacController::Interact);
+			InteractAction, ETriggerEvent::Triggered, 
+			this, &AHYPlayerCharacController::Interact);
+		EnhancedInputComponent->BindAction(
+			ToggleInventoryAction, ETriggerEvent::Triggered,
+			this, &AHYPlayerCharacController::ReloadInventory);
+
+	}
 }
 
 void AHYPlayerCharacController::OnPossess(APawn* InPawn)

hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h

@@ -4,7 +4,7 @@
 
 #include "HYInteractableActor.h"
 #include "InventoryItem.h"
-
+#include "InputAction.h"
 #include "CoreMinimal.h"
 #include "GameFramework/PlayerController.h"
 #include "HYPlayerCharacController.generated.h"
@@ -44,6 +44,10 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	int32 InventoryWeightLimit;
 
+	/** MappingContext */
+	UPROPERTY(EditAnywhere, Category = Input, meta = (AllowPrivateAccess = "true"))
+	class UInputMappingContext* InputMapping;
+
 	/** Toggle inventory GUI Input Action */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
 	class UInputAction* ToggleInventoryAction;

hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp

@@ -50,9 +50,11 @@ void Ahwanyoung2Character::BeginPlay()
 	{
 		if (UEnhancedInputLocalPlayerSubsystem* Subsystem = ULocalPlayer::GetSubsystem<UEnhancedInputLocalPlayerSubsystem>(PlayerController->GetLocalPlayer()))
 		{
-			Subsystem->AddMappingContext(DefaultMappingContext, 0);
+			Subsystem->AddMappingContext(InputMapping, 0);
 		}
 	}
+
+	
 }
 
 void Ahwanyoung2Character::CheckForInteractables()

hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h

@@ -4,7 +4,7 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Character.h"
-#include "InputActionValue.h"
+#include "InputAction.h"
 #include "hwanyoung2.h"
 #include "hwanyoung2Character.generated.h"
 
@@ -28,8 +28,8 @@ class Ahwanyoung2Character : public ACharacter
 
 #pragma region Character Gameplay Input Action
 	/** MappingContext */
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
+	UPROPERTY(EditAnywhere, Category = Input, meta = (AllowPrivateAccess = "true"))
-	class UInputMappingContext* DefaultMappingContext;
+	class UInputMappingContext* InputMapping;
 
 	/** Jump Input Action */
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))