diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0b420ee6433d9a9aca1618cc324b8250d7dc242..9a89d61f169a35a6b2864ab2d02f926b7f9538b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ Build_Windows: extends: .Build_Windows_ tags: - windows - - unreal-4.26 + - unreal-5.0 variables: GIT_STRATEGY: none GIT_CHECKOUT: "false" @@ -68,7 +68,7 @@ Build_CentOS: extends: .Build_CentOS_ tags: - centos - - unreal-4.26 + - unreal-5.0 variables: GIT_STRATEGY: none GIT_CHECKOUT: "false" diff --git a/Source/Calibratio/Public/CalibratioActor.h b/Source/Calibratio/Public/CalibratioActor.h index 774c413f0d1d5a7c1761a070df67f71a50327af7..c54de62331807dd0908c913912a4f0ad7b99c560 100644 --- a/Source/Calibratio/Public/CalibratioActor.h +++ b/Source/Calibratio/Public/CalibratioActor.h @@ -25,7 +25,7 @@ public: UPROPERTY(VisibleAnywhere) UStaticMeshComponent* Mesh; UPROPERTY(EditAnywhere) UMaterialInterface* BaseMaterial; UPROPERTY(BlueprintReadWrite) float Threshold = FMath::DegreesToRadians(1.7f); - UPROPERTY(BlueprintReadWrite) float ResetTime = 0.5f; + UPROPERTY(BlueprintReadWrite) float ResetTime = 1.5f; UFUNCTION(Blueprintcallable) void ClusterDespawn(); private: diff --git a/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp b/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp index 8c9df9f768ea38960025f18cf0723f5eab6cb568..4b32da4736f6a6e3ea7b9423fac8540926985126 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp @@ -119,7 +119,7 @@ void UVRPawnMovement::MoveByGravityOrStepUp(float DeltaSeconds) ShiftVertically(DistanceDifference, UpSteppingAcceleration, DeltaSeconds, 1); } //Gravity (only in Walk Mode) - else if (NavigationMode==EVRNavigationModes::NAV_WALK && ((HitDetailsMultiLineTrace.bBlockingHit && HitDetailsMultiLineTrace.Distance > MaxStepHeight) || (HitDetailsMultiLineTrace.Actor == nullptr && HitDetailsMultiLineTrace.Distance != -1.0f))) + else if (NavigationMode==EVRNavigationModes::NAV_WALK && ((HitDetailsMultiLineTrace.bBlockingHit && HitDetailsMultiLineTrace.Distance > MaxStepHeight) || (HitDetailsMultiLineTrace.GetActor() == nullptr && HitDetailsMultiLineTrace.Distance != -1.0f))) { ShiftVertically(DistanceDifference, GravityAcceleration, DeltaSeconds, -1); } @@ -182,8 +182,8 @@ FHitResult UVRPawnMovement::CreateMultiLineTrace(FVector Direction, const FVecto { FHitResult OutHit = CreateLineTrace(Direction, Vector, Visibility); OutHits.Add(OutHit); - IsBlockingHitAndSameActor &= (OutHit.Actor == OutHits[0].Actor); //If all Hiting the same Object, then you are (going up/down) or (walking) - IsAllNothingHiting &= (OutHit.Actor == nullptr); //If all Hiting nothing, then you are falling + IsBlockingHitAndSameActor &= (OutHit.GetActor() == OutHits[0].GetActor()); //If all Hiting the same Object, then you are (going up/down) or (walking) + IsAllNothingHiting &= (OutHit.GetActor() == nullptr); //If all Hiting nothing, then you are falling } if (IsBlockingHitAndSameActor || IsAllNothingHiting) diff --git a/Source/RWTHVRToolkit/Private/UI/ExternalImage.cpp b/Source/RWTHVRToolkit/Private/UI/ExternalImage.cpp index e2645115283ae959c92f9a4c65314f2732bac54a..07a57faa467f667e2e7dd9eec3bf1a52391f6909 100644 --- a/Source/RWTHVRToolkit/Private/UI/ExternalImage.cpp +++ b/Source/RWTHVRToolkit/Private/UI/ExternalImage.cpp @@ -65,9 +65,9 @@ bool UExternalImage::LoadCompressedDataIntoTexture2D(const TArray<uint8>& InComp OutTexture = UTexture2D::CreateTransient(ImageWrapper->GetWidth(), ImageWrapper->GetHeight(), PF_B8G8R8A8); if (OutTexture) { - void* TextureData = OutTexture->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE); + void* TextureData = OutTexture->GetPlatformData()->Mips[0].BulkData.Lock(LOCK_READ_WRITE); FMemory::Memcpy(TextureData, UncompressedRGBA.GetData(), UncompressedRGBA.Num()); - OutTexture->PlatformData->Mips[0].BulkData.Unlock(); + OutTexture->GetPlatformData()->Mips[0].BulkData.Unlock(); OutTexture->UpdateResource(); } return true; diff --git a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp index aab4fa3d7ef3b4d851a62185880d010bda1bb961..52befd74baee3922c37b906e6bd4b41346822fb2 100644 --- a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp +++ b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp @@ -85,7 +85,7 @@ bool UVirtualRealityUtilities::IsMaster() { return true; // if we are not in cluster mode, we are always the master } - return Manager->IsMaster() || !Manager->IsSlave(); + return Manager->IsPrimary() || !Manager->IsSecondary(); #else return true; #endif diff --git a/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs index e8bec94d7fd771b46b64e87bc6ed6a191d3bf4d6..7a3abd662bc3d1c68586b690556f8bec4a52384e 100644 --- a/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs +++ b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs @@ -26,7 +26,7 @@ public class RWTHVRToolkit : ModuleRules "Slate", "SlateCore", "DeveloperSettings", - "Http", + "HTTP", "LiveLink", "LiveLinkInterface" }