diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index d229202..3e825ff 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -1,5 +1,11 @@ [/Script/Engine.InputSettings] ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) ++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) @@ -64,12 +70,6 @@ +AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) +AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) -+AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False)) bAltEnterTogglesFullscreen=True bF11TogglesFullscreen=True bUseMouseForTouch=False diff --git a/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage.uasset b/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage.uasset index bef0d51..5f4f7b7 100644 Binary files a/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage.uasset and b/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage.uasset differ diff --git a/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage_Child.uasset b/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage_Child.uasset index 8a0e4b7..cc4dff9 100644 Binary files a/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage_Child.uasset and b/Content/Blueprints/RailwayCarriages/BP_Bace_RailwayCarriage_Child.uasset differ diff --git a/Content/Blueprints/RailwayCarriages/MyRailwayCarriage.uasset b/Content/Blueprints/RailwayCarriages/MyRailwayCarriage.uasset deleted file mode 100644 index 9b85681..0000000 Binary files a/Content/Blueprints/RailwayCarriages/MyRailwayCarriage.uasset and /dev/null differ diff --git a/Content/Blueprints/RailwayCarriages/RailwayCarriage.uasset b/Content/Blueprints/RailwayCarriages/RailwayCarriage.uasset new file mode 100644 index 0000000..2455a70 Binary files /dev/null and b/Content/Blueprints/RailwayCarriages/RailwayCarriage.uasset differ diff --git a/Content/Blueprints/player/player.uasset b/Content/Blueprints/player/player.uasset index d55b3bc..0cf40d7 100644 Binary files a/Content/Blueprints/player/player.uasset and b/Content/Blueprints/player/player.uasset differ diff --git a/Content/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset b/Content/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset index fe9a606..13f19f3 100644 Binary files a/Content/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset and b/Content/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset differ diff --git a/Content/Blueprints/spline/splineCameraIdelMovement.uasset b/Content/Blueprints/spline/splineCameraIdelMovement.uasset new file mode 100644 index 0000000..2354bad Binary files /dev/null and b/Content/Blueprints/spline/splineCameraIdelMovement.uasset differ diff --git a/Content/Levels/Main.umap b/Content/Levels/Main.umap index 2e9e19d..dd9c8ee 100644 Binary files a/Content/Levels/Main.umap and b/Content/Levels/Main.umap differ diff --git a/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_RailwayCarriage_01.uasset b/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_RailwayCarriage.uasset similarity index 99% rename from Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_RailwayCarriage_01.uasset rename to Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_RailwayCarriage.uasset index 0b954bd..ded6c56 100644 Binary files a/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_RailwayCarriage_01.uasset and b/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_RailwayCarriage.uasset differ diff --git a/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_Wheel.uasset b/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_Wheel.uasset new file mode 100644 index 0000000..1ae0392 Binary files /dev/null and b/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_Wheel.uasset differ diff --git a/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_Wheel_01.uasset b/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_Wheel_01.uasset deleted file mode 100644 index 90fc4c6..0000000 Binary files a/Content/Meshes/RailwayCarriage/SM_RailwayCarriage_SM_Wheel_01.uasset and /dev/null differ diff --git a/Content/Meshes/RailwayCarriage/materials/Brass_007.uasset b/Content/Meshes/RailwayCarriage/materials/Brass_007.uasset index c054c53..1774707 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Brass_007.uasset and b/Content/Meshes/RailwayCarriage/materials/Brass_007.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/M_Metal_Bolts_001.uasset b/Content/Meshes/RailwayCarriage/materials/M_Metal_Bolts_001.uasset index f49f6bc..96f1fd3 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/M_Metal_Bolts_001.uasset and b/Content/Meshes/RailwayCarriage/materials/M_Metal_Bolts_001.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/M_Metal_Korpus_001.uasset b/Content/Meshes/RailwayCarriage/materials/M_Metal_Korpus_001.uasset index 5b0cd74..5cf976b 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/M_Metal_Korpus_001.uasset and b/Content/Meshes/RailwayCarriage/materials/M_Metal_Korpus_001.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_001.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_001.uasset index 4ef53cc..dfa6394 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_001.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_001.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_002.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_002.uasset index 4ac5b36..9355f2a 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_002.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_002.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_003.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_003.uasset index cbccffb..21cef67 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_003.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_003.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_005.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_005.uasset index edd4077..7803f08 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_005.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_005.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_006.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_006.uasset index 29f651c..e9c4cb1 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_006.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_006.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_007.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_007.uasset index 98a0cc6..ff2ba7f 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_007.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_007.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_010.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_010.uasset index 3f8f8a3..5d64678 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_010.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_010.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_011.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_011.uasset index f5bb688..9c83b54 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_011.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_011.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_014.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_014.uasset index 6878425..0f49df7 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_014.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_014.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_015.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_015.uasset index 5bac114..e8300c1 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_015.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_015.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__2_027.uasset b/Content/Meshes/RailwayCarriage/materials/Material__2_027.uasset index 41d35fa..005a4c4 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__2_027.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__2_027.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Material__65_002.uasset b/Content/Meshes/RailwayCarriage/materials/Material__65_002.uasset index c18a2ac..39e77f3 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Material__65_002.uasset and b/Content/Meshes/RailwayCarriage/materials/Material__65_002.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/MetalRed_007.uasset b/Content/Meshes/RailwayCarriage/materials/MetalRed_007.uasset index c4ca043..000f5bc 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/MetalRed_007.uasset and b/Content/Meshes/RailwayCarriage/materials/MetalRed_007.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Rubber_003.uasset b/Content/Meshes/RailwayCarriage/materials/Rubber_003.uasset index 3be60c2..ad0c8ee 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Rubber_003.uasset and b/Content/Meshes/RailwayCarriage/materials/Rubber_003.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Steel_007.uasset b/Content/Meshes/RailwayCarriage/materials/Steel_007.uasset index 59fab3d..08587e8 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Steel_007.uasset and b/Content/Meshes/RailwayCarriage/materials/Steel_007.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/Steel_017.uasset b/Content/Meshes/RailwayCarriage/materials/Steel_017.uasset index ddf5124..a2938aa 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/Steel_017.uasset and b/Content/Meshes/RailwayCarriage/materials/Steel_017.uasset differ diff --git a/Content/Meshes/RailwayCarriage/materials/wire_000000000.uasset b/Content/Meshes/RailwayCarriage/materials/wire_000000000.uasset index 0ecb022..324e194 100644 Binary files a/Content/Meshes/RailwayCarriage/materials/wire_000000000.uasset and b/Content/Meshes/RailwayCarriage/materials/wire_000000000.uasset differ diff --git a/Content/UI/MAinMEnu/UI_MainMenu.uasset b/Content/UI/MAinMEnu/UI_MainMenu.uasset index 73e0d83..1bc02b1 100644 Binary files a/Content/UI/MAinMEnu/UI_MainMenu.uasset and b/Content/UI/MAinMEnu/UI_MainMenu.uasset differ diff --git a/Source/railwayWorker/RailwayCarriage.cpp b/Source/railwayWorker/RailwayCarriage.cpp index 315266c..78919f8 100644 --- a/Source/railwayWorker/RailwayCarriage.cpp +++ b/Source/railwayWorker/RailwayCarriage.cpp @@ -8,7 +8,7 @@ ARailwayCarriage::ARailwayCarriage() { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. - PrimaryActorTick.bCanEverTick = true; + //PrimaryActorTick.bCanEverTick = false; // root Root = CreateDefaultSubobject(TEXT("Root")); RootComponent = Root; @@ -16,6 +16,14 @@ ARailwayCarriage::ARailwayCarriage() // body mesh railway railwayBody = CreateDefaultSubobject(TEXT("railway")); railwayBody->AttachTo(Root); + wheel_0 = CreateDefaultSubobject(TEXT("wheel_0")); + wheel_0->AttachTo(railwayBody); + wheel_1 = CreateDefaultSubobject(TEXT("wheel_1")); + wheel_1->AttachTo(railwayBody); + wheel_2 = CreateDefaultSubobject(TEXT("wheel_2")); + wheel_2->AttachTo(railwayBody); + wheel_3 = CreateDefaultSubobject(TEXT("wheel_3")); + wheel_3->AttachTo(railwayBody); @@ -25,13 +33,14 @@ ARailwayCarriage::ARailwayCarriage() void ARailwayCarriage::BeginPlay() { Super::BeginPlay(); - -} + oldLocation = GetActorLocation(); +} +/* // Called every frame void ARailwayCarriage::Tick(float DeltaTime) { Super::Tick(DeltaTime); } - +*/ diff --git a/Source/railwayWorker/RailwayCarriage.h b/Source/railwayWorker/RailwayCarriage.h index 6834a9a..bd68d43 100644 --- a/Source/railwayWorker/RailwayCarriage.h +++ b/Source/railwayWorker/RailwayCarriage.h @@ -19,17 +19,29 @@ protected: // Called when the game starts or when spawned virtual void BeginPlay() override; //root component - UPROPERTY() + UPROPERTY(BlueprintReadWrite) USceneComponent* Root; // meshes - UPROPERTY(EditAnyWhere, Category = "Meshes") + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") UStaticMeshComponent* railwayBody; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* wheel_0; + UPROPERTY(EditAnyWhere, BlueprintReadWrite,Category = "Meshes") + UStaticMeshComponent* wheel_1; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* wheel_2; + UPROPERTY(EditAnyWhere, BlueprintReadWrite,Category = "Meshes") + UStaticMeshComponent* wheel_3; + + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category ="Location") + FVector oldLocation; + public: // Called every frame - virtual void Tick(float DeltaTime) override; + //virtual void Tick(float DeltaTime) override; };