Studium
/
Produktion_Digitaler_Medien
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitea.joethei.xyz:Studium/Produktion_Digitaler_Medien

This commit is contained in:
Johannes Theiner 2020-10-27 13:51:41 +01:00
parent c31bf1ae1d 76408194ce
commit cd404f122d
Signed by: joethei
GPG Key ID: 9D2B9A00FDA85BCD
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BuildingEscape.code-workspace Normal file
View File

@ -0,0 +1,13 @@
{
"folders": [
{
"path": "."
},
{
"path": "D:\\Arbeit\\UE4\\UE_4.22"
}
],
"settings": {
"typescript.tsc.autoDetect": "off"
}
}

11
Source/BuildingEscape/Grabber.cpp
View File

@ -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

5
Source/BuildingEscape/OpenDoor.cpp
View File

@ -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