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

hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp

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

hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h

@@ -4,7 +4,6 @@
 
 #include "HYInteractableActor.h"
 #include "InventoryItem.h"
-#include "InputAction.h"
 #include "CoreMinimal.h"
 #include "GameFramework/PlayerController.h"
 #include "HYPlayerCharacController.generated.h"
@@ -44,18 +43,6 @@ 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;
-
-	/** Interact Input Action */
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
-	class UInputAction* InteractAction;
-
 #pragma endregion
 
 

hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp

@@ -118,6 +118,9 @@ void Ahwanyoung2Character::SetupPlayerInputComponent(class UInputComponent* Play
 		//Moving
 		EnhancedInputComponent->BindAction(MoveAction, ETriggerEvent::Triggered, this, &Ahwanyoung2Character::Move);
 		
+		//Walking
+		EnhancedInputComponent->BindAction(WalkAction, ETriggerEvent::Triggered, this, &Ahwanyoung2Character::Move);
+
 		//Looking
 		EnhancedInputComponent->BindAction(LookAction, ETriggerEvent::Triggered, this, &Ahwanyoung2Character::Look);
 

hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h

@@ -43,6 +43,10 @@ class Ahwanyoung2Character : public ACharacter
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
 	class UInputAction* LookAction;
 
+	/** Walk Input Action */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true"))
+	class UInputAction* WalkAction;
+
 #pragma endregion
 
 private:
@@ -51,7 +55,6 @@ private:
 
 public:
 
-
 	Ahwanyoung2Character();
 
 	//Updates the AbilitysystemComponent's actorInfo, especially in a multiplayer environment
@@ -65,6 +68,7 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "HY_Character|Camera")
 	FVector GetStartingCameraBoomLocation();
 
+
 	/** Returns CameraBoom subobject **/
 	class USpringArmComponent* GetCameraBoom() const { return CameraBoom; }
 	/** Returns FollowCamera subobject **/