Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.4 preview #1

Open
wants to merge 28 commits into
base: Master
Choose a base branch
from
Open

5.4 preview #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d40cd12
initial compiling fixes
mordentral Mar 21, 2024
a3c58a5
multi branch fix for my grip script recent change
mordentral Mar 21, 2024
079c7a3
two more fixes
mordentral Mar 21, 2024
ece53ad
runs well
mordentral Mar 21, 2024
03c3011
Setting up for mover 2.0 experiments
Mar 21, 2024
b713d97
need these overrides or it crashes
Mar 21, 2024
b08c9ca
full conversion
Mar 22, 2024
1e47438
Starting in on Push Model conversion
Mar 22, 2024
9293d7c
Using built in value rounding to match packed vector sends
Mar 22, 2024
23b5b73
some of epics new mesh move preventions don't play well
Mar 22, 2024
baa9e18
these should be virtual still
mordentral Mar 23, 2024
417f74f
more unreachable code changes
mordentral Mar 23, 2024
3c1e607
hacky workaround
mordentral Mar 23, 2024
ca23dbe
Push model implemented for grippable actor
Mar 26, 2024
f67ec0c
forgot a compile time flag
Mar 26, 2024
d246d34
more push conversions
Mar 26, 2024
801433c
The big motion controller conversion + more
Mar 26, 2024
c60049f
Finished the push conversion
Mar 29, 2024
9b576bb
iris prep for when it works eventually
Mar 29, 2024
f6d8f29
change plugin version
mordentral Apr 9, 2024
4e88468
oops didn't mean to change that one
mordentral Apr 9, 2024
7bda72c
adding chaos physics scalers to constraint drive fill operations now
mordentral Apr 10, 2024
aba26a2
Add secondary teleport flag to client corrections
Apr 12, 2024
62632bb
Merge branch '5.4-Preview' of https://github.com/mordentral/VRExpansi…
Apr 12, 2024
0286c81
Merge pull request #50 from Stilton0502/Master
mordentral Apr 13, 2024
15d0735
remove bad copy
mordentral Apr 13, 2024
96004cb
correct possible NAN in slider progress
mordentral Apr 21, 2024
16534fb
new release 5.4 updates for physics replication
Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"FileVersion": 3,
"Version": 5.3,
"VersionName": "5.3",
"Version": 5.4,
"VersionName": "5.4",
"FriendlyName": "OpenXRExpansionPlugin",
"Description": "An set of utility functions for OpenXR",
"Category": "Virtual Reality",
Expand Down
4 changes: 3 additions & 1 deletion OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ public class OpenXRExpansionPlugin: ModuleRules
public OpenXRExpansionPlugin(ReadOnlyTargetRules Target)
: base(Target)
{
PublicDependencyModuleNames.AddRange(
SetupIrisSupport(Target);

PublicDependencyModuleNames.AddRange(
new string[]
{
//"InputDevice",
Expand Down
15 changes: 13 additions & 2 deletions OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "MotionControllerComponent.h"
#include "OpenXRExpansionFunctionLibrary.h"
#include "Engine/NetSerialization.h"
#include "Net/Core/PushModel/PushModel.h"

#include "XRMotionControllerBase.h" // for GetHandEnumForSourceName()
//#include "EngineMinimal.h"
Expand All @@ -29,9 +30,13 @@ void UOpenXRHandPoseComponent::GetLifetimeReplicatedProps(TArray< class FLifetim
{
Super::GetLifetimeReplicatedProps(OutLifetimeProps);

FDoRepLifetimeParams SkipOwnerParams;
SkipOwnerParams.Condition = COND_SkipOwner;
SkipOwnerParams.bIsPushBased = true;

// Skipping the owner with this as the owner will use the controllers location directly
DOREPLIFETIME_CONDITION(UOpenXRHandPoseComponent, LeftHandRep, COND_SkipOwner);
DOREPLIFETIME_CONDITION(UOpenXRHandPoseComponent, RightHandRep, COND_SkipOwner);
DOREPLIFETIME_WITH_PARAMS_FAST(UOpenXRHandPoseComponent, LeftHandRep, SkipOwnerParams);
DOREPLIFETIME_WITH_PARAMS_FAST(UOpenXRHandPoseComponent, RightHandRep, SkipOwnerParams);
}

void UOpenXRHandPoseComponent::Server_SendSkeletalTransforms_Implementation(const FBPXRSkeletalRepContainer& SkeletalInfo)
Expand All @@ -49,6 +54,9 @@ void UOpenXRHandPoseComponent::Server_SendSkeletalTransforms_Implementation(cons

FBPXRSkeletalRepContainer::CopyReplicatedTo(SkeletalInfo, HandSkeletalActions[i]);
LeftHandRep = SkeletalInfo;
#if WITH_PUSH_MODEL
MARK_PROPERTY_DIRTY_FROM_NAME(UOpenXRHandPoseComponent, LeftHandRep, this);
#endif

if (bSmoothReplicatedSkeletalData)
{
Expand All @@ -64,6 +72,9 @@ void UOpenXRHandPoseComponent::Server_SendSkeletalTransforms_Implementation(cons

FBPXRSkeletalRepContainer::CopyReplicatedTo(SkeletalInfo, HandSkeletalActions[i]);
RightHandRep = SkeletalInfo;
#if WITH_PUSH_MODEL
MARK_PROPERTY_DIRTY_FROM_NAME(UOpenXRHandPoseComponent, RightHandRep, this);
#endif

if (bSmoothReplicatedSkeletalData)
{
Expand Down
2 changes: 1 addition & 1 deletion VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void FSavedMove_VRBaseCharacter::SetInitialPosition(ACharacter* C)
// Instead, re-purpose it to be the capsule half height
if (AVRBaseCharacter* BaseChar = Cast<AVRBaseCharacter>(C))
{
if (BaseChar->VRReplicateCapsuleHeight)
if (BaseChar->GetVRReplicateCapsuleHeight())
CapsuleHeight = BaseChar->GetCapsuleComponent()->GetUnscaledCapsuleHalfHeight();
else
CapsuleHeight = 0.0f;
Expand Down
Loading