diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index f64b2e7..4c7579d 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -87,10 +87,10 @@ DefaultViewportMouseLockMode=LockOnCapture FOVScale=0.011110 DoubleClickTime=0.200000 +ActionMappings=(ActionName="Fire",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) -+AxisMappings=(AxisName="MoveForward",Scale=4.000000,Key=W) -+AxisMappings=(AxisName="MoveForward",Scale=-4.000000,Key=S) -+AxisMappings=(AxisName="Turn",Scale=4.000000,Key=D) -+AxisMappings=(AxisName="Turn",Scale=-4.000000,Key=A) ++AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) ++AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) ++AxisMappings=(AxisName="Turn",Scale=1.000000,Key=D) ++AxisMappings=(AxisName="Turn",Scale=-1.000000,Key=A) +AxisMappings=(AxisName="RotateTurret",Scale=1.000000,Key=MouseX) DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent diff --git a/Content/Blueprints/Pawns/BP_Tank.uasset b/Content/Blueprints/Pawns/BP_Tank.uasset index c78e1f3..2d4cf3f 100644 Binary files a/Content/Blueprints/Pawns/BP_Tank.uasset and b/Content/Blueprints/Pawns/BP_Tank.uasset differ diff --git a/Content/Maps/Main.umap b/Content/Maps/Main.umap index 6a5fd8c..674460f 100644 Binary files a/Content/Maps/Main.umap and b/Content/Maps/Main.umap differ diff --git a/Source/ToonTanks/BasePawn.h b/Source/ToonTanks/BasePawn.h index fa14567..9a208e1 100644 --- a/Source/ToonTanks/BasePawn.h +++ b/Source/ToonTanks/BasePawn.h @@ -51,8 +51,8 @@ private: USceneComponent* ProjectileSpawnPoint; //test uprops showing all that you can do with them - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Super Duper Variables", meta = (AllowPrivateAccess = "true")) - float Speed = 400.f; + /*UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Super Duper Variables", meta = (AllowPrivateAccess = "true")) + float Speed = 400.f;*/ UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Super Duper Variables", meta = (AllowPrivateAccess = "true")) int32 VisibleAnywhere = 12; diff --git a/Source/ToonTanks/Tank.cpp b/Source/ToonTanks/Tank.cpp index 159e8b4..9cf3bca 100644 --- a/Source/ToonTanks/Tank.cpp +++ b/Source/ToonTanks/Tank.cpp @@ -4,6 +4,7 @@ #include "Tank.h" #include "GameFramework/SpringArmComponent.h" #include "Camera/CameraComponent.h" +#include "Kismet/GameplayStatics.h" #include "Components/InputComponent.h" ATank::ATank() @@ -32,8 +33,9 @@ void ATank::Move(float Value) { //FVector DeltaLocation(0.f); //Same as line below FVector DeltaLocation = FVector::ZeroVector; - DeltaLocation.X = Value; - AddActorLocalOffset(DeltaLocation); + // X = Value * DeltaTime * Speed + DeltaLocation.X = Value * Speed * UGameplayStatics::GetWorldDeltaSeconds(this); + AddActorLocalOffset(DeltaLocation, true); //UE_LOG(LogTemp, Warning, TEXT("Value: %f"), Value); } diff --git a/Source/ToonTanks/Tank.h b/Source/ToonTanks/Tank.h index aeab67e..b15f317 100644 --- a/Source/ToonTanks/Tank.h +++ b/Source/ToonTanks/Tank.h @@ -27,6 +27,10 @@ private: UPROPERTY(VisibleAnywhere, Category = "Components") class UCameraComponent* Camera; - void Move(float Value); + UPROPERTY(EditAnywhere, Category = "Movement") + float Speed = 200.f; + + void Move(float Value); + void Turn(float TValue); };