remove ue 5.5+ code that causes build failure and cannot be wrapped inside if/def/end preprocessors due to lack of its support in uht
This commit is contained in:
@@ -177,7 +177,6 @@ public:
|
||||
bool IsGloveConnected() const;
|
||||
USGHapticGlove* GetConnectedGlove() const;
|
||||
|
||||
UE_DEPRECATED(5.5, "Deprecated by UE 5.5 in favor of GetMotionControllerState and GetHandTrackingState")
|
||||
bool GetMotionControllerData(FXRMotionControllerData& OutMotionControllerData);
|
||||
|
||||
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5
|
||||
|
||||
@@ -165,7 +165,6 @@ protected:
|
||||
FActorComponentTickFunction* ThisTickFunction);
|
||||
|
||||
public:
|
||||
UE_DEPRECATED(5.5, "Deprecated by UE 5.5 in favor of GetMotionControllerState and GetHandTrackingState")
|
||||
bool GetMotionControllerData(FXRMotionControllerData& OutMotionControllerData);
|
||||
|
||||
#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5
|
||||
|
||||
@@ -48,7 +48,6 @@ class UWorld;
|
||||
class SENSEGLOVEDEBUG_API FSGDebugVirtualHand final
|
||||
{
|
||||
public:
|
||||
UE_DEPRECATED(5.5, "Deprecated in favor of the variant that accepts FXRHandTrackingState")
|
||||
static void Draw(
|
||||
const UWorld* World,
|
||||
const FXRMotionControllerData& MotionControllerData,
|
||||
|
||||
-10
@@ -47,14 +47,4 @@ void USGDebugVirtualHandKismetLibrary::Draw_FXRMotionControllerData(
|
||||
PRAGMA_DISABLE_DEPRECATION_WARNINGS
|
||||
FSGDebugVirtualHand::Draw(WorldContextObject->GetWorld(), MotionControllerData, Settings);
|
||||
PRAGMA_ENABLE_DEPRECATION_WARNINGS
|
||||
}
|
||||
|
||||
void USGDebugVirtualHandKismetLibrary::Draw_FXRHandTrackingState(
|
||||
UObject* WorldContextObject,
|
||||
const FXRHandTrackingState& HandTrackingState,
|
||||
const FSGVirtualHandDebuggingSettings& Settings)
|
||||
{
|
||||
ensureAlwaysMsgf(WorldContextObject, TEXT("Invalid world context object!"));
|
||||
|
||||
FSGDebugVirtualHand::Draw(WorldContextObject->GetWorld(), HandTrackingState, Settings);
|
||||
}
|
||||
@@ -56,11 +56,4 @@ public:
|
||||
UObject* WorldContextObject,
|
||||
const FXRMotionControllerData& MotionControllerData,
|
||||
const FSGVirtualHandDebuggingSettings& Settings);
|
||||
|
||||
UFUNCTION(BlueprintCallable, DisplayName="Draw", Category="SenseGlove | Debug | Virtual Hand",
|
||||
meta=(WorldContext="WorldContextObject"))
|
||||
static void Draw_FXRHandTrackingState(
|
||||
UObject* WorldContextObject,
|
||||
const FXRHandTrackingState& HandTrackingState,
|
||||
const FSGVirtualHandDebuggingSettings& Settings);
|
||||
};
|
||||
@@ -118,20 +118,6 @@ bool UVirtualHandComponentKismetLibrary::GetMotionControllerData(
|
||||
PRAGMA_ENABLE_DEPRECATION_WARNINGS
|
||||
}
|
||||
|
||||
bool UVirtualHandComponentKismetLibrary::GetMotionControllerState(USGVirtualHandComponent* VirtualHandComponent,
|
||||
const EXRSpaceType XRSpaceType, const EXRControllerPoseType XRControllerPoseType,
|
||||
FXRMotionControllerState& OutMotionControllerState)
|
||||
{
|
||||
return VirtualHandComponent->GetMotionControllerState(
|
||||
XRSpaceType, XRControllerPoseType, OutMotionControllerState);
|
||||
}
|
||||
|
||||
bool UVirtualHandComponentKismetLibrary::GetHandTrackingState(USGVirtualHandComponent* VirtualHandComponent,
|
||||
const EXRSpaceType XRSpaceType, FXRHandTrackingState& OutHandTrackingState)
|
||||
{
|
||||
return VirtualHandComponent->GetHandTrackingState(XRSpaceType, OutHandTrackingState);
|
||||
}
|
||||
|
||||
const TArray<FName>& UVirtualHandComponentKismetLibrary::GetHandBoneNames(
|
||||
const USGVirtualHandComponent* VirtualHandComponent)
|
||||
{
|
||||
|
||||
@@ -96,21 +96,4 @@ bool UWristTrackerComponentKismetLibrary::GetMotionControllerData(
|
||||
PRAGMA_DISABLE_DEPRECATION_WARNINGS
|
||||
return WristTrackerComponent->GetMotionControllerData(OutMotionControllerData);
|
||||
PRAGMA_ENABLE_DEPRECATION_WARNINGS
|
||||
}
|
||||
|
||||
bool UWristTrackerComponentKismetLibrary::GetMotionControllerState(
|
||||
USGWristTrackerComponent* WristTrackerComponent,
|
||||
const EXRSpaceType XRSpaceType, const EXRControllerPoseType XRControllerPoseType,
|
||||
FXRMotionControllerState& OutMotionControllerState)
|
||||
{
|
||||
return WristTrackerComponent->GetMotionControllerState(
|
||||
XRSpaceType, XRControllerPoseType, OutMotionControllerState);
|
||||
}
|
||||
|
||||
bool UWristTrackerComponentKismetLibrary::GetHandTrackingState(
|
||||
USGWristTrackerComponent* WristTrackerComponent,
|
||||
const EXRSpaceType XRSpaceType, FXRHandTrackingState& OutHandTrackingState)
|
||||
{
|
||||
return WristTrackerComponent->GetHandTrackingState(
|
||||
XRSpaceType, OutHandTrackingState);
|
||||
}
|
||||
@@ -106,16 +106,6 @@ public:
|
||||
static bool GetMotionControllerData(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent,
|
||||
FXRMotionControllerData& OutMotionControllerData);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component")
|
||||
static bool GetMotionControllerState(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent,
|
||||
EXRSpaceType XRSpaceType, EXRControllerPoseType XRControllerPoseType,
|
||||
FXRMotionControllerState& OutMotionControllerState);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component")
|
||||
static bool GetHandTrackingState(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent,
|
||||
EXRSpaceType XRSpaceType,
|
||||
FXRHandTrackingState& OutHandTrackingState);
|
||||
|
||||
UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component")
|
||||
static const TArray<FName>& GetHandBoneNames(const USGVirtualHandComponent* VirtualHandComponent);
|
||||
|
||||
|
||||
@@ -86,14 +86,4 @@ public:
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
|
||||
static bool GetMotionControllerData(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
|
||||
FXRMotionControllerData& OutMotionControllerData);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
|
||||
static bool GetMotionControllerState(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
|
||||
EXRSpaceType XRSpaceType, EXRControllerPoseType XRControllerPoseType,
|
||||
FXRMotionControllerState& OutMotionControllerState);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
|
||||
static bool GetHandTrackingState(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
|
||||
EXRSpaceType XRSpaceType,
|
||||
FXRHandTrackingState& OutHandTrackingState);
|
||||
};
|
||||
@@ -55,7 +55,6 @@ class SENSEGLOVETRACKING_API FSGXRTracker final : public IOpenXRExtensionPlugin,
|
||||
public IHandTracker
|
||||
{
|
||||
public:
|
||||
UE_DEPRECATED(5.5, "Deprecated by UE 5.5 in favor of GetMotionControllerState and GetHandTrackingState")
|
||||
static bool GetMotionControllerData(
|
||||
UObject* WorldContextObject,
|
||||
EControllerHand Hand,
|
||||
|
||||
@@ -45,21 +45,4 @@ bool USGXRTrackerKismetLibrary::GetMotionControllerData(
|
||||
PRAGMA_DISABLE_DEPRECATION_WARNINGS
|
||||
return FSGXRTracker::GetMotionControllerData(WorldContextObject, Hand, OutMotionControllerData);
|
||||
PRAGMA_ENABLE_DEPRECATION_WARNINGS
|
||||
}
|
||||
|
||||
bool USGXRTrackerKismetLibrary::GetMotionControllerState(
|
||||
UObject* WorldContextObject,
|
||||
const EXRSpaceType XRSpaceType, const EControllerHand Hand, const EXRControllerPoseType XRControllerPoseType,
|
||||
FXRMotionControllerState& OutMotionControllerState)
|
||||
{
|
||||
return FSGXRTracker::GetMotionControllerState(
|
||||
WorldContextObject, XRSpaceType, Hand, XRControllerPoseType, OutMotionControllerState);
|
||||
}
|
||||
|
||||
bool USGXRTrackerKismetLibrary::GetHandTrackingState(
|
||||
UObject* WorldContextObject,
|
||||
const EXRSpaceType XRSpaceType, const EControllerHand Hand,
|
||||
FXRHandTrackingState& OutHandTrackingState)
|
||||
{
|
||||
return FSGXRTracker::GetHandTrackingState(WorldContextObject, XRSpaceType, Hand, OutHandTrackingState);
|
||||
}
|
||||
@@ -57,18 +57,4 @@ public:
|
||||
UObject* WorldContextObject,
|
||||
EControllerHand Hand,
|
||||
FXRMotionControllerData& OutMotionControllerData);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Tracking | XR Tracker",
|
||||
meta=(WorldContext="WorldContextObject"))
|
||||
static bool GetMotionControllerState(
|
||||
UObject* WorldContextObject,
|
||||
EXRSpaceType XRSpaceType, EControllerHand Hand, EXRControllerPoseType XRControllerPoseType,
|
||||
FXRMotionControllerState& OutMotionControllerState);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="SenseGlove | Tracking | XR Tracker",
|
||||
meta=(WorldContext="WorldContextObject"))
|
||||
static bool GetHandTrackingState(
|
||||
UObject* WorldContextObject,
|
||||
EXRSpaceType XRSpaceType, EControllerHand Hand,
|
||||
FXRHandTrackingState& OutHandTrackingState);
|
||||
};
|
||||
Reference in New Issue
Block a user