diff --git a/Content/Materials/Functions/MF_Body.uasset b/Content/Materials/Functions/MF_Body.uasset index 0bc5922..2064d45 100644 Binary files a/Content/Materials/Functions/MF_Body.uasset and b/Content/Materials/Functions/MF_Body.uasset differ diff --git a/Content/Materials/Functions/MF_PolishedMetal.uasset b/Content/Materials/Functions/MF_PolishedMetal.uasset index 91dda4e..d685e35 100644 Binary files a/Content/Materials/Functions/MF_PolishedMetal.uasset and b/Content/Materials/Functions/MF_PolishedMetal.uasset differ diff --git a/Content/Materials/Instances/MI_BlackMetalBox.uasset b/Content/Materials/Instances/MI_BlackMetalBox.uasset index 2f549ca..ad9a424 100644 Binary files a/Content/Materials/Instances/MI_BlackMetalBox.uasset and b/Content/Materials/Instances/MI_BlackMetalBox.uasset differ diff --git a/Content/Materials/Instances/MI_BlackMetalBoxBraker.uasset b/Content/Materials/Instances/MI_BlackMetalBoxBraker.uasset index d1571ce..9c33088 100644 Binary files a/Content/Materials/Instances/MI_BlackMetalBoxBraker.uasset and b/Content/Materials/Instances/MI_BlackMetalBoxBraker.uasset differ diff --git a/Content/Materials/Instances/MI_BlackMetalWeel.uasset b/Content/Materials/Instances/MI_BlackMetalWeel.uasset index 3eb8a2d..492ce23 100644 Binary files a/Content/Materials/Instances/MI_BlackMetalWeel.uasset and b/Content/Materials/Instances/MI_BlackMetalWeel.uasset differ diff --git a/Content/Materials/Instances/MI_GrayMetalWeel.uasset b/Content/Materials/Instances/MI_GrayMetalWeel.uasset index d00f0b1..bca49f2 100644 Binary files a/Content/Materials/Instances/MI_GrayMetalWeel.uasset and b/Content/Materials/Instances/MI_GrayMetalWeel.uasset differ diff --git a/Content/Materials/M_GrayMetalBox.uasset b/Content/Materials/M_GrayMetalBox.uasset index 49f6382..a7f1e36 100644 Binary files a/Content/Materials/M_GrayMetalBox.uasset and b/Content/Materials/M_GrayMetalBox.uasset differ diff --git a/Content/Materials/M_GrayMetalCistern.uasset b/Content/Materials/M_GrayMetalCistern.uasset index 997b76a..05bccf7 100644 Binary files a/Content/Materials/M_GrayMetalCistern.uasset and b/Content/Materials/M_GrayMetalCistern.uasset differ diff --git a/Content/Materials/M_GrayMetalGondola.uasset b/Content/Materials/M_GrayMetalGondola.uasset index bc0eb07..a497e49 100644 Binary files a/Content/Materials/M_GrayMetalGondola.uasset and b/Content/Materials/M_GrayMetalGondola.uasset differ diff --git a/Content/Materials/M_GrayMetalPlatform.uasset b/Content/Materials/M_GrayMetalPlatform.uasset index 93d7ddf..2d9905d 100644 Binary files a/Content/Materials/M_GrayMetalPlatform.uasset and b/Content/Materials/M_GrayMetalPlatform.uasset differ diff --git a/Content/Materials/M_MetalBox.uasset b/Content/Materials/M_MetalBox.uasset index 780af70..6e8ced1 100644 Binary files a/Content/Materials/M_MetalBox.uasset and b/Content/Materials/M_MetalBox.uasset differ diff --git a/Content/Materials/M_MetalCistern.uasset b/Content/Materials/M_MetalCistern.uasset index 9870873..ebb3ecb 100644 Binary files a/Content/Materials/M_MetalCistern.uasset and b/Content/Materials/M_MetalCistern.uasset differ diff --git a/Content/Materials/M_MetalCistern1.uasset b/Content/Materials/M_MetalCistern1.uasset index 64cc6b2..2be1202 100644 Binary files a/Content/Materials/M_MetalCistern1.uasset and b/Content/Materials/M_MetalCistern1.uasset differ diff --git a/Content/Materials/M_MetalGondola.uasset b/Content/Materials/M_MetalGondola.uasset index 0ab4c55..3028a8b 100644 Binary files a/Content/Materials/M_MetalGondola.uasset and b/Content/Materials/M_MetalGondola.uasset differ diff --git a/Content/Materials/M_MetalGondola1.uasset b/Content/Materials/M_MetalGondola1.uasset index 1757cef..5487057 100644 Binary files a/Content/Materials/M_MetalGondola1.uasset and b/Content/Materials/M_MetalGondola1.uasset differ diff --git a/Content/Materials/M_MetalPlatform.uasset b/Content/Materials/M_MetalPlatform.uasset index 1fc5aeb..98a9729 100644 Binary files a/Content/Materials/M_MetalPlatform.uasset and b/Content/Materials/M_MetalPlatform.uasset differ diff --git a/Content/Materials/M_MetalWeel_01.uasset b/Content/Materials/M_MetalWeel_01.uasset index 2a9944f..063159c 100644 Binary files a/Content/Materials/M_MetalWeel_01.uasset and b/Content/Materials/M_MetalWeel_01.uasset differ diff --git a/Content/Materials/M_PolishedMetal.uasset b/Content/Materials/M_PolishedMetal.uasset index 13cb224..0465910 100644 Binary files a/Content/Materials/M_PolishedMetal.uasset and b/Content/Materials/M_PolishedMetal.uasset differ diff --git a/Content/Materials/M_PolishedMetal_Inst.uasset b/Content/Materials/M_PolishedMetal_Inst.uasset new file mode 100644 index 0000000..530ebf1 Binary files /dev/null and b/Content/Materials/M_PolishedMetal_Inst.uasset differ diff --git a/Content/Materials/M_RooberBox.uasset b/Content/Materials/M_RooberBox.uasset index bc02207..304acde 100644 Binary files a/Content/Materials/M_RooberBox.uasset and b/Content/Materials/M_RooberBox.uasset differ diff --git a/Content/test/Levels/Main.umap b/Content/test/Levels/Main.umap index c9296a5..a6b4629 100644 Binary files a/Content/test/Levels/Main.umap and b/Content/test/Levels/Main.umap differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_Autocoupling.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_Autocoupling.uasset new file mode 100644 index 0000000..abb9d38 Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_Autocoupling.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_AutocouplingDefected.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_AutocouplingDefected.uasset new file mode 100644 index 0000000..95f9858 Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_AutocouplingDefected.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_BrakeBlock.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_BrakeBlock.uasset new file mode 100644 index 0000000..637df76 Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_BrakeBlock.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern.uasset new file mode 100644 index 0000000..ad94b30 Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern_Body.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern_Body.uasset new file mode 100644 index 0000000..40c9a4d Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern_Body.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern_BodyDefected.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern_BodyDefected.uasset new file mode 100644 index 0000000..dbc67f5 Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_RailwayCarriageCistern_BodyDefected.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_Spring.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_Spring.uasset new file mode 100644 index 0000000..13b5fdb Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_Spring.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_SpringDefected.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_SpringDefected.uasset new file mode 100644 index 0000000..6635f3c Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_SpringDefected.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_SwitcherVR.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_SwitcherVR.uasset new file mode 100644 index 0000000..9acc91c Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_SwitcherVR.uasset differ diff --git a/Content/test/Meshes/RailwayCarriageCistern/details/SM_SwitcherValve.uasset b/Content/test/Meshes/RailwayCarriageCistern/details/SM_SwitcherValve.uasset new file mode 100644 index 0000000..88ae7c7 Binary files /dev/null and b/Content/test/Meshes/RailwayCarriageCistern/details/SM_SwitcherValve.uasset differ diff --git a/Content/test/Meshes/RailwayWeels/SM_PassengerСar_Wheels.uasset b/Content/test/Meshes/RailwayWeels/SM_PassengerСar_Wheels.uasset index 5db29e2..a437109 100644 Binary files a/Content/test/Meshes/RailwayWeels/SM_PassengerСar_Wheels.uasset and b/Content/test/Meshes/RailwayWeels/SM_PassengerСar_Wheels.uasset differ diff --git a/Content/test/Meshes/test/PassengerСarCart_Defect.uasset b/Content/test/Meshes/details/passengers/cart/PassengerСarCart_Defect.uasset similarity index 99% rename from Content/test/Meshes/test/PassengerСarCart_Defect.uasset rename to Content/test/Meshes/details/passengers/cart/PassengerСarCart_Defect.uasset index c3c5aaf..6ab2bf4 100644 Binary files a/Content/test/Meshes/test/PassengerСarCart_Defect.uasset and b/Content/test/Meshes/details/passengers/cart/PassengerСarCart_Defect.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings.uasset index 97354d7..4904ac5 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings1.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings1.uasset index 1b2b4db..c7edb22 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings1.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings1.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings2.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings2.uasset index e6076da..4d4671a 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings2.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings2.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings3.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings3.uasset index 54fd609..9c757c2 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings3.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings3.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings4.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings4.uasset index 8e22df6..4661a1a 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings4.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartCenterSprings4.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings.uasset index 9fc1cee..94cbf12 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings1.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings1.uasset index 1dcfa03..8411924 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings1.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings1.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings2.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings2.uasset index d338d49..18269c3 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings2.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings2.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings3.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings3.uasset index 09f5e88..4b53347 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings3.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings3.uasset differ diff --git a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings4.uasset b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings4.uasset index f3472ad..92eb2a6 100644 Binary files a/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings4.uasset and b/Content/test/Meshes/details/passengers/springs/SM_PassengerСarCartSprings_SM_PassengerСarCartWeelsSprings4.uasset differ diff --git a/Source/railwayWorker/RailwayCarriage.cpp b/Source/railwayWorker/RailwayCarriage.cpp index b285c4c..bfaa1c1 100644 --- a/Source/railwayWorker/RailwayCarriage.cpp +++ b/Source/railwayWorker/RailwayCarriage.cpp @@ -27,6 +27,36 @@ ARailwayCarriage::ARailwayCarriage() wheel_3 = CreateDefaultSubobject(TEXT("wheel_3")); wheel_3->AttachTo(railwayBody); + cart_0 = CreateDefaultSubobject(TEXT("cart_0")); + cart_0->AttachTo(railwayBody); + cart_1 = CreateDefaultSubobject(TEXT("cart_1")); + cart_1->AttachTo(railwayBody); + + coupling_0 = CreateDefaultSubobject(TEXT("coupling_0")); + coupling_0->AttachTo(railwayBody); + coupling_1 = CreateDefaultSubobject(TEXT("coupling_1")); + coupling_1->AttachTo(railwayBody); + + cartCorp_0 = CreateDefaultSubobject(TEXT("cartCorp_0")); + cartCorp_0->AttachTo(wheel_0); + cartCorp_1 = CreateDefaultSubobject(TEXT("cartCorp_1")); + cartCorp_1->AttachTo(wheel_0); + cartCorp_2 = CreateDefaultSubobject(TEXT("cartCorp_2")); + cartCorp_2->AttachTo(wheel_1); + cartCorp_3 = CreateDefaultSubobject(TEXT("cartCorp_3")); + cartCorp_3->AttachTo(wheel_1); + + cartCorp_4 = CreateDefaultSubobject(TEXT("cartCorp_4")); + cartCorp_4->AttachTo(wheel_2); + cartCorp_5 = CreateDefaultSubobject(TEXT("cartCorp_5")); + cartCorp_5->AttachTo(wheel_2); + cartCorp_6 = CreateDefaultSubobject(TEXT("cartCorp_6")); + cartCorp_6->AttachTo(wheel_3); + cartCorp_7 = CreateDefaultSubobject(TEXT("cartCorp_7")); + cartCorp_7->AttachTo(wheel_3); + + + // support to focus component dotCoordinate_0 = CreateDefaultSubobject(TEXT("sphereForWheel1Focus")); dotCoordinate_0->AttachTo(railwayBody); diff --git a/Source/railwayWorker/RailwayCarriage.h b/Source/railwayWorker/RailwayCarriage.h index 62ab47e..3aa3d7b 100644 --- a/Source/railwayWorker/RailwayCarriage.h +++ b/Source/railwayWorker/RailwayCarriage.h @@ -37,6 +37,31 @@ protected: UStaticMeshComponent* wheel_2; UPROPERTY(EditAnyWhere, BlueprintReadWrite,Category = "Meshes") UStaticMeshComponent* wheel_3; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cart_0; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cart_1; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* coupling_0; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* coupling_1; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_0; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_1; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_2; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_3; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_4; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_5; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_6; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Meshes") + UStaticMeshComponent* cartCorp_7; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category ="Location") FVector oldLocation;