diff --git a/BuildingEscape.code-workspace b/BuildingEscape.code-workspace new file mode 100644 index 0000000..8acc46e --- /dev/null +++ b/BuildingEscape.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "." + }, + { + "path": "D:\\Arbeit\\UE4\\UE_4.22" + } + ], + "settings": { + "typescript.tsc.autoDetect": "off" + } +} diff --git a/Content/Blueprints/DefaultPawn_BP.uasset b/Content/Blueprints/DefaultPawn_BP.uasset index 05b14e7..4ee3686 100644 Binary files a/Content/Blueprints/DefaultPawn_BP.uasset and b/Content/Blueprints/DefaultPawn_BP.uasset differ diff --git a/Content/Blueprints/FirstPersonCharacter.uasset b/Content/Blueprints/FirstPersonCharacter.uasset index 6b877e5..1f8fc21 100644 Binary files a/Content/Blueprints/FirstPersonCharacter.uasset and b/Content/Blueprints/FirstPersonCharacter.uasset differ diff --git a/Content/Blueprints/FirstPersonGameMode.uasset b/Content/Blueprints/FirstPersonGameMode.uasset index 3f85511..9c9409d 100644 Binary files a/Content/Blueprints/FirstPersonGameMode.uasset and b/Content/Blueprints/FirstPersonGameMode.uasset differ diff --git a/Content/Blueprints/FirstPersonHUD.uasset b/Content/Blueprints/FirstPersonHUD.uasset index 687b0c2..15a37a0 100644 Binary files a/Content/Blueprints/FirstPersonHUD.uasset and b/Content/Blueprints/FirstPersonHUD.uasset differ diff --git a/Content/Blueprints/KeyPad_Actor.uasset b/Content/Blueprints/KeyPad_Actor.uasset index 234fcc3..4ccde01 100644 Binary files a/Content/Blueprints/KeyPad_Actor.uasset and b/Content/Blueprints/KeyPad_Actor.uasset differ diff --git a/Content/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset b/Content/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset index 4587fcd..5193bdd 100644 Binary files a/Content/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset and b/Content/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset differ diff --git a/Content/Blueprints/Test_BP.uasset b/Content/Blueprints/Test_BP.uasset index 0f5606a..4a03738 100644 Binary files a/Content/Blueprints/Test_BP.uasset and b/Content/Blueprints/Test_BP.uasset differ diff --git a/Content/Bunker/Materials/M_warning_stripe_b.uasset b/Content/Bunker/Materials/M_warning_stripe_b.uasset index fd10ab8..9bec318 100644 Binary files a/Content/Bunker/Materials/M_warning_stripe_b.uasset and b/Content/Bunker/Materials/M_warning_stripe_b.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DefaultPawn_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DefaultPawn_BP.uasset new file mode 100644 index 0000000..9b95b8d Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DefaultPawn_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset new file mode 100644 index 0000000..f9ef74a Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/Elevator.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/Elevator.uasset new file mode 100644 index 0000000..33ec796 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/Elevator.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset new file mode 100644 index 0000000..e8b5dbb Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonGameMode.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonGameMode.uasset new file mode 100644 index 0000000..db61e4c Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonGameMode.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonHUD.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonHUD.uasset new file mode 100644 index 0000000..2ee3af3 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonHUD.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/KeyPad_Actor.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/KeyPad_Actor.uasset new file mode 100644 index 0000000..39d9881 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/KeyPad_Actor.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/LightSwitch_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/LightSwitch_BP.uasset new file mode 100644 index 0000000..ca1f7db Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/LightSwitch_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset new file mode 100644 index 0000000..e34d814 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/MyBuildingEscapeGameModeBase_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/Test_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/Test_BP.uasset new file mode 100644 index 0000000..d351669 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/Test_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/KeyPadButton_UI.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/KeyPadButton_UI.uasset new file mode 100644 index 0000000..c24537b Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/KeyPadButton_UI.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/KeyPad_UI.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/KeyPad_UI.uasset new file mode 100644 index 0000000..a6e971f Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/KeyPad_UI.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/Test_UI.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/Test_UI.uasset new file mode 100644 index 0000000..a663914 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/Test_UI.uasset differ diff --git a/Content/Levels/BuildingEscape.umap b/Content/Levels/BuildingEscape.umap index 90325bb..61b0614 100644 Binary files a/Content/Levels/BuildingEscape.umap and b/Content/Levels/BuildingEscape.umap differ diff --git a/Content/Levels/BuildingEscape_BuiltData.uasset b/Content/Levels/BuildingEscape_BuiltData.uasset index 00a7678..f104b99 100644 Binary files a/Content/Levels/BuildingEscape_BuiltData.uasset and b/Content/Levels/BuildingEscape_BuiltData.uasset differ diff --git a/Content/Levels/TestLevel.umap b/Content/Levels/TestLevel.umap index 92b2083..d598a37 100644 Binary files a/Content/Levels/TestLevel.umap and b/Content/Levels/TestLevel.umap differ diff --git a/Content/Levels/TestLevelForMechanics.umap b/Content/Levels/TestLevelForMechanics.umap new file mode 100644 index 0000000..8d94400 Binary files /dev/null and b/Content/Levels/TestLevelForMechanics.umap differ diff --git a/Content/Levels/TestLevelForMechanics_BuiltData.uasset b/Content/Levels/TestLevelForMechanics_BuiltData.uasset new file mode 100644 index 0000000..0e6a371 Binary files /dev/null and b/Content/Levels/TestLevelForMechanics_BuiltData.uasset differ diff --git a/Content/Levels/TestLevel_BuiltData.uasset b/Content/Levels/TestLevel_BuiltData.uasset index ac514f9..200c224 100644 Binary files a/Content/Levels/TestLevel_BuiltData.uasset and b/Content/Levels/TestLevel_BuiltData.uasset differ diff --git a/Content/Textures/Aerial_Asphalt.uasset b/Content/Textures/Aerial_Asphalt.uasset new file mode 100644 index 0000000..96060cc Binary files /dev/null and b/Content/Textures/Aerial_Asphalt.uasset differ diff --git a/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_ao_1k.uasset b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_ao_1k.uasset new file mode 100644 index 0000000..937595d Binary files /dev/null and b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_ao_1k.uasset differ diff --git a/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_diff_1k.uasset b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_diff_1k.uasset new file mode 100644 index 0000000..04b71aa Binary files /dev/null and b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_diff_1k.uasset differ diff --git a/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_disp_1k.uasset b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_disp_1k.uasset new file mode 100644 index 0000000..96b6129 Binary files /dev/null and b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_disp_1k.uasset differ diff --git a/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_nor_1k.uasset b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_nor_1k.uasset new file mode 100644 index 0000000..e567fe5 Binary files /dev/null and b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_nor_1k.uasset differ diff --git a/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_rough_1k.uasset b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_rough_1k.uasset new file mode 100644 index 0000000..caa8184 Binary files /dev/null and b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_rough_1k.uasset differ diff --git a/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_rough_ao_1k.uasset b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_rough_ao_1k.uasset new file mode 100644 index 0000000..5d93bd5 Binary files /dev/null and b/Content/Textures/Aerial_Asphalt/aerial_asphalt_01_rough_ao_1k.uasset differ diff --git a/Content/Textures/Asphalt.uasset b/Content/Textures/Asphalt.uasset new file mode 100644 index 0000000..514b6aa Binary files /dev/null and b/Content/Textures/Asphalt.uasset differ diff --git a/Content/Textures/Asphalt/asphalt_02_ao_1k.uasset b/Content/Textures/Asphalt/asphalt_02_ao_1k.uasset new file mode 100644 index 0000000..18ceb76 Binary files /dev/null and b/Content/Textures/Asphalt/asphalt_02_ao_1k.uasset differ diff --git a/Content/Textures/Asphalt/asphalt_02_diff_1k.uasset b/Content/Textures/Asphalt/asphalt_02_diff_1k.uasset new file mode 100644 index 0000000..976bc20 Binary files /dev/null and b/Content/Textures/Asphalt/asphalt_02_diff_1k.uasset differ diff --git a/Content/Textures/Asphalt/asphalt_02_disp_1k.uasset b/Content/Textures/Asphalt/asphalt_02_disp_1k.uasset new file mode 100644 index 0000000..f888455 Binary files /dev/null and b/Content/Textures/Asphalt/asphalt_02_disp_1k.uasset differ diff --git a/Content/Textures/Asphalt/asphalt_02_nor_1k.uasset b/Content/Textures/Asphalt/asphalt_02_nor_1k.uasset new file mode 100644 index 0000000..0ce7d88 Binary files /dev/null and b/Content/Textures/Asphalt/asphalt_02_nor_1k.uasset differ diff --git a/Content/Textures/Asphalt/asphalt_02_rough_1k.uasset b/Content/Textures/Asphalt/asphalt_02_rough_1k.uasset new file mode 100644 index 0000000..14f0325 Binary files /dev/null and b/Content/Textures/Asphalt/asphalt_02_rough_1k.uasset differ diff --git a/Content/Textures/Asphalt/asphalt_02_rough_ao_1k.uasset b/Content/Textures/Asphalt/asphalt_02_rough_ao_1k.uasset new file mode 100644 index 0000000..21c54c0 Binary files /dev/null and b/Content/Textures/Asphalt/asphalt_02_rough_ao_1k.uasset differ diff --git a/Content/Textures/BrownPlanks.uasset b/Content/Textures/BrownPlanks.uasset new file mode 100644 index 0000000..b37c68b Binary files /dev/null and b/Content/Textures/BrownPlanks.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_AO_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_AO_1k.uasset new file mode 100644 index 0000000..9b9a0c2 Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_AO_1k.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_Disp_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_Disp_1k.uasset new file mode 100644 index 0000000..976959b Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_Disp_1k.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_Nor_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_Nor_1k.uasset new file mode 100644 index 0000000..aec7da7 Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_Nor_1k.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_bump_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_bump_1k.uasset new file mode 100644 index 0000000..21877c3 Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_bump_1k.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_diff_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_diff_1k.uasset new file mode 100644 index 0000000..5be52e3 Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_diff_1k.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_rough_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_rough_1k.uasset new file mode 100644 index 0000000..efbd649 Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_rough_1k.uasset differ diff --git a/Content/Textures/BrownPlanks/brown_planks_03_spec_1k.uasset b/Content/Textures/BrownPlanks/brown_planks_03_spec_1k.uasset new file mode 100644 index 0000000..e2185d0 Binary files /dev/null and b/Content/Textures/BrownPlanks/brown_planks_03_spec_1k.uasset differ diff --git a/Content/Textures/FactoryBrick.uasset b/Content/Textures/FactoryBrick.uasset new file mode 100644 index 0000000..5ab0f87 Binary files /dev/null and b/Content/Textures/FactoryBrick.uasset differ diff --git a/Content/Textures/LargeRedBricks.uasset b/Content/Textures/LargeRedBricks.uasset new file mode 100644 index 0000000..7a7d80b Binary files /dev/null and b/Content/Textures/LargeRedBricks.uasset differ diff --git a/Content/Textures/MetalPlate.uasset b/Content/Textures/MetalPlate.uasset new file mode 100644 index 0000000..28914bc Binary files /dev/null and b/Content/Textures/MetalPlate.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_AO_1k.uasset b/Content/Textures/MetalPlate/metal_plate_AO_1k.uasset new file mode 100644 index 0000000..fa379a8 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_AO_1k.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_Nor_1k.uasset b/Content/Textures/MetalPlate/metal_plate_Nor_1k.uasset new file mode 100644 index 0000000..8ae6933 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_Nor_1k.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_bump_1k.uasset b/Content/Textures/MetalPlate/metal_plate_bump_1k.uasset new file mode 100644 index 0000000..a69b099 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_bump_1k.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_diff_1k.uasset b/Content/Textures/MetalPlate/metal_plate_diff_1k.uasset new file mode 100644 index 0000000..3798447 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_diff_1k.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_disp_1k.uasset b/Content/Textures/MetalPlate/metal_plate_disp_1k.uasset new file mode 100644 index 0000000..a388bc0 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_disp_1k.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_rough_1k.uasset b/Content/Textures/MetalPlate/metal_plate_rough_1k.uasset new file mode 100644 index 0000000..750a688 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_rough_1k.uasset differ diff --git a/Content/Textures/MetalPlate/metal_plate_spec_1k.uasset b/Content/Textures/MetalPlate/metal_plate_spec_1k.uasset new file mode 100644 index 0000000..b0d4cd6 Binary files /dev/null and b/Content/Textures/MetalPlate/metal_plate_spec_1k.uasset differ diff --git a/Content/Widgets/KeyPadButton_UI.uasset b/Content/Widgets/KeyPadButton_UI.uasset index ec0ccf8..99bf6b9 100644 Binary files a/Content/Widgets/KeyPadButton_UI.uasset and b/Content/Widgets/KeyPadButton_UI.uasset differ diff --git a/Content/Widgets/KeyPad_UI.uasset b/Content/Widgets/KeyPad_UI.uasset index 0b645ed..145668e 100644 Binary files a/Content/Widgets/KeyPad_UI.uasset and b/Content/Widgets/KeyPad_UI.uasset differ diff --git a/Content/Widgets/Test_UI.uasset b/Content/Widgets/Test_UI.uasset index b8b9112..738d83b 100644 Binary files a/Content/Widgets/Test_UI.uasset and b/Content/Widgets/Test_UI.uasset differ diff --git a/Source/BuildingEscape/Grabber.cpp b/Source/BuildingEscape/Grabber.cpp index 3c8d67a..222a041 100644 --- a/Source/BuildingEscape/Grabber.cpp +++ b/Source/BuildingEscape/Grabber.cpp @@ -89,6 +89,17 @@ void UGrabber::TickComponent(float DeltaTime, ELevelTick TickType, FActorCompone //move object we are holding PhysicsHandle->SetTargetLocation(GetLineTraceEnd()); } + + // DrawDebugLine( + // GetWorld(), + // GetPlayerWorldPosition(), + // GetLineTraceEnd(), + // FColor(0, 255 , 0), //red, green, blue, + // false, + // 0.f, + // 0, + // 5.f + // ); } FHitResult UGrabber::GetFirstPhysicsBodyInReach() const diff --git a/Source/BuildingEscape/OpenDoor.cpp b/Source/BuildingEscape/OpenDoor.cpp index 074357a..970a4e2 100644 --- a/Source/BuildingEscape/OpenDoor.cpp +++ b/Source/BuildingEscape/OpenDoor.cpp @@ -58,11 +58,12 @@ void UOpenDoor::TickComponent(float DeltaTime, ELevelTick TickType, FActorCompon // ... //if(PressurePlate->IsOverlappingActor(ActorThatOpens)) // kann nullpointer + UE4 crash geben //if(PressurePlate && PressurePlate->IsOverlappingActor(ActorThatOpens)) //prüft erst, ob es ein actor gibt - if(TotalMass() > MassToOpenDoor) + if(TotalMass() >= MassToOpenDoor) { + UE_LOG(LogTemp, Warning, TEXT("TEST OPEN DOOR")); OpenDoor(DeltaTime); //DoorLastOpened When the door was opened - DoorLastOpened = GetWorld()->GetTimeSeconds();; + DoorLastOpened = GetWorld()->GetTimeSeconds(); } else