diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index a919105..586875a 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -82,3 +82,6 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul -ConsoleKeys=Tilde +ConsoleKeys=Tilde +[/Script/EnhancedInput.EnhancedInputDeveloperSettings] +bEnableUserSettings=True + diff --git a/Content/ProofOfConcept_BP/DDICharacter_BP.uasset b/Content/ProofOfConcept_BP/DDICharacter_BP.uasset index 878f5df..b338597 100644 Binary files a/Content/ProofOfConcept_BP/DDICharacter_BP.uasset and b/Content/ProofOfConcept_BP/DDICharacter_BP.uasset differ diff --git a/Content/ProofOfConcept_BP/DDIPlayerController_BP.uasset b/Content/ProofOfConcept_BP/DDIPlayerController_BP.uasset index 702f76a..7416167 100644 Binary files a/Content/ProofOfConcept_BP/DDIPlayerController_BP.uasset and b/Content/ProofOfConcept_BP/DDIPlayerController_BP.uasset differ diff --git a/Content/ProofOfConcept_BP/IMC_Default.uasset b/Content/ProofOfConcept_BP/IMC_Default.uasset index 2780c4e..ef3ca80 100644 Binary files a/Content/ProofOfConcept_BP/IMC_Default.uasset and b/Content/ProofOfConcept_BP/IMC_Default.uasset differ diff --git a/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp b/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp index b67b691..fda149c 100644 --- a/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp +++ b/Source/OpenConflict/PlayerCharacter/DDICharacter.cpp @@ -34,6 +34,7 @@ ADDICharacter::ADDICharacter() FirstPersonCamera = CreateDefaultSubobject(TEXT("First Person Camera")); // FirstPersonCamera->SetupAttachment(FirstPersonMesh, FName("head")); + FirstPersonCamera->SetupAttachment(GetMesh()); FirstPersonCamera->SetRelativeLocationAndRotation(FVector(-2.8f, 5.89f, 0.0f), FRotator(0.0f, 90.0f, -90.0f)); FirstPersonCamera->bUsePawnControlRotation = true; FirstPersonCamera->bEnableFirstPersonFieldOfView = true; @@ -59,6 +60,9 @@ void ADDICharacter::BeginPlay() { Super::BeginPlay(); + GEngine->AddOnScreenDebugMessage(-1, 5, FColor::Red, GetController()->GetName()); + + // SetupPlayerInputComponent( InputComponent); } diff --git a/Source/OpenConflict/PlayerCharacter/DDICharacter.h b/Source/OpenConflict/PlayerCharacter/DDICharacter.h index 8b1f61a..954a0ea 100644 --- a/Source/OpenConflict/PlayerCharacter/DDICharacter.h +++ b/Source/OpenConflict/PlayerCharacter/DDICharacter.h @@ -112,7 +112,7 @@ public: virtual ~ADDICharacter(); virtual float TakeDamage(float DamageAmount, struct FDamageEvent const& DamageEvent, class AController* EventInstigator, AActor* DamageCauser) override; - USkeletalMeshComponent* GetFirstPersonMesh() const { return FirstPersonMesh; }; + // USkeletalMeshComponent* GetFirstPersonMesh() const { return FirstPersonMesh; }; UCameraComponent* GetFirstPersonCameraComponent() const {return FirstPersonCamera; }; diff --git a/Source/OpenConflict/PlayerCharacter/DDIPlayerController.cpp b/Source/OpenConflict/PlayerCharacter/DDIPlayerController.cpp index 04a8bba..d1e316a 100644 --- a/Source/OpenConflict/PlayerCharacter/DDIPlayerController.cpp +++ b/Source/OpenConflict/PlayerCharacter/DDIPlayerController.cpp @@ -17,11 +17,12 @@ ADDIPlayerController::ADDIPlayerController() void ADDIPlayerController::SetupInputComponent() { Super::SetupInputComponent(); - + if (UEnhancedInputLocalPlayerSubsystem* Subsystem = ULocalPlayer::GetSubsystem(GetLocalPlayer())) { for (UInputMappingContext* CurrentContext : DefaultMappingContexts) { + GEngine->AddOnScreenDebugMessage(-1, 5, FColor::Cyan, "Controller Setup Character"); Subsystem->AddMappingContext(CurrentContext, 0); } } @@ -30,7 +31,7 @@ void ADDIPlayerController::SetupInputComponent() void ADDIPlayerController::BeginPlay() { Super::BeginPlay(); - + GEngine->AddOnScreenDebugMessage(-1, 5, FColor::Green, this->GetName()); // WeaponUI = CreateWidget(this, WeaponUIClass); // WeaponUI->AddToPlayerScreen(0); }