Revert "experiment with a hacky approach to make metaxr work"
This reverts commit f3bc6502e4.
This commit is contained in:
@@ -2153,26 +2153,10 @@ FName FSGXRTracker::FImpl::GetTargetOpenXRPositionalTrackingProviderName() const
|
|||||||
#endif /* PLATFORM_ANDROID */
|
#endif /* PLATFORM_ANDROID */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
const bool bIsAMetaQuestDevice = FSGHMDTracker::IsAMetaQuestDevice();
|
|
||||||
if (bIsAMetaQuestDevice)
|
|
||||||
{
|
|
||||||
const bool bIsMetaXRPluginLoaded = FSGPluginUtils::IsMetaXRPluginAvailable();
|
|
||||||
if (bIsMetaXRPluginLoaded)
|
|
||||||
{
|
|
||||||
PositionalTrackingProvider = ESGOpenXRPositionalTrackingProvider::OpenXRHandTracking;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
PositionalTrackingProvider = ESGOpenXRPositionalTrackingProvider::OpenXR;
|
PositionalTrackingProvider = ESGOpenXRPositionalTrackingProvider::OpenXR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
PositionalTrackingProvider = ESGOpenXRPositionalTrackingProvider::OpenXR;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const FName PositionalTrackingProviderName{
|
const FName PositionalTrackingProviderName{
|
||||||
GetOpenXRPositionalTrackingProviderEnumName(PositionalTrackingProvider)
|
GetOpenXRPositionalTrackingProviderEnumName(PositionalTrackingProvider)
|
||||||
@@ -2227,12 +2211,6 @@ bool FSGXRTracker::FImpl::GetControllerTransform(
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const FSGXRTracker* Self{StaticCast<const FSGXRTracker*>(MotionController)};
|
|
||||||
if (Self)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ETrackingStatus TrackingStatus = MotionController->GetControllerTrackingStatus(
|
const ETrackingStatus TrackingStatus = MotionController->GetControllerTrackingStatus(
|
||||||
DeviceIndex, PositionalTrackingHardwareMotionSource);
|
DeviceIndex, PositionalTrackingHardwareMotionSource);
|
||||||
if (TrackingStatus == ETrackingStatus::NotTracked)
|
if (TrackingStatus == ETrackingStatus::NotTracked)
|
||||||
|
|||||||
@@ -84,10 +84,6 @@ enum class ESGOpenXRPositionalTrackingProvider : uint8
|
|||||||
*/
|
*/
|
||||||
OpenXR UMETA(DisplayName = "OpenXR"),
|
OpenXR UMETA(DisplayName = "OpenXR"),
|
||||||
|
|
||||||
/**
|
|
||||||
*/
|
|
||||||
OpenXRHandTracking UMETA(DisplayName = "OpenXRHandTracking"),
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* OpenXRViveTracker:
|
* OpenXRViveTracker:
|
||||||
* - PCVR:
|
* - PCVR:
|
||||||
|
|||||||
Reference in New Issue
Block a user