diff --git a/CHANGELOG.md b/CHANGELOG.md index ac253fd7..084ac7a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ This is the second major release of the SenseGlove Unreal Engine Plugin adding s - A few critical bug fixes that have already been backported to the v1.x.x series through v1.9.3 to v1.9.8 releases. - Revamped the way we do FVector <-> SGVect3D, FQuat <-> SGQuat, and SenseGlove <-> Unreal Engine angles conversions in order to properly translate between the SenseGlove and Unreal Engine coordinate systems. +- Allow the C++ compiler the opportunity to perform RVO/NRVO if applicable. - Fix the modules' order inside the .uplugin file. - Fix changelog formatting. diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp index 625b869e..0ded475f 100644 --- a/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp @@ -423,8 +423,8 @@ const FTransform& USGVirtualHandComponent::GetFingerBoneRefTransform(const int32 FRotator USGVirtualHandComponent::GetFingerBoneRefRotation(const int32 Finger, const int32 Joint) const { const FTransform BoneTransform{GetFingerBoneRefTransform(Finger, Joint)}; - FRotator BoneRotation{BoneTransform.GetRotation().Rotator()}; - return MoveTemp(BoneRotation); + const FRotator BoneRotation{BoneTransform.GetRotation().Rotator()}; + return BoneRotation; } TMap USGVirtualHandComponent::GetFingersBonesRotations() @@ -433,13 +433,13 @@ TMap USGVirtualHandComponent::GetFingersBonesRotations() if (!IsGloveConnected()) { - return MoveTemp(Rotations); + return Rotations; } const USGHandPose* HandPose = GetHandPose(); if (!IsValid(HandPose)) { - return MoveTemp(Rotations); + return Rotations; } const TArray>& HandAngles{HandPose->GetHandAngles()}; @@ -463,7 +463,7 @@ TMap USGVirtualHandComponent::GetFingersBonesRotations() } } - return MoveTemp(Rotations); + return Rotations; } USGVirtualHandComponent::FImpl::FImpl(USGVirtualHandComponent* InOwner) @@ -497,7 +497,7 @@ FString USGVirtualHandComponent::FImpl::GetDefaultMeshPath() const SkeletalMeshPath = GetDefaultLeftHandMeshPath(); } - return MoveTemp(SkeletalMeshPath); + return SkeletalMeshPath; } bool USGVirtualHandComponent::FImpl::IsUsingDefaultMesh() const diff --git a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp index 4e5fc021..d0f4925b 100644 --- a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp +++ b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPlayerController.cpp @@ -208,7 +208,7 @@ TArray ASGPlayerController::FImpl::GetForceFeedbackLevels( const float RingForceFeedbackLevel = GetForceFeedbackLevel(ActorRingTouching); const float PinkyForceFeedbackLevel = GetForceFeedbackLevel(ActorPinkyTouching); - TArray ForceFeedbackLevels{ + const TArray ForceFeedbackLevels{ ThumbForceFeedbackLevel, IndexForceFeedbackLevel, MiddleForceFeedbackLevel, @@ -216,7 +216,7 @@ TArray ASGPlayerController::FImpl::GetForceFeedbackLevels( PinkyForceFeedbackLevel, }; - return MoveTemp(ForceFeedbackLevels); + return ForceFeedbackLevels; } TArray ASGPlayerController::FImpl::GetVibrotactileLevels( @@ -232,7 +232,7 @@ TArray ASGPlayerController::FImpl::GetVibrotactileLevels( const float RingVibrotactileLevel = GetVibrotactileLevel(ActorRingTouching); const float PinkyVibrotactileLevel = GetVibrotactileLevel(ActorPinkyTouching); - TArray ForceFeedbackLevels{ + const TArray ForceFeedbackLevels{ ThumbVibrotactileLevel, IndexVibrotactileLevel, MiddleVibrotactileLevel, @@ -240,7 +240,7 @@ TArray ASGPlayerController::FImpl::GetVibrotactileLevels( PinkyVibrotactileLevel, }; - return MoveTemp(ForceFeedbackLevels); + return ForceFeedbackLevels; } ASGPlayerController::ASGPlayerController(const FObjectInitializer& ObjectInitializer) diff --git a/Source/SenseGloveCore/Private/SGCore/SGAnatomy.cpp b/Source/SenseGloveCore/Private/SGCore/SGAnatomy.cpp index fec6b7e8..2512c7c4 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGAnatomy.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGAnatomy.cpp @@ -88,26 +88,26 @@ TArray> FSGAnatomy::GetDefaultHandAngles(const bool bRightHanded { FSGIC_TArray_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGAnatomyImpl_GetDefaultHandAngles(&OutAnglesContainer, bRightHanded); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray> FSGAnatomy::GetFlatHandAngles(const bool bRightHanded) { FSGIC_TArray_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGAnatomyImpl_GetFlatHandAngles(&OutAnglesContainer, bRightHanded); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray> FSGAnatomy::GetThumbsUpHandAngles(const bool bRightHanded) { FSGIC_TArray_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGAnatomyImpl_GetThumbsUpHandAngles(&OutAnglesContainer, bRightHanded); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray> FSGAnatomy::GetFistHandAngles(const bool bRightHanded) { FSGIC_TArray_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGAnatomyImpl_GetFistHandAngles(&OutAnglesContainer, bRightHanded); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp index eff9f3e1..dd005ad3 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp @@ -206,21 +206,21 @@ TArray> USGBasicHandModel::GetBaseFingerLengths() { FSGIC_TArray_TArray_float OutLengthsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetBaseFingerLengths(&OutLengthsContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } TArray USGBasicHandModel::GetBaseJointPositions() { FSGIC_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetBaseJointPositions(&OutPositionsContainer); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } TArray USGBasicHandModel::GetBaseJointAngles() { FSGIC_TArray_FVector OutRotationsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetBaseJointAngles(&OutRotationsContainer); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } USGBasicHandModel::USGBasicHandModel() @@ -361,7 +361,7 @@ TArray> USGBasicHandModel::GetFingerLengths() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_TArray_float OutLengthsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetFingerLengths(&InstanceContainer, &OutLengthsContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } TArray USGBasicHandModel::GetFingerLengths(const ESGFinger Finger) const @@ -371,7 +371,7 @@ TArray USGBasicHandModel::GetFingerLengths(const ESGFinger Finger) const FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_GetFingerLengths_Finger(&InstanceContainer, &OutLengthsContainer, &FingerContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } void USGBasicHandModel::SetFingerLengths(const ESGFinger Finger, const TArray& Lengths) @@ -395,7 +395,7 @@ TArray> USGBasicHandModel::GetFingerRatios() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_TArray_float OutRatiosContainer; SGCoreImpl_FSGBasicHandModelImpl_GetFingerRatios(&InstanceContainer, &OutRatiosContainer); - return MoveTemp(OutRatiosContainer.Array); + return OutRatiosContainer.Array; } TArray USGBasicHandModel::GetFingerRatios(const ESGFinger Finger) const @@ -405,7 +405,7 @@ TArray USGBasicHandModel::GetFingerRatios(const ESGFinger Finger) const FSGIC_TArray_float OutRatiosContainer; SGCoreImpl_FSGBasicHandModelImpl_GetFingerRatios_Finger(&InstanceContainer, &OutRatiosContainer, &FingerContainer); - return MoveTemp(OutRatiosContainer.Array); + return OutRatiosContainer.Array; } TArray USGBasicHandModel::GetStartJointPositions() const @@ -413,7 +413,7 @@ TArray USGBasicHandModel::GetStartJointPositions() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetStartJointPositions(&InstanceContainer, &OutPositionsContainer); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } void USGBasicHandModel::SetStartJointPosition(const ESGFinger Finger, const FVector& Position) @@ -437,7 +437,7 @@ TArray USGBasicHandModel::GetStartJointRotationsQ() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetStartJointRotations(&InstanceContainer, &OutRotationsContainer); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } TArray USGBasicHandModel::GetStartJointRotations() const @@ -454,7 +454,7 @@ FVector USGBasicHandModel::GetJointPosition(const ESGFinger Finger) const FSGIC_FVector OutPositionContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_GetJointPosition(&InstanceContainer, &OutPositionContainer, &FingerContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } void USGBasicHandModel::SetJointPosition(const FVector& NewPosition, const ESGFinger Finger) @@ -471,7 +471,7 @@ FQuat USGBasicHandModel::GetJointRotationQ(const ESGFinger Finger) const FSGIC_FQuat OutRotationContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_GetJointRotation(&InstanceContainer, &OutRotationContainer, &FingerContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator USGBasicHandModel::GetJointRotation(const ESGFinger Finger) const @@ -504,7 +504,7 @@ TArray USGBasicHandModel::GetTotalLengths() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_TArray_float OutLengthsContainer; SGCoreImpl_FSGBasicHandModelImpl_GetTotalLengths(&InstanceContainer, &OutLengthsContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } float USGBasicHandModel::GetTotalLength(const ESGFinger Finger) const @@ -521,7 +521,7 @@ TArray USGBasicHandModel::Get3DLengths(const ESGFinger Finger) const FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGBasicHandModelImpl_Get3DLengths(&InstanceContainer, &OutLengthsContainer, &FingerContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } bool USGBasicHandModel::Equals(const USGBasicHandModel* BasicHandModel) const @@ -536,7 +536,7 @@ FString USGBasicHandModel::ToString() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBasicHandModelImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGBasicHandModel::ToString(const bool bLengthsOnly) const @@ -544,7 +544,7 @@ FString USGBasicHandModel::ToString(const bool bLengthsOnly) const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBasicHandModelImpl_ToString_bLengthsOnly(&InstanceContainer, &OutStringContainer, bLengthsOnly); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGBasicHandModel::SGSerialize() const @@ -552,7 +552,7 @@ FString USGBasicHandModel::SGSerialize() const FSGIC_FSGBasicHandModelImpl InstanceContainer{ToBasicHandModelImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBasicHandModelImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGBasicHandModel::FImpl::FImpl(USGBasicHandModel* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp b/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp index 4d6a6a91..7be8add0 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGBetaDevice.cpp @@ -145,7 +145,7 @@ FString USGBetaDevice::GetDeviceId() const FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGBetaDeviceImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGBetaDevice::GetHardwareVersion() const @@ -173,7 +173,7 @@ FString USGBetaDevice::GetConstantsString() const FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBetaDeviceImpl_GetConstantsString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGBetaDevice::GetSensorData() const @@ -181,7 +181,7 @@ FString USGBetaDevice::GetSensorData() const FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutDataContainer; SGCoreImpl_FSGBetaDeviceImpl_GetSensorData(&InstanceContainer, &OutDataContainer); - return MoveTemp(OutDataContainer.String); + return OutDataContainer.String; } FString USGBetaDevice::GetLastCommand() const @@ -189,7 +189,7 @@ FString USGBetaDevice::GetLastCommand() const FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutCommandContainer; SGCoreImpl_FSGBetaDeviceImpl_GetLastCommand(&InstanceContainer, &OutCommandContainer); - return MoveTemp(OutCommandContainer.String); + return OutCommandContainer.String; } bool USGBetaDevice::SendHaptics(const FString& Command) const @@ -204,5 +204,5 @@ FString USGBetaDevice::ToString() const FSGIC_TSharedPtr_FSGBetaDeviceImpl InstanceContainer{ToBetaDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGBetaDeviceImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGCustomWaveform.cpp b/Source/SenseGloveCore/Private/SGCore/SGCustomWaveform.cpp index a695e531..ee1ffd33 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGCustomWaveform.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGCustomWaveform.cpp @@ -108,7 +108,7 @@ FString USGCustomWaveform::ToString(const ESGWaveformType Type) FSGIC_ESGWaveformType TypeContainer{Type}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGCustomWaveformImpl_ToString_Type(&OutStringContainer, &TypeContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGCustomWaveform::USGCustomWaveform() @@ -176,7 +176,7 @@ ESGWaveformType USGCustomWaveform::GetWaveType() const FSGIC_FSGCustomWaveformImpl InstanceContainer{ToCustomWaveformImpl()}; FSGIC_ESGWaveformType OutTypeContainer; SGCoreImpl_FSGCustomWaveformImpl_GetWaveType(&InstanceContainer, &OutTypeContainer); - return MoveTemp(OutTypeContainer.Type); + return OutTypeContainer.Type; } void USGCustomWaveform::SetWaveType(const ESGWaveformType Type) @@ -324,7 +324,7 @@ FString USGCustomWaveform::ToString() const FSGIC_FSGCustomWaveformImpl InstanceContainer{ToCustomWaveformImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGCustomWaveformImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGCustomWaveform::FImpl::FImpl(USGCustomWaveform* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp index ff3ab174..42de8b5c 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp @@ -122,7 +122,7 @@ FString USGDevice::ToString(const ESGDeviceType DeviceType) FSGIC_ESGDeviceType DeviceTypeContainer{DeviceType}; FSGIC_FString OutString; SGCoreImpl_FSGDeviceImpl_ToString(&DeviceTypeContainer, &OutString); - return MoveTemp(OutString.String); + return OutString.String; } USGDevice::USGDevice() @@ -419,7 +419,7 @@ FString USGDevice::GetFirmwareString() const FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGDeviceImpl_GetFirmwareString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } bool USGDevice::FirmwareNewerThan(int32 FirmwareMain, int32 FirmwareSub, bool bInclusive) const @@ -534,7 +534,7 @@ FString USGDevice::ToString() const FSGIC_TSharedPtr_FSGDeviceImpl InstanceContainer{ToSGDeviceImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGDeviceImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGDevice::FImpl::FImpl(USGDevice* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp index 1bf20a72..f3eadb08 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp @@ -101,7 +101,7 @@ TArray USGDeviceModel::ParseFunctions(const int32 Value, const int32 Size) { FSGIC_TArray_bool OutParseFunctionsContainer; SGCoreImpl_FSGDeviceModelImpl_ParseFunctions(&OutParseFunctionsContainer, Value, Size); - return MoveTemp(OutParseFunctionsContainer.Array); + return OutParseFunctionsContainer.Array; } void USGDeviceModel::ParseFirmware(const FString& RawFirmware, int32& OutMainVersion, int32& OutSubVersion) @@ -163,7 +163,7 @@ FString USGDeviceModel::GetDeviceId() const FSGIC_FSGDeviceModelImpl InstanceContainer{ToDeviceModelImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGDeviceModelImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGDeviceModel::GetHardwareVersion() const @@ -171,7 +171,7 @@ FString USGDeviceModel::GetHardwareVersion() const FSGIC_FSGDeviceModelImpl InstanceContainer{ToDeviceModelImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGDeviceModelImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGDeviceModel::GetFirmwareVersion() const diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp index 30299a1f..0930186f 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp @@ -188,7 +188,7 @@ TArray> USGHandInterpolator::InterpolateHandAngles( FSGIC_TArray_float AbductionsContainer{Abductions}; SGCoreImpl_FSGHandInterpolatorImpl_InterpolateHandAngles( &InstanceContainer, &OutAnglesContainer, &FlexionsContainer, &AbductionsContainer, CmcTwist); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } bool USGHandInterpolator::Equals(const USGHandInterpolator* HandInterpolator) const @@ -204,7 +204,7 @@ FString USGHandInterpolator::SGSerialize() const FSGIC_FSGHandInterpolatorImpl InstanceContainer{ToHandInterpolatorImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandInterpolatorImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGHandInterpolator::FImpl::FImpl(USGHandInterpolator* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandLayer.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandLayer.cpp index e5e45f5e..59982466 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandLayer.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandLayer.cpp @@ -92,7 +92,7 @@ FString FSGHandLayer::GetCalibrationInstructions(const bool bRightHanded) { FSGIC_FString CalibrationInstructionsContainer; SGCoreImpl_FSGHandLayerImpl_GetCalibrationInstructions(&CalibrationInstructionsContainer, bRightHanded); - return MoveTemp(CalibrationInstructionsContainer.String); + return CalibrationInstructionsContainer.String; } void FSGHandLayer::ResetCalibration(const bool bRightHanded) diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp index a4741771..ef7180bf 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp @@ -392,7 +392,7 @@ TArray> USGHandPose::GetJointPositions() const FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_TArray_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGHandPoseImpl_GetJointPositions(&InstanceContainer, &OutPositionsContainer); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } TArray> USGHandPose::GetJointRotationsQ() const @@ -400,7 +400,7 @@ TArray> USGHandPose::GetJointRotationsQ() const FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_TArray_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGHandPoseImpl_GetJointRotations(&InstanceContainer, &OutRotationsContainer); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } TArray> USGHandPose::GetJointRotations() const @@ -416,7 +416,7 @@ TArray> USGHandPose::GetHandAngles() const FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_TArray_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGHandPoseImpl_GetHandAngles(&InstanceContainer, &OutAnglesContainer); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } bool USGHandPose::Equals(const USGHandPose* HandPose) const @@ -439,7 +439,7 @@ TArray USGHandPose::GetNormalizedFlexion(const bool bClamp01) const FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_TArray_float OutFlexionContainer; SGCoreImpl_FSGHandPoseImpl_GetNormalizedFlexion_bClamp01(&InstanceContainer, &OutFlexionContainer, bClamp01); - return MoveTemp(OutFlexionContainer.Array); + return OutFlexionContainer.Array; } FString USGHandPose::ToString(const bool bShortFormat) const @@ -447,7 +447,7 @@ FString USGHandPose::ToString(const bool bShortFormat) const FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandPoseImpl_ToString(&InstanceContainer, &OutStringContainer, bShortFormat); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGHandPose::SGSerialize() const @@ -455,7 +455,7 @@ FString USGHandPose::SGSerialize() const FSGIC_FSGHandPoseImpl InstanceContainer{ToHandPoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHandPoseImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGHandPose::FImpl::FImpl(USGHandPose* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticChannelInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticChannelInfo.cpp index c415c6f9..127b5b61 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticChannelInfo.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticChannelInfo.cpp @@ -106,7 +106,7 @@ FString USGHapticChannelInfo::GenerateAddress(const int32 DeviceIndex, const int { FSGIC_FString OutStringContainer; SGCoreImpl_FSGHapticChannelInfoImpl_GenerateAddress(&OutStringContainer, DeviceIndex, ChannelIndex); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGHapticChannelInfo* USGHapticChannelInfo::Parse(UObject* Outer, const FString& IpcString) @@ -194,7 +194,7 @@ FString USGHapticChannelInfo::GetAddress_Unguarded(const ESGHapticChannelType Ty FSGIC_ESGHapticChannelType TypeContainer{Type}; SGCoreImpl_FSGHapticChannelInfoImpl_GetAddress_Unguarded( &InstanceContainer, &OutStringContainer, &TypeContainer, TypeIndex); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } void USGHapticChannelInfo::GetIpcParams_Unguarded( @@ -220,7 +220,7 @@ TArray USGHapticChannelInfo::GetAllAddresses() const FSGIC_FSGHapticChannelInfoImpl InstanceContainer{ToHapticChannelInfoImpl()}; FSGIC_TArray_FString* OutArrayContainer; SGCoreImpl_FSGHapticChannelInfoImpl_GetAllAddresses(&InstanceContainer, &OutArrayContainer); - return MoveTemp(OutArrayContainer->Array); + return OutArrayContainer->Array; } USGHapticChannelInfo::FImpl::FImpl(USGHapticChannelInfo* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp index 0ff50447..d3255231 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGlove.cpp @@ -126,7 +126,7 @@ FString USGHapticGlove::ToString(const ESGHapticGloveCalibrationState State) FSGIC_ESGHapticGloveCalibrationState StateContainer{State}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHapticGloveImpl_ToString_State(&StateContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGHapticGlove::ToString(const ESGHapticLocation Location) @@ -134,7 +134,7 @@ FString USGHapticGlove::ToString(const ESGHapticLocation Location) FSGIC_ESGHapticLocation LocationContainer{Location}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHapticGloveImpl_ToString_Location(&LocationContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGHapticGlove::USGHapticGlove() @@ -216,7 +216,7 @@ FString USGHapticGlove::GetDeviceId() const FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGHapticGloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGHapticGlove::GetHardwareVersion() const @@ -224,7 +224,7 @@ FString USGHapticGlove::GetHardwareVersion() const FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGHapticGloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGHapticGlove::GetFirmwareVersion() const @@ -360,7 +360,7 @@ FString USGHapticGlove::GetCalibrationInstruction() const FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHapticGloveImpl_GetCalibrationInstruction(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } void USGHapticGlove::StopHaptics() @@ -511,5 +511,5 @@ FString USGHapticGlove::ToString() const FSGIC_TSharedPtr_FSGHapticGloveImpl InstanceContainer{ToHapticGloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGHapticGloveImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp index 70ad42bb..8eba5a2f 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp @@ -256,7 +256,7 @@ FString USGInterpolationSet::ToString() const FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGInterpolationSetImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGInterpolationSet::ToString(const bool bLimits) const @@ -264,7 +264,7 @@ FString USGInterpolationSet::ToString(const bool bLimits) const FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGInterpolationSetImpl_ToString_bLimits(&InstanceContainer, &OutStringContainer, bLimits); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGInterpolationSet::SGSerialize() const @@ -272,7 +272,7 @@ FString USGInterpolationSet::SGSerialize() const FSGIC_FSGInterpolationSetImpl InstanceContainer{ToInterpolationSetImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGInterpolationSetImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGInterpolationSet::FImpl::FImpl(USGInterpolationSet* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGNova2Glove.cpp b/Source/SenseGloveCore/Private/SGCore/SGNova2Glove.cpp index 5aa4ee6d..14e7b1b5 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNova2Glove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNova2Glove.cpp @@ -121,7 +121,7 @@ TArray USGNova2Glove::GetNova2Gloves(UObject* Outer) USGNova2Glove* Nova2Glove = USGNova2Glove::NewNova2Glove(Outer, Nova2GloveImpl); Gloves.Add(Nova2Glove); } - return MoveTemp(Gloves); + return Gloves; } bool USGNova2Glove::GetNova2Glove(UObject* Outer, USGNova2Glove*& OutGlove) @@ -244,7 +244,7 @@ TArray USGNova2Glove::GetNova2SensorRanges() { FSGIC_TArray_float OutNova2SensorRangesContainer; SGCoreImpl_FSGNova2GloveImpl_GetNova2SensorRanges(&OutNova2SensorRangesContainer); - return MoveTemp(OutNova2SensorRangesContainer.Array); + return OutNova2SensorRangesContainer.Array; } TArray USGNova2Glove::ToNormalizedValues(const USGNova2GloveSensorData* SensorData) @@ -253,7 +253,7 @@ TArray USGNova2Glove::ToNormalizedValues(const USGNova2GloveSensorData* S FSGIC_FSGNova2GloveSensorDataImpl SensorDataContainer{SensorData->ToNova2GloveSensorDataImpl()}; SGCoreImpl_FSGNova2GloveImpl_ToNormalizedValues_SensorData( &OutNormalizedValuesContainer, &SensorDataContainer); - return MoveTemp(OutNormalizedValuesContainer.Array); + return OutNormalizedValuesContainer.Array; } TArray USGNova2Glove::ToNormalizedValues( @@ -268,7 +268,7 @@ TArray USGNova2Glove::ToNormalizedValues( OutSensorNormalizer = USGSensorNormalization::NewSensorNormalization( Outer, MoveTemp(OutSensorNormalizerContainer.SensorNormalizationImpl)); - return MoveTemp(OutNormalizedValuesContainer.Array); + return OutNormalizedValuesContainer.Array; } TArray> USGNova2Glove::CalculateHandAngles( @@ -279,7 +279,7 @@ TArray> USGNova2Glove::CalculateHandAngles( FSGIC_FSGHandInterpolatorImpl InterpolatorContainer{Interpolator->ToHandInterpolatorImpl()}; SGCoreImpl_FSGNova2GloveImpl_CalculateHandAngles( &OutHandAnglesContainer, &NormalizedValuesContainer, &InterpolatorContainer, bInfluenceIndex); - return MoveTemp(OutHandAnglesContainer.Array); + return OutHandAnglesContainer.Array; } TArray> USGNova2Glove::ToNormalizedAngles( @@ -290,7 +290,7 @@ TArray> USGNova2Glove::ToNormalizedAngles( FSGIC_FSGNovaGloveInfoImpl GloveInfoContainer{GloveInfo->ToNovaGloveInfoImpl()}; SGCoreImpl_FSGNova2GloveImpl_ToNormalizedAngles( &OutHandAnglesContainer, &NormalizedDataContainer, &GloveInfoContainer); - return MoveTemp(OutHandAnglesContainer.Array); + return OutHandAnglesContainer.Array; } USGNova2Glove::USGNova2Glove() @@ -362,7 +362,7 @@ FString USGNova2Glove::GetDeviceId() const FSGIC_TSharedPtr_FSGNova2GloveImpl InstanceContainer{ToNova2GloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGNova2GloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGNova2Glove::GetHardwareVersion() const @@ -370,7 +370,7 @@ FString USGNova2Glove::GetHardwareVersion() const FSGIC_TSharedPtr_FSGNova2GloveImpl InstanceContainer{ToNova2GloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGNova2GloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGNova2Glove::GetFirmwareVersion() const @@ -471,7 +471,7 @@ ESGHapticGloveCalibrationState USGNova2Glove::GetCalibrationState() const FSGIC_TSharedPtr_FSGNova2GloveImpl InstanceContainer{ToNova2GloveImpl()}; FSGIC_ESGHapticGloveCalibrationState OutHapticGloveCalibrationStateContainer; SGCoreImpl_FSGNova2GloveImpl_GetCalibrationState(&InstanceContainer, &OutHapticGloveCalibrationStateContainer); - return MoveTemp(OutHapticGloveCalibrationStateContainer.State); + return OutHapticGloveCalibrationStateContainer.State; } void USGNova2Glove::EndCalibration() @@ -738,5 +738,5 @@ FString USGNova2Glove::ToString() const FSGIC_TSharedPtr_FSGNova2GloveImpl InstanceContainer{ToNova2GloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNova2GloveImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String);; + return OutStringContainer.String;; } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGNova2GloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGNova2GloveSensorData.cpp index 7ce9af9f..b72e8427 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNova2GloveSensorData.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNova2GloveSensorData.cpp @@ -297,7 +297,7 @@ TArray> USGNova2GloveSensorData::GetSensorValues() const FSGIC_FSGNova2GloveSensorDataImpl InstanceContainer{ToNova2GloveSensorDataImpl()}; FSGIC_TArray_TArray_FVector OutValuesContainer; SGCoreImpl_FSGNova2GloveSensorDataImpl_GetSensorValues(&InstanceContainer, &OutValuesContainer); - return MoveTemp(OutValuesContainer.Array); + return OutValuesContainer.Array; } float USGNova2GloveSensorData::GetSensorValue(const ESGFinger Finger, const ESGNova2SensorLocation Location) const @@ -320,7 +320,7 @@ FQuat USGNova2GloveSensorData::GetImuRotationQ() const FSGIC_FSGNova2GloveSensorDataImpl InstanceContainer{ToNova2GloveSensorDataImpl()}; FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGNova2GloveSensorDataImpl_GetImuRotation(&InstanceContainer, &OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator USGNova2GloveSensorData::GetImuRotation() const @@ -361,7 +361,7 @@ FString USGNova2GloveSensorData::ToString() const FSGIC_FSGNova2GloveSensorDataImpl InstanceContainer{ToNova2GloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNova2GloveSensorDataImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGNova2GloveSensorData::FImpl::FImpl(USGNova2GloveSensorData* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp index 9309525d..389e631a 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGlove.cpp @@ -121,7 +121,7 @@ TArray USGNovaGlove::GetNovaGloves(UObject* Outer) USGNovaGlove* NovaGlove = USGNovaGlove::NewNovaGlove(Outer, NovaGloveImpl); Gloves.Add(NovaGlove); } - return MoveTemp(Gloves); + return Gloves; } bool USGNovaGlove::GetNovaGlove(UObject* Outer, USGNovaGlove*& OutGlove) @@ -250,7 +250,7 @@ TArray USGNovaGlove::GetNovaSensorRanges() { FSGIC_TArray_float OutNovaSensorRangesContainer; SGCoreImpl_FSGNovaGloveImpl_GetNovaSensorRanges(&OutNovaSensorRangesContainer); - return MoveTemp(OutNovaSensorRangesContainer.Array); + return OutNovaSensorRangesContainer.Array; } TArray USGNovaGlove::ToNormalizedValues(const USGNovaGloveSensorData* SensorData) @@ -259,7 +259,7 @@ TArray USGNovaGlove::ToNormalizedValues(const USGNovaGloveSensorData* Sen FSGIC_FSGNovaGloveSensorDataImpl SensorDataContainer{SensorData->ToNovaGloveSensorDataImpl()}; SGCoreImpl_FSGNovaGloveImpl_ToNormalizedValues_SensorData( &OutNormalizedValuesContainer, &SensorDataContainer); - return MoveTemp(OutNormalizedValuesContainer.Array); + return OutNormalizedValuesContainer.Array; } TArray USGNovaGlove::ToNormalizedValues( @@ -274,7 +274,7 @@ TArray USGNovaGlove::ToNormalizedValues( OutSensorNormalizer = USGSensorNormalization::NewSensorNormalization( Outer, MoveTemp(OutSensorNormalizerContainer.SensorNormalizationImpl)); - return MoveTemp(OutNormalizedValuesContainer.Array); + return OutNormalizedValuesContainer.Array; } TArray> USGNovaGlove::CalculateHandAngles( @@ -285,7 +285,7 @@ TArray> USGNovaGlove::CalculateHandAngles( FSGIC_FSGHandInterpolatorImpl InterpolatorContainer{Interpolator->ToHandInterpolatorImpl()}; SGCoreImpl_FSGNovaGloveImpl_CalculateHandAngles( &OutHandAnglesContainer, &NormalizedValuesContainer, &InterpolatorContainer); - return MoveTemp(OutHandAnglesContainer.Array); + return OutHandAnglesContainer.Array; } FString USGNovaGlove::ToNovaCommandAsFlexion(const USGThresholdCommand* Thresholds) @@ -293,7 +293,7 @@ FString USGNovaGlove::ToNovaCommandAsFlexion(const USGThresholdCommand* Threshol FSGIC_FString OutStringContainer; FSGIC_FSGThresholdCommandImpl ThresholdsContainer{Thresholds->ToThresholdCommandImpl()}; SGCoreImpl_FSGNovaGloveImpl_ToNovaCommandAsFlexion(&OutStringContainer, &ThresholdsContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGNovaGlove::ToNovaCommandAsRaw( @@ -304,7 +304,7 @@ FString USGNovaGlove::ToNovaCommandAsRaw( FSGIC_FSGSensorNormalizationImpl InterpolatorContainer{Interpolator->ToSensorNormalizationImpl()}; SGCoreImpl_FSGNovaGloveImpl_ToNovaCommandAsRaw( &OutStringContainer, &ThresholdsContainer, &InterpolatorContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGNovaGlove::USGNovaGlove() @@ -376,7 +376,7 @@ FString USGNovaGlove::GetDeviceId() const FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGNovaGloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGNovaGlove::GetHardwareVersion() const @@ -384,7 +384,7 @@ FString USGNovaGlove::GetHardwareVersion() const FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGNovaGloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGNovaGlove::GetFirmwareVersion() const @@ -491,7 +491,7 @@ ESGHapticGloveCalibrationState USGNovaGlove::GetCalibrationState() const FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_ESGHapticGloveCalibrationState OutHapticGloveCalibrationStateContainer; SGCoreImpl_FSGNovaGloveImpl_GetCalibrationState(&InstanceContainer, &OutHapticGloveCalibrationStateContainer); - return MoveTemp(OutHapticGloveCalibrationStateContainer.State); + return OutHapticGloveCalibrationStateContainer.State; } void USGNovaGlove::EndCalibration() @@ -711,7 +711,7 @@ FString USGNovaGlove::ToNovaCommand( FSGIC_TArray_float BuzzLevelsContainer{BuzzLevels}; SGCoreImpl_FSGNovaGloveImpl_ToNovaCommand(&InstanceContainer, &OutStringContainer, &ForceFeedbackLevelsContainer, &BuzzLevelsContainer, WristLevel); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } bool USGNovaGlove::QueueVibroLevel(const int32 Finger, const float Amplitude) @@ -777,5 +777,5 @@ FString USGNovaGlove::ToString() const FSGIC_TSharedPtr_FSGNovaGloveImpl InstanceContainer{ToNovaGloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String);; + return OutStringContainer.String;; } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp index abba220c..b8eddfdc 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp @@ -182,7 +182,7 @@ FString USGNovaGloveInfo::GetDeviceId() const FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGNovaGloveInfoImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGNovaGloveInfo::GetHardwareVersion() const @@ -190,7 +190,7 @@ FString USGNovaGloveInfo::GetHardwareVersion() const FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGNovaGloveInfoImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGNovaGloveInfo::GetFirmwareVersion() const @@ -216,7 +216,7 @@ FQuat USGNovaGloveInfo::GetImuCorrectionQ() const FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FQuat OutCorrectionContainer; SGCoreImpl_FSGNovaGloveInfoImpl_GetImuCorrection(&InstanceContainer, &OutCorrectionContainer); - return MoveTemp(OutCorrectionContainer.Quat); + return OutCorrectionContainer.Quat; } FRotator USGNovaGloveInfo::GetImuCorrection() const @@ -261,7 +261,7 @@ FString USGNovaGloveInfo::ToString() const FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveInfoImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGNovaGloveInfo::SGSerialize() const @@ -269,7 +269,7 @@ FString USGNovaGloveInfo::SGSerialize() const FSGIC_FSGNovaGloveInfoImpl InstanceContainer{ToNovaGloveInfoImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveInfoImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGNovaGloveInfo::FImpl::FImpl(USGNovaGloveInfo* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp index 638d83c9..61e4d4ee 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp @@ -213,7 +213,7 @@ TArray USGNovaGloveSensorData::GetSensorValues() const FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_TArray_FVector OutValuesContainer; SGCoreImpl_FSGNovaGloveSensorDataImpl_GetSensorValues(&InstanceContainer, &OutValuesContainer); - return MoveTemp(OutValuesContainer.Array); + return OutValuesContainer.Array; } float USGNovaGloveSensorData::GetSensorValue(const ESGFinger Finger, const ESGNovaSensorLocation Location) const @@ -236,7 +236,7 @@ FQuat USGNovaGloveSensorData::GetImuRotationQ() const FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGNovaGloveSensorDataImpl_GetImuRotation(&InstanceContainer, &OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator USGNovaGloveSensorData::GetImuRotation() const @@ -277,7 +277,7 @@ FString USGNovaGloveSensorData::ToString() const FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveSensorDataImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGNovaGloveSensorData::SGSerialize() const @@ -285,7 +285,7 @@ FString USGNovaGloveSensorData::SGSerialize() const FSGIC_FSGNovaGloveSensorDataImpl InstanceContainer{ToNovaGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGNovaGloveSensorDataImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGNovaGloveSensorData::FImpl::FImpl(USGNovaGloveSensorData* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp index 12f0aa89..e39f6e37 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGlove.cpp @@ -120,7 +120,7 @@ TArray USGSenseGlove::GetSenseGloves(UObject* Outer) USGSenseGlove* SenseGlove = USGSenseGlove::NewSenseGlove(Outer, SenseGloveImpl); Gloves.Add(SenseGlove); } - return MoveTemp(Gloves); + return Gloves; } bool USGSenseGlove::GetSenseGlove(UObject* Outer, USGSenseGlove*& OutGlove) @@ -262,7 +262,7 @@ FVector USGSenseGlove::GetDefaultThimbleOffset() { FSGIC_FVector OutOffsetContainer; SGCoreImpl_FSGSenseGloveImpl_GetDefaultThimbleOffset(&OutOffsetContainer); - return MoveTemp(OutOffsetContainer.Vector); + return OutOffsetContainer.Vector; } USGSenseGlovePose* USGSenseGlove::CalculateGlovePose(UObject* Outer, @@ -401,7 +401,7 @@ FString USGSenseGlove::GetDeviceId() const FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGSenseGloveImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGSenseGlove::GetHardwareVersion() const @@ -409,7 +409,7 @@ FString USGSenseGlove::GetHardwareVersion() const FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGSenseGloveImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGSenseGlove::GetFirmwareVersion() const @@ -488,7 +488,7 @@ ESGHapticGloveCalibrationState USGSenseGlove::GetCalibrationState() const FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_ESGHapticGloveCalibrationState OutHapticGloveCalibrationStateContainer; SGCoreImpl_FSGSenseGloveImpl_GetCalibrationState(&InstanceContainer, &OutHapticGloveCalibrationStateContainer); - return MoveTemp(OutHapticGloveCalibrationStateContainer.State); + return OutHapticGloveCalibrationStateContainer.State; } void USGSenseGlove::EndCalibration() @@ -739,7 +739,7 @@ TArray USGSenseGlove::GetFingerThimbleOffsets() const FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_TArray_FVector OutFingerThimbleOffsetsContainer; SGCoreImpl_FSGSenseGloveImpl_GetFingerThimbleOffsets(&InstanceContainer, &OutFingerThimbleOffsetsContainer); - return MoveTemp(OutFingerThimbleOffsetsContainer.Array); + return OutFingerThimbleOffsetsContainer.Array; } void USGSenseGlove::SetFingerThimbleOffset(const int32 Finger, const FVector& Offset) @@ -822,5 +822,5 @@ FString USGSenseGlove::ToString() const FSGIC_TSharedPtr_FSGSenseGloveImpl InstanceContainer{ToSenseGloveImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String);; + return OutStringContainer.String;; } \ No newline at end of file diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp index 1e63685d..830c0eb2 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp @@ -375,7 +375,7 @@ FString USGSenseGloveInfo::GetDeviceId() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FString OutIdContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetDeviceId(&InstanceContainer, &OutIdContainer); - return MoveTemp(OutIdContainer.String); + return OutIdContainer.String; } FString USGSenseGloveInfo::GetHardwareVersion() const @@ -383,7 +383,7 @@ FString USGSenseGloveInfo::GetHardwareVersion() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FString OutVersionContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetHardwareVersion(&InstanceContainer, &OutVersionContainer); - return MoveTemp(OutVersionContainer.String); + return OutVersionContainer.String; } int32 USGSenseGloveInfo::GetFirmwareVersion() const @@ -415,7 +415,7 @@ FQuat USGSenseGloveInfo::GetImuCorrectionQ() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_FQuat OutCorrectionContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetImuCorrection(&InstanceContainer, &OutCorrectionContainer); - return MoveTemp(OutCorrectionContainer.Quat); + return OutCorrectionContainer.Quat; } FRotator USGSenseGloveInfo::GetImuCorrection() const @@ -431,7 +431,7 @@ TArray USGSenseGloveInfo::GetStartPositions() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPositions(&InstanceContainer, &OutPositionsContainer); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } TArray USGSenseGloveInfo::GetStartRotationsQ() const @@ -439,7 +439,7 @@ TArray USGSenseGloveInfo::GetStartRotationsQ() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetStartRotations(&InstanceContainer, &OutRotationsContainer); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } TArray USGSenseGloveInfo::GetStartRotations() const @@ -455,7 +455,7 @@ TArray> USGSenseGloveInfo::GetGloveLengths() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_TArray_TArray_FVector OutLengthsContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetGloveLengths(&InstanceContainer, &OutLengthsContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } TArray USGSenseGloveInfo::GetFunctions() const @@ -463,7 +463,7 @@ TArray USGSenseGloveInfo::GetFunctions() const FSGIC_FSGSenseGloveInfoImpl InstanceContainer{ToSenseGloveInfoImpl()}; FSGIC_TArray_bool OutFunctionsContainer; SGCoreImpl_FSGSenseGloveInfoImpl_GetFunctions(&InstanceContainer, &OutFunctionsContainer); - return MoveTemp(OutFunctionsContainer.Array); + return OutFunctionsContainer.Array; } FVector USGSenseGloveInfo::GetStartPosition(const ESGFinger Finger) const @@ -472,7 +472,7 @@ FVector USGSenseGloveInfo::GetStartPosition(const ESGFinger Finger) const FSGIC_FVector OutPositionContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGSenseGloveInfoImpl_GetStartPosition(&InstanceContainer, &OutPositionContainer, &FingerContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat USGSenseGloveInfo::GetStartRotationQ(const ESGFinger Finger) const @@ -481,7 +481,7 @@ FQuat USGSenseGloveInfo::GetStartRotationQ(const ESGFinger Finger) const FSGIC_FQuat OutRotationContainer; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGSenseGloveInfoImpl_GetStartRotation(&InstanceContainer, &OutRotationContainer, &FingerContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator USGSenseGloveInfo::GetStartRotation(const ESGFinger Finger) const @@ -499,7 +499,7 @@ TArray USGSenseGloveInfo::GetGloveLengths(const ESGFinger Finger) const FSGIC_TArray_FVector OutLengths; FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGSenseGloveInfoImpl_GetGloveLengths_Finger(&InstanceContainer, &OutLengths, &FingerContainer); - return MoveTemp(OutLengths.Array); + return OutLengths.Array; } TArray> USGSenseGloveInfo::ToGloveAngles(const TArray>& SensorAngles) const @@ -508,7 +508,7 @@ TArray> USGSenseGloveInfo::ToGloveAngles(const TArray> USGSenseGlovePose::GetJointPositions() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetJointPositions(&InstanceContainer, &OutPositionsContainer); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } TArray> USGSenseGlovePose::GetJointRotationsQ() const @@ -312,7 +312,7 @@ TArray> USGSenseGlovePose::GetJointRotationsQ() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetJointRotations(&InstanceContainer, &OutRotationsContainer); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } TArray> USGSenseGlovePose::GetJointRotations() const @@ -328,7 +328,7 @@ TArray> USGSenseGlovePose::GetGloveAngles() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetGloveAngles(&InstanceContainer, &OutAnglesContainer); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray USGSenseGlovePose::GetThimblePositions() const @@ -336,7 +336,7 @@ TArray USGSenseGlovePose::GetThimblePositions() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FVector OutPositionsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetThimblePositions(&InstanceContainer, &OutPositionsContainer); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } TArray USGSenseGlovePose::GetThimbleRotationsQ() const @@ -344,7 +344,7 @@ TArray USGSenseGlovePose::GetThimbleRotationsQ() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FQuat OutRotationsContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetThimbleRotations(&InstanceContainer, &OutRotationsContainer); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } TArray USGSenseGlovePose::GetThimbleRotations() const @@ -360,7 +360,7 @@ TArray USGSenseGlovePose::GetTotalGloveAngles() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_TArray_FVector OutAnglesContainer; SGCoreImpl_FSGSenseGlovePoseImpl_GetTotalGloveAngles(&InstanceContainer, &OutAnglesContainer); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray USGSenseGlovePose::CalculateFingertips(const TArray& FingerOffsets) const @@ -370,7 +370,7 @@ TArray USGSenseGlovePose::CalculateFingertips(const TArray& Fi FSGIC_TArray_FVector FingerOffsetsContainer{FingerOffsets}; SGCoreImpl_FSGSenseGlovePoseImpl_CalculateFingertips(&InstanceContainer, &OutFingertipsContainer, &FingerOffsetsContainer); - return MoveTemp(OutFingertipsContainer.Array); + return OutFingertipsContainer.Array; } bool USGSenseGlovePose::Equals(const USGSenseGlovePose* SenseGlovePose) const @@ -385,7 +385,7 @@ FString USGSenseGlovePose::ToString(const bool bShortFormat) const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGlovePoseImpl_ToString(&InstanceContainer, &OutStringContainer, bShortFormat); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGSenseGlovePose::SGSerialize() const @@ -393,7 +393,7 @@ FString USGSenseGlovePose::SGSerialize() const FSGIC_FSGSenseGlovePoseImpl InstanceContainer{ToSenseGlovePoseImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGlovePoseImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGSenseGlovePose::FImpl::FImpl(USGSenseGlovePose* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp index cb6b009d..1a9e56b4 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp @@ -266,7 +266,7 @@ TArray> USGSenseGloveSensorData::GetSensorAngles() const FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_TArray_TArray_float OutAnglesContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_GetSensorAngles(&InstanceContainer, &OutAnglesContainer); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray USGSenseGloveSensorData::GetSensorAngles(const ESGFinger Finger) const @@ -276,7 +276,7 @@ TArray USGSenseGloveSensorData::GetSensorAngles(const ESGFinger Finger) c FSGIC_ESGFinger FingerContainer{Finger}; SGCoreImpl_FSGSenseGloveSensorDataImpl_GetSensorAngles_Finger(&InstanceContainer, &OutAnglesContainer, &FingerContainer); - return MoveTemp(OutAnglesContainer.Array); + return OutAnglesContainer.Array; } TArray USGSenseGloveSensorData::GetAngleSequence() const @@ -284,7 +284,7 @@ TArray USGSenseGloveSensorData::GetAngleSequence() const FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_TArray_float OutSequenceContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_GetAngleSequence(&InstanceContainer, &OutSequenceContainer); - return MoveTemp(OutSequenceContainer.Array); + return OutSequenceContainer.Array; } FQuat USGSenseGloveSensorData::GetImuRotationQ() const @@ -292,7 +292,7 @@ FQuat USGSenseGloveSensorData::GetImuRotationQ() const FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_GetImuRotation(&InstanceContainer, &OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator USGSenseGloveSensorData::GetImuRotation() const @@ -327,7 +327,7 @@ FString USGSenseGloveSensorData::ToString() const FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString USGSenseGloveSensorData::SGSerialize() const @@ -335,7 +335,7 @@ FString USGSenseGloveSensorData::SGSerialize() const FSGIC_FSGSenseGloveSensorDataImpl InstanceContainer{ToSenseGloveSensorDataImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGSenseGloveSensorDataImpl_Serialize(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGSenseGloveSensorData::FImpl::FImpl(USGSenseGloveSensorData* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp index e5136690..aa610dc6 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveVars.cpp @@ -54,7 +54,7 @@ FString FSGSenseGloveVars::GetStandardConstantsString(const FString& HardwareVer SGCoreImpl_FSGSenseGloveVarsImpl_GetStandardConstantsString(&OutStringContainer, &HardwareVersionContainer, FirmwareVersion, bRightHanded); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } FString FSGSenseGloveVars::GetSensorString(const FString& HardwareVersion, const float FirmwareVersion) @@ -62,7 +62,7 @@ FString FSGSenseGloveVars::GetSensorString(const FString& HardwareVersion, const FSGIC_FString OutStringContainer; FSGIC_FString HardwareVersionContainer{HardwareVersion}; SGCoreImpl_FSGSenseGloveVarsImpl_GetSensorString(&OutStringContainer, &HardwareVersionContainer, FirmwareVersion); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } TArray FSGSenseGloveVars::GetStartPositions(const FString& HardwareVersion, const bool bRightHanded) @@ -70,7 +70,7 @@ TArray FSGSenseGloveVars::GetStartPositions(const FString& HardwareVers FSGIC_TArray_FVector OutPositionsContainer; FSGIC_FString HardwareVersionContainer{HardwareVersion}; SGCoreImpl_FSGSenseGloveVarsImpl_GetStartPositions(&OutPositionsContainer, &HardwareVersionContainer, bRightHanded); - return MoveTemp(OutPositionsContainer.Array); + return OutPositionsContainer.Array; } TArray FSGSenseGloveVars::GetStartRotationsQ(const FString& HardwareVersion, const bool bRightHanded) @@ -78,7 +78,7 @@ TArray FSGSenseGloveVars::GetStartRotationsQ(const FString& HardwareVersi FSGIC_TArray_FQuat OutRotationsContainer; FSGIC_FString HardwareVersionContainer{HardwareVersion}; SGCoreImpl_FSGSenseGloveVarsImpl_GetStartRotations(&OutRotationsContainer, &HardwareVersionContainer, bRightHanded); - return MoveTemp(OutRotationsContainer.Array); + return OutRotationsContainer.Array; } TArray FSGSenseGloveVars::GetStartRotations(const FString& HardwareVersion, const bool bRightHanded) @@ -94,7 +94,7 @@ TArray> FSGSenseGloveVars::GetGloveLengths(const FString& Hardwa FSGIC_TArray_TArray_FVector OutLengthsContainer; FSGIC_FString HardwareVersionContainer{HardwareVersion}; SGCoreImpl_FSGSenseGloveVarsImpl_GetGloveLengths(&OutLengthsContainer, &HardwareVersionContainer); - return MoveTemp(OutLengthsContainer.Array); + return OutLengthsContainer.Array; } /* @@ -116,7 +116,7 @@ FQuat FSGSenseGloveVars::GetImuCorrectionQ(const FString& HardwareVersion, FSGIC_FString HardwareVersionContainer{HardwareVersion}; SGCoreImpl_FSGSenseGloveVarsImpl_GetImuCorrection(&OutCorrectionContainer, &HardwareVersionContainer, FirmwareVersion, SubFirmwareVersion); - return MoveTemp(OutCorrectionContainer.Quat); + return OutCorrectionContainer.Quat; } FRotator FSGSenseGloveVars::GetImuCorrection(const FString& HardwareVersion, @@ -136,7 +136,7 @@ TArray FSGSenseGloveVars::GetFunctions(const FString& HardwareVersion, FSGIC_FString HardwareVersionContainer{HardwareVersion}; SGCoreImpl_FSGSenseGloveVarsImpl_GetFunctions(&OutFunctionsContainer, &HardwareVersionContainer, FirmwareVersion, SubFirmwareVersion); - return MoveTemp(OutFunctionsContainer.Array); + return OutFunctionsContainer.Array; } USGSenseGloveInfo* FSGSenseGloveVars::GenerateGloveModel(UObject* Outer, const FString& HardwareVersion, diff --git a/Source/SenseGloveCore/Private/SGCore/SGSensorNormalization.cpp b/Source/SenseGloveCore/Private/SGCore/SGSensorNormalization.cpp index 6abb449d..d176570e 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGSensorNormalization.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGSensorNormalization.cpp @@ -199,7 +199,7 @@ TArray USGSensorNormalization::NormalizeValues(const TArray& Value SGCoreImpl_FSGSensorNormalizationImpl_NormalizeValues( &InstanceContainer, &ValuesContainer, &OutNormalizedValuesContainer); - return MoveTemp(OutNormalizedValuesContainer.Array); + return OutNormalizedValuesContainer.Array; } bool USGSensorNormalization::MovedEnough(const int32 Index) const diff --git a/Source/SenseGloveCore/Private/SGCore/SGThresholdCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGThresholdCommand.cpp index f5b74767..2157892b 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGThresholdCommand.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGThresholdCommand.cpp @@ -159,7 +159,7 @@ TArray USGThresholdCommand::GetThresholds() const FSGIC_FSGThresholdCommandImpl InstanceContainer{ToThresholdCommandImpl()}; FSGIC_TArray_float ThresholdsContainer; SGCoreImpl_FSGThresholdCommandImpl_GetThresholds(&InstanceContainer, &ThresholdsContainer); - return MoveTemp(ThresholdsContainer.Array); + return ThresholdsContainer.Array; } void USGThresholdCommand::SetThresholds(const TArray& AffectedFingers, const TArray& ThresholdValues) @@ -182,7 +182,7 @@ TArray USGThresholdCommand::GetActiveFingers() const FSGIC_FSGThresholdCommandImpl InstanceContainer{ToThresholdCommandImpl()}; FSGIC_TArray_bool OutActiveFingersContainer; SGCoreImpl_FSGThresholdCommandImpl_GetActiveFingers(&InstanceContainer, &OutActiveFingersContainer); - return MoveTemp(OutActiveFingersContainer.Array); + return OutActiveFingersContainer.Array; } void USGThresholdCommand::ClearThreshold(const int32 Finger) @@ -209,7 +209,7 @@ FString USGThresholdCommand::ToString() const FSGIC_FSGThresholdCommandImpl InstanceContainer{ToThresholdCommandImpl()}; FSGIC_FString OutStringContainer; SGCoreImpl_FSGThresholdCommandImpl_ToString(&InstanceContainer, &OutStringContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } USGThresholdCommand::FImpl::FImpl(USGThresholdCommand* InOwner) diff --git a/Source/SenseGloveCore/Private/SGCore/SGTracking.cpp b/Source/SenseGloveCore/Private/SGCore/SGTracking.cpp index 02ee3eb5..cc91a4a4 100644 --- a/Source/SenseGloveCore/Private/SGCore/SGTracking.cpp +++ b/Source/SenseGloveCore/Private/SGCore/SGTracking.cpp @@ -89,14 +89,14 @@ TArray FSGTracking::GetSenseGloveFingerToGlovePositionOrigin() { FSGIC_TArray_FVector OutOriginContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveFingerToGlovePositionOrigin(&OutOriginContainer); - return MoveTemp(OutOriginContainer.Array); + return OutOriginContainer.Array; } TArray FSGTracking::GetSenseGloveFingerToGloveRotationOriginQ() { FSGIC_TArray_FQuat OutOriginContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveFingerToGloveRotationOrigin(&OutOriginContainer); - return MoveTemp(OutOriginContainer.Array); + return OutOriginContainer.Array; } TArray FSGTracking::GetSenseGloveFingerToGloveRotationOrigin() @@ -110,14 +110,14 @@ FVector FSGTracking::GetSenseGloveWristPositionOffset() { FSGIC_FVector OutOffsetContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveWristPositionOffset(&OutOffsetContainer); - return MoveTemp(OutOffsetContainer.Vector); + return OutOffsetContainer.Vector; } FQuat FSGTracking::GetSenseGloveWristRotationOffsetQ() { FSGIC_FQuat OutOffsetContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveWristRotationOffset(&OutOffsetContainer); - return MoveTemp(OutOffsetContainer.Quat); + return OutOffsetContainer.Quat; } FRotator FSGTracking::GetSenseGloveWristRotationOffset() @@ -189,14 +189,14 @@ FVector FSGTracking::GetSenseGloveViveToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveViveToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetSenseGloveViveToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveViveToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetSenseGloveViveToAttachRotation() @@ -210,14 +210,14 @@ FVector FSGTracking::GetSenseGloveOculusTouchToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveOculusTouchToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetSenseGloveOculusTouchToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetSenseGloveOculusTouchToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetSenseGloveOculusTouchToAttachRotation() @@ -231,14 +231,14 @@ FVector FSGTracking::GetNovaToWristPositionOffset() { FSGIC_FVector OutOffsetContainer; SGCoreImpl_FSGTrackingImpl_GetNovaToWristPositionOffset(&OutOffsetContainer); - return MoveTemp(OutOffsetContainer.Vector); + return OutOffsetContainer.Vector; } FQuat FSGTracking::GetNovaToWristRotationOffsetQ() { FSGIC_FQuat OutOffsetContainer; SGCoreImpl_FSGTrackingImpl_GetNovaToWristRotationOffset(&OutOffsetContainer); - return MoveTemp(OutOffsetContainer.Quat); + return OutOffsetContainer.Quat; } FRotator FSGTracking::GetNovaToWristRotationOffset() @@ -252,14 +252,14 @@ FVector FSGTracking::GetRightNovaViveToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaViveToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNovaViveToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaViveToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNovaViveToAttachRotation() @@ -273,14 +273,14 @@ FVector FSGTracking::GetLeftNovaViveToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaViveToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNovaViveToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaViveToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNovaViveToAttachRotation() @@ -294,14 +294,14 @@ FVector FSGTracking::GetRightNovaQuest2ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuest2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNovaQuest2ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuest2ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNovaQuest2ToAttachRotation() @@ -315,14 +315,14 @@ FVector FSGTracking::GetLeftNovaQuest2ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuest2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNovaQuest2ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuest2ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNovaQuest2ToAttachRotation() @@ -336,14 +336,14 @@ FVector FSGTracking::GetRightNovaPico2ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaPico2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNovaPico2ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaPico2ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNovaPico2ToAttachRotation() @@ -357,7 +357,7 @@ FQuat FSGTracking::GetLeftNovaPico2ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaPico2ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNovaPico2ToAttachRotation() @@ -371,14 +371,14 @@ FVector FSGTracking::GetRightNovaQuestProToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuestProToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNovaQuestProToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuestProToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNovaQuestProToAttachRotation() @@ -392,14 +392,14 @@ FVector FSGTracking::GetLeftNovaQuestProToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuestProToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNovaQuestProToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuestProToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNovaQuestProToAttachRotation() @@ -413,14 +413,14 @@ FVector FSGTracking::GetRightNovaViveFocus3ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaViveFocus3ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNovaViveFocus3ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaViveFocus3ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNovaViveFocus3ToAttachRotation() @@ -434,14 +434,14 @@ FVector FSGTracking::GetLeftNovaViveFocus3ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaViveFocus3ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNovaViveFocus3ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaViveFocus3ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNovaViveFocus3ToAttachRotation() @@ -455,14 +455,14 @@ FVector FSGTracking::GetRightNovaQuest3ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuest3ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNovaQuest3ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuest3ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNovaQuest3ToAttachRotation() @@ -476,14 +476,14 @@ FVector FSGTracking::GetLeftNovaQuest3ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuest3ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNovaQuest3ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuest3ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNovaQuest3ToAttachRotation() @@ -550,14 +550,14 @@ FVector FSGTracking::GetRightNova2ToWristPositionOffset() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2ToWristPositionOffset(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNova2ToWristRotationOffsetQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2ToWristRotationOffset(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNova2ToWristRotationOffset() @@ -571,14 +571,14 @@ FVector FSGTracking::GetLeftNova2ToWristPositionOffset() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2ToWristPositionOffset(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNova2ToWristRotationOffsetQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2ToWristRotationOffset(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNova2ToWristRotationOffset() @@ -592,14 +592,14 @@ FVector FSGTracking::GetRightNova2Quest2ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2Quest2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNova2Quest2ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2Quest2ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNova2Quest2ToAttachRotation() @@ -613,14 +613,14 @@ FVector FSGTracking::GetLeftNova2Quest2ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2Quest2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNova2Quest2ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2Quest2ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNova2Quest2ToAttachRotation() @@ -634,14 +634,14 @@ FVector FSGTracking::GetRightNova2QuestProToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNovaQuest2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNova2QuestProToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2QuestProToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNova2QuestProToAttachRotation() @@ -655,14 +655,14 @@ FVector FSGTracking::GetLeftNova2QuestProToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNovaQuest2ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNova2QuestProToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2QuestProToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNova2QuestProToAttachRotation() @@ -676,14 +676,14 @@ FVector FSGTracking::GetRightNova2ViveTrackerToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2ViveTrackerToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNova2ViveTrackerToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2ViveTrackerToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNova2ViveTrackerToAttachRotation() @@ -697,14 +697,14 @@ FVector FSGTracking::GetLeftNova2ViveTrackerToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2ViveTrackerToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNova2ViveTrackerToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2ViveTrackerToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNova2ViveTrackerToAttachRotation() @@ -718,28 +718,28 @@ FVector FSGTracking::GetRightNova2ViveWristTrackerToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2ViveWristTrackerToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNova2ViveWristTrackerToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2ViveWristTrackerToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FVector FSGTracking::GetRightNova2Quest3ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2Quest3ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetRightNova2Quest3ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetRightNova2Quest3ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetRightNova2Quest3ToAttachRotation() @@ -753,14 +753,14 @@ FVector FSGTracking::GetLeftNova2Quest3ToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2Quest3ToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNova2Quest3ToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2Quest3ToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNova2Quest3ToAttachRotation() @@ -781,14 +781,14 @@ FVector FSGTracking::GetLeftNova2ViveWristTrackerToAttachPosition() { FSGIC_FVector OutPositionContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2ViveWristTrackerToAttachPosition(&OutPositionContainer); - return MoveTemp(OutPositionContainer.Vector); + return OutPositionContainer.Vector; } FQuat FSGTracking::GetLeftNova2ViveWristTrackerToAttachRotationQ() { FSGIC_FQuat OutRotationContainer; SGCoreImpl_FSGTrackingImpl_GetLeftNova2ViveWristTrackerToAttachRotation(&OutRotationContainer); - return MoveTemp(OutRotationContainer.Quat); + return OutRotationContainer.Quat; } FRotator FSGTracking::GetLeftNova2ViveWristTrackerToAttachRotation() @@ -863,5 +863,5 @@ FString FSGTracking::ToString(const ESGPositionalTrackingHardware Hardware) FSGIC_FString OutStringContainer; FSGIC_ESGPositionalTrackingHardware HardwareContainer{Hardware}; SGCoreImpl_FSGTrackingImpl_ToString(&OutStringContainer, &HardwareContainer); - return MoveTemp(OutStringContainer.String); + return OutStringContainer.String; } \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGAnatomyImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGAnatomyImpl.cpp index c97be6f0..38157dbe 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGAnatomyImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGAnatomyImpl.cpp @@ -99,36 +99,36 @@ float FSGAnatomyImpl::NormalizeThumbFlexion(const float FlexionInDegrees) TArray> FSGAnatomyImpl::GetDefaultHandAngles(const bool bRightHanded) { - TArray> DefaultHandAngles{ + const TArray> DefaultHandAngles{ FSGArrayUtils::FromSenseGloveAngles( FAnatomyType::GetDefaultHandAngles(bRightHanded)) }; - return MoveTemp(DefaultHandAngles); + return DefaultHandAngles; } TArray> FSGAnatomyImpl::GetFlatHandAngles(const bool bRightHanded) { - TArray> FlatHandAngles{ + const TArray> FlatHandAngles{ FSGArrayUtils::FromSenseGloveAngles( FAnatomyType::GetFlatHandAngles(bRightHanded)) }; - return MoveTemp(FlatHandAngles); + return FlatHandAngles; } TArray> FSGAnatomyImpl::GetThumbsUpHandAngles(const bool bRightHanded) { - TArray> ThumbsUpHandAngles{ + const TArray> ThumbsUpHandAngles{ FSGArrayUtils::FromSenseGloveAngles( FAnatomyType::GetThumbsUpHandAngles(bRightHanded)) }; - return MoveTemp(ThumbsUpHandAngles); + return ThumbsUpHandAngles; } TArray> FSGAnatomyImpl::GetFistHandAngles(const bool bRightHanded) { - TArray> FistHandAngles{ + const TArray> FistHandAngles{ FSGArrayUtils::FromSenseGloveAngles( FAnatomyType::GetFistHandAngles(bRightHanded)) }; - return MoveTemp(FistHandAngles); + return FistHandAngles; } \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp index 18978bab..460f60b0 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp @@ -194,18 +194,18 @@ bool FSGBasicHandModelImpl::IsRight() const TArray> FSGBasicHandModelImpl::GetFingerLengths() const { - TArray> FingerLengths{ + const TArray> FingerLengths{ FSGArrayUtils::FromMillimeters(Pimpl->BasicHandModel.GetFingerLengths()) }; - return MoveTemp(FingerLengths); + return FingerLengths; } TArray FSGBasicHandModelImpl::GetFingerLengths(const ESGFinger Finger) const { - TArray FingerLengths{ + const TArray FingerLengths{ FSGArrayUtils::FromMillimeters(Pimpl->BasicHandModel.GetFingerLengths(FSGCoreEnumCast::ToEFinger(Finger))) }; - return MoveTemp(FingerLengths); + return FingerLengths; } void FSGBasicHandModelImpl::SetFingerLengths(const ESGFinger Finger, const TArray& Lengths) @@ -226,27 +226,27 @@ void FSGBasicHandModelImpl::SetFingerLengths(const uint8 Finger, const TArray> FSGBasicHandModelImpl::GetFingerRatios() const { - TArray> FingerRatios{ + const TArray> FingerRatios{ FSGArrayUtils::FromStdVector(Pimpl->BasicHandModel.GetFingerRatios()) }; - return MoveTemp(FingerRatios); + return FingerRatios; } TArray FSGBasicHandModelImpl::GetFingerRatios(const ESGFinger Finger) const { - TArray FingerRatios{ + const TArray FingerRatios{ FSGArrayUtils::FromStdVector(Pimpl->BasicHandModel.GetFingerRatios(FSGCoreEnumCast::ToEFinger(Finger))) }; - return MoveTemp(FingerRatios); + return FingerRatios; } TArray FSGBasicHandModelImpl::GetStartJointPositions() const { - TArray StartJointPositions{ + const TArray StartJointPositions{ FSGArrayUtils::FromMillimeters( Pimpl->BasicHandModel.GetStartJointPositions()) }; - return MoveTemp(StartJointPositions); + return StartJointPositions; } void FSGBasicHandModelImpl::SetStartJointPosition(const ESGFinger Finger, const FVector& Position) @@ -265,12 +265,12 @@ void FSGBasicHandModelImpl::SetStartJointPosition(const uint8 Finger, const FVec TArray FSGBasicHandModelImpl::GetStartJointRotations() const { - TArray StartJointRotations{ + const TArray StartJointRotations{ FSGArrayUtils::FromStdVector< FSGQuatImpl::FQuatType, FQuat, FSGQuatImpl, &FSGQuatImpl::ToFQuat>( Pimpl->BasicHandModel.GetStartJointRotations()) }; - return MoveTemp(StartJointRotations); + return StartJointRotations; } FVector FSGBasicHandModelImpl::GetJointPosition(const ESGFinger Finger) const @@ -299,10 +299,10 @@ void FSGBasicHandModelImpl::SetJointRotation(const FQuat& NewRotation, const ESG TArray FSGBasicHandModelImpl::GetTotalLengths() const { - TArray TotalLengths{ + const TArray TotalLengths{ FSGArrayUtils::FromMillimeters(Pimpl->BasicHandModel.GetTotalLengths()) }; - return MoveTemp(TotalLengths); + return TotalLengths; } float FSGBasicHandModelImpl::GetTotalLength(const ESGFinger Finger) const @@ -313,11 +313,11 @@ float FSGBasicHandModelImpl::GetTotalLength(const ESGFinger Finger) const TArray FSGBasicHandModelImpl::Get3DLengths(const ESGFinger Finger) const { - TArray Lengths{ + const TArray Lengths{ FSGArrayUtils::FromMillimeters( Pimpl->BasicHandModel.Get3DLengths(FSGCoreEnumCast::ToEFinger(Finger))) }; - return MoveTemp(Lengths); + return Lengths; } bool FSGBasicHandModelImpl::Equals(const FSGBasicHandModelImpl& BasicHandModelImpl) const @@ -327,20 +327,20 @@ bool FSGBasicHandModelImpl::Equals(const FSGBasicHandModelImpl& BasicHandModelIm FString FSGBasicHandModelImpl::ToString() const { - FString String(UTF8_TO_TCHAR(Pimpl->BasicHandModel.ToString().c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(Pimpl->BasicHandModel.ToString().c_str())); + return String; } FString FSGBasicHandModelImpl::ToString(const bool bLengthsOnly) const { - FString String(UTF8_TO_TCHAR(Pimpl->BasicHandModel.ToString(bLengthsOnly).c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(Pimpl->BasicHandModel.ToString(bLengthsOnly).c_str())); + return String; } FString FSGBasicHandModelImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->BasicHandModel.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized(UTF8_TO_TCHAR(Pimpl->BasicHandModel.Serialize().c_str())); + return Serialized; } FSGBasicHandModelImpl::FImpl::FImpl(FSGBasicHandModelImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp index 231f9b5d..f5476578 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp @@ -69,9 +69,10 @@ TSharedRef FSGBetaDeviceImpl::Parse(const FString& String) { FSGDevicePtrType SGDevicePtr{FBetaDeviceType::Parse(TCHAR_TO_UTF8(*String))}; ensureAlwaysMsgf(SGDevicePtr, TEXT("Invalid SGDevice!")); - TSharedRef BetaDeviceImpl{MakeShared( - std::dynamic_pointer_cast(MoveTemp(SGDevicePtr)))}; - return MoveTemp(BetaDeviceImpl); + const TSharedRef BetaDeviceImpl{ + MakeShared(std::dynamic_pointer_cast(MoveTemp(SGDevicePtr))) + }; + return BetaDeviceImpl; } FSGBetaDeviceImpl::FSGBetaDeviceImpl() @@ -149,14 +150,14 @@ ESGDeviceType FSGBetaDeviceImpl::GetDeviceType() const FString FSGBetaDeviceImpl::GetDeviceId() const { - FString Id{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetDeviceId().c_str())}; - return MoveTemp(Id); + const FString Id{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetDeviceId().c_str())}; + return Id; } FString FSGBetaDeviceImpl::GetHardwareVersion() const { - FString Version{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetHardwareVersion().c_str())}; - return MoveTemp(Version); + const FString Version{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetHardwareVersion().c_str())}; + return Version; } int32 FSGBetaDeviceImpl::GetFirmwareVersion() const @@ -171,20 +172,20 @@ int32 FSGBetaDeviceImpl::GetSubFirmwareVersion() const FString FSGBetaDeviceImpl::GetConstantsString() const { - FString String{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetConstantsString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetConstantsString().c_str())}; + return String; } FString FSGBetaDeviceImpl::GetSensorData() const { - FString Data{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetSensorData().c_str())}; - return MoveTemp(Data); + const FString Data{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetSensorData().c_str())}; + return Data; } FString FSGBetaDeviceImpl::GetLastCommand() const { - FString Command{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetLastCommand().c_str())}; - return MoveTemp(Command); + const FString Command{UTF8_TO_TCHAR(ToBetaDevicePtrChecked()->GetLastCommand().c_str())}; + return Command; } bool FSGBetaDeviceImpl::SendHaptics(const FString& Command, const int32 Channel) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCustomWaveformImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCustomWaveformImpl.cpp index 1a02a84f..d2ba2fb4 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCustomWaveformImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCustomWaveformImpl.cpp @@ -71,8 +71,8 @@ struct FSGCustomWaveformImpl::FImpl FString FSGCustomWaveformImpl::ToString(const ESGWaveformType Type) { - FString String{FCustomWaveformType::ToString(FSGCoreEnumCast::ToEWaveformType(Type)).c_str()}; - return MoveTemp(String); + const FString String{FCustomWaveformType::ToString(FSGCoreEnumCast::ToEWaveformType(Type)).c_str()}; + return String; } FSGCustomWaveformImpl::FSGCustomWaveformImpl() @@ -259,8 +259,8 @@ bool FSGCustomWaveformImpl::Equals(const FSGCustomWaveformImpl& CustomWaveformIm FString FSGCustomWaveformImpl::ToString() const { - FString String{UTF8_TO_TCHAR(Pimpl->CustomWaveform.ToString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->CustomWaveform.ToString().c_str())}; + return String; } FSGCustomWaveformImpl::FImpl::FImpl(FSGCustomWaveformImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp index 7e527d48..c7ea9e2d 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp @@ -98,8 +98,8 @@ bool FSGDeviceImpl::FirmwareOlderThan(const int32 MyFirmwareMain, const int32 My FString FSGDeviceImpl::ToString(const ESGDeviceType DeviceType) { - FString String{UTF8_TO_TCHAR(FSGDeviceType::ToString(FSGCoreEnumCast::ToEDeviceType(DeviceType)).c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(FSGDeviceType::ToString(FSGCoreEnumCast::ToEDeviceType(DeviceType)).c_str())}; + return String; } FSGDeviceImpl::FSGDeviceImpl() @@ -298,8 +298,8 @@ int32 FSGDeviceImpl::GetSubFirmwareVersion() const FString FSGDeviceImpl::GetFirmwareString() const { - FString String{UTF8_TO_TCHAR(ToSGDevicePtrChecked()->GetFirmwareString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(ToSGDevicePtrChecked()->GetFirmwareString().c_str())}; + return String; } bool FSGDeviceImpl::FirmwareNewerThan(const int32 FirmwareMain, const int32 FirmwareSub, const bool bInclusive) const @@ -314,8 +314,8 @@ bool FSGDeviceImpl::FirmwareOlderThan(const int32 FirmwareMain, const int32 Firm FString FSGDeviceImpl::GetAddress() const { - FString String(UTF8_TO_TCHAR(ToSGDevicePtrChecked()->GetAddress().c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(ToSGDevicePtrChecked()->GetAddress().c_str())); + return String; } bool FSGDeviceImpl::IsConnected() const @@ -385,8 +385,8 @@ int32 FSGDeviceImpl::GetHapticChannelCount(const ESGHapticChannelType ChannelTyp FString FSGDeviceImpl::ToString() const { - FString String(UTF8_TO_TCHAR(ToSGDevicePtrChecked()->ToString().c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(ToSGDevicePtrChecked()->ToString().c_str())); + return String; } FSGDeviceImpl::FImpl::FImpl(FSGDeviceImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp index a36f4f5a..766e2904 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceListImpl.cpp @@ -146,7 +146,7 @@ TArray> FSGDeviceListImpl::GetDevices() } } - return MoveTemp(DeviceImpls); + return DeviceImpls; } bool FSGDeviceListImpl::GetSensorDataString(const int32 IpcIndex, const FString& IpcAddress, FString& OutString) @@ -169,16 +169,16 @@ bool FSGDeviceListImpl::SendHaptics( FString FSGDeviceListImpl::GetDeviceStringAt(const int32 IpcIndex, const FString& IpcAddress, const int32 Index) { std::string IpcAddressString(TCHAR_TO_UTF8(*IpcAddress)); - FString String( + const FString String( UTF8_TO_TCHAR(FDeviceListType::GetDeviceStringAt(IpcIndex, MoveTemp(IpcAddressString), Index).c_str())); - return MoveTemp(String); + return String; } FString FSGDeviceListImpl::GetAddress(const int32 IpcIndex, const FString& IpcAddress) { std::string IpcAddressString(TCHAR_TO_UTF8(*IpcAddress)); - FString Address(UTF8_TO_TCHAR(FDeviceListType::GetAddress(IpcIndex, MoveTemp(IpcAddressString)).c_str())); - return MoveTemp(Address); + const FString Address(UTF8_TO_TCHAR(FDeviceListType::GetAddress(IpcIndex, MoveTemp(IpcAddressString)).c_str())); + return Address; } ESGConnectionType FSGDeviceListImpl::GetConnectionType(const int32 IpcIndex, const FString& IpcAddress) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp index bfa47744..84214d6a 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp @@ -141,14 +141,14 @@ const FSGDeviceModelImpl::FDeviceModelType& FSGDeviceModelImpl::ToDeviceModel() FString FSGDeviceModelImpl::GetDeviceId() const { - FString DeviceId(UTF8_TO_TCHAR(Pimpl->DeviceModel.GetDeviceId().c_str())); - return MoveTemp(DeviceId); + const FString DeviceId(UTF8_TO_TCHAR(Pimpl->DeviceModel.GetDeviceId().c_str())); + return DeviceId; } FString FSGDeviceModelImpl::GetHardwareVersion() const { - FString HardwareVersion(UTF8_TO_TCHAR(Pimpl->DeviceModel.GetHardwareVersion().c_str())); - return MoveTemp(HardwareVersion); + const FString HardwareVersion(UTF8_TO_TCHAR(Pimpl->DeviceModel.GetHardwareVersion().c_str())); + return HardwareVersion; } int32 FSGDeviceModelImpl::GetFirmwareVersion() const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp index 2c585238..39d40c99 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp @@ -83,8 +83,8 @@ struct FSGHandInterpolatorImpl::FImpl FSGHandInterpolatorImpl FSGHandInterpolatorImpl::Deserialize(const FString& SerializedString, const bool bRightHanded) { std::string Serialized(TCHAR_TO_UTF8(*SerializedString)); - FSGHandInterpolatorImpl GlovePose(FHandInterpolatorType::Deserialize(MoveTemp(Serialized), bRightHanded)); - return MoveTemp(GlovePose); + const FSGHandInterpolatorImpl GlovePose(FHandInterpolatorType::Deserialize(MoveTemp(Serialized), bRightHanded)); + return GlovePose; } FSGHandInterpolatorImpl::FSGHandInterpolatorImpl() @@ -154,12 +154,12 @@ TArray> FSGHandInterpolatorImpl::InterpolateHandAngles( std::vector AbductionsVector{ FSGArrayUtils::ToSenseGloveAngles(Abductions) }; - TArray> Angles{ + const TArray> Angles{ FSGArrayUtils::FromSenseGloveAngles( Pimpl->HandInterpolator.InterpolateHandAngles( MoveTemp(FlexionsVector), MoveTemp(AbductionsVector), CmcTwist)) }; - return MoveTemp(Angles); + return Angles; } bool FSGHandInterpolatorImpl::Equals(const FSGHandInterpolatorImpl& HandInterpolatorImpl) const @@ -169,8 +169,8 @@ bool FSGHandInterpolatorImpl::Equals(const FSGHandInterpolatorImpl& HandInterpol FString FSGHandInterpolatorImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->HandInterpolator.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized(UTF8_TO_TCHAR(Pimpl->HandInterpolator.Serialize().c_str())); + return Serialized; } FSGHandInterpolatorImpl::FImpl::FImpl(FSGHandInterpolatorImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandLayerImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandLayerImpl.cpp index 7c61afcf..1b80b253 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandLayerImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandLayerImpl.cpp @@ -93,8 +93,8 @@ ESGHapticGloveCalibrationState FSGHandLayerImpl::GetCalibrationState(const bool FString FSGHandLayerImpl::GetCalibrationInstructions(const bool bRightHanded) { - FString Instructions{UTF8_TO_TCHAR(FHandLayerType::GetCalibrationInstructions(bRightHanded).c_str())}; - return MoveTemp(Instructions); + const FString Instructions{UTF8_TO_TCHAR(FHandLayerType::GetCalibrationInstructions(bRightHanded).c_str())}; + return Instructions; } void FSGHandLayerImpl::ResetCalibration(const bool bRightHanded) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp index 85146fb4..476cf3b0 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp @@ -205,28 +205,28 @@ bool FSGHandPoseImpl::IsRight() const TArray> FSGHandPoseImpl::GetJointPositions() const { - TArray> JointPositions{ + const TArray> JointPositions{ FSGArrayUtils::FromMillimeters( Pimpl->HandPose.GetJointPositions()) }; - return MoveTemp(JointPositions); + return JointPositions; } TArray> FSGHandPoseImpl::GetJointRotations() const { - TArray> JointRotations{ + const TArray> JointRotations{ FSGArrayUtils::FromStdVector( Pimpl->HandPose.GetJointRotations()) }; - return MoveTemp(JointRotations); + return JointRotations; } TArray> FSGHandPoseImpl::GetHandAngles() const { - TArray> HandAngles{ + const TArray> HandAngles{ FSGArrayUtils::FromSenseGloveAngles(Pimpl->HandPose.GetHandAngles()) }; - return MoveTemp(HandAngles); + return HandAngles; } bool FSGHandPoseImpl::Equals(const FSGHandPoseImpl& HandPoseImpl) const @@ -241,22 +241,22 @@ float FSGHandPoseImpl::GetNormalizedFlexion(ESGFinger Finger, bool bClamp01) con TArray FSGHandPoseImpl::GetNormalizedFlexion(bool bClamp01) const { - TArray NormalizedFlexion{ + const TArray NormalizedFlexion{ FSGArrayUtils::FromStdVector(Pimpl->HandPose.GetNormalizedFlexion(bClamp01)) }; - return MoveTemp(NormalizedFlexion); + return NormalizedFlexion; } FString FSGHandPoseImpl::ToString(bool bShortFormat) const { - FString String(UTF8_TO_TCHAR(Pimpl->HandPose.ToString(bShortFormat).c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(Pimpl->HandPose.ToString(bShortFormat).c_str())); + return String; } FString FSGHandPoseImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->HandPose.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized(UTF8_TO_TCHAR(Pimpl->HandPose.Serialize().c_str())); + return Serialized; } FSGHandPoseImpl::FImpl::FImpl(FSGHandPoseImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticChannelInfoImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticChannelInfoImpl.cpp index 5cedaaff..291af92d 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticChannelInfoImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticChannelInfoImpl.cpp @@ -72,16 +72,16 @@ struct FSGHapticChannelInfoImpl::FImpl FString FSGHapticChannelInfoImpl::GenerateAddress(const int32 DeviceIndex, const int32 ChannelIndex) { - FString Address{UTF8_TO_TCHAR(FHapticChannelInfoType::GenerateAddress(DeviceIndex, ChannelIndex).c_str())}; - return MoveTemp(Address); + const FString Address{UTF8_TO_TCHAR(FHapticChannelInfoType::GenerateAddress(DeviceIndex, ChannelIndex).c_str())}; + return Address; } FSGHapticChannelInfoImpl FSGHapticChannelInfoImpl::Parse(const FString& IpcString) { std::string IpcStdString{TCHAR_TO_UTF8(*IpcString)}; FHapticChannelInfoType HapticChannelInfo{FHapticChannelInfoType::Parse(MoveTemp(IpcStdString))}; - FSGHapticChannelInfoImpl HapticChannelInfoImpl{MoveTemp(HapticChannelInfo)}; - return MoveTemp(HapticChannelInfoImpl); + const FSGHapticChannelInfoImpl HapticChannelInfoImpl{MoveTemp(HapticChannelInfo)}; + return HapticChannelInfoImpl; } int32 FSGHapticChannelInfoImpl::GetStreamingType() @@ -162,13 +162,13 @@ int32 FSGHapticChannelInfoImpl::GetTotalChannelCount() const FString FSGHapticChannelInfoImpl::GetAddress_Unguarded(const ESGHapticChannelType Type, const int32 TypeIndex) const { - FString Address{ + const FString Address{ UTF8_TO_TCHAR( Pimpl->HapticChannelInfo.GetAddress_Unguarded( FSGCoreEnumCast::ToEHapticChannelType(Type), TypeIndex).c_str( )) }; - return MoveTemp(Address); + return Address; } void FSGHapticChannelInfoImpl::GetIpcParams_Unguarded( @@ -187,10 +187,10 @@ void FSGHapticChannelInfoImpl::RegenerateAddresses(const int32 ForDeviceIndex) TArray FSGHapticChannelInfoImpl::GetAllAddresses() const { - TArray AddressesArray{ + const TArray AddressesArray{ FSGArrayUtils::FromStdVector(Pimpl->HapticChannelInfo.GetAllAddresses()) }; - return MoveTemp(AddressesArray); + return AddressesArray; } FSGHapticChannelInfoImpl::FImpl::FImpl(FSGHapticChannelInfoImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp index 905a5928..a4f470a6 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp @@ -88,7 +88,7 @@ TArray> FSGHapticGloveImpl::GetHapticGloves(const HapticGloveImpls.Push(MoveTemp(HapticGloveImpl)); } - return MoveTemp(HapticGloveImpls); + return HapticGloveImpls; } bool FSGHapticGloveImpl::GetGlove(TSharedPtr& OutGlove) @@ -119,18 +119,18 @@ bool FSGHapticGloveImpl::GetGlove(const bool bRightHanded, TSharedPtrGetDeviceId().c_str())}; - return MoveTemp(Id); + const FString Id{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->GetDeviceId().c_str())}; + return Id; } FString FSGHapticGloveImpl::GetHardwareVersion() const { - FString Version{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->GetHardwareVersion().c_str())}; - return MoveTemp(Version); + const FString Version{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->GetHardwareVersion().c_str())}; + return Version; } int32 FSGHapticGloveImpl::GetFirmwareVersion() const @@ -270,8 +270,8 @@ void FSGHapticGloveImpl::ResetCalibration() FString FSGHapticGloveImpl::GetCalibrationInstruction() const { - FString Instruction{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->GetCalibrationInstruction().c_str())}; - return MoveTemp(Instruction); + const FString Instruction{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->GetCalibrationInstruction().c_str())}; + return Instruction; } void FSGHapticGloveImpl::StopHaptics() @@ -360,8 +360,8 @@ void FSGHapticGloveImpl::GetGloveLocation(const FVector& ReferencePosition, cons FString FSGHapticGloveImpl::ToString() const { - FString String{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->ToString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(ToHapticGlovePtrChecked()->ToString().c_str())}; + return String; } FSGHapticGloveImpl::FImpl::FImpl(FSGHapticGloveImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp index 9457ac04..969d9842 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp @@ -199,20 +199,20 @@ bool FSGInterpolationSetImpl::Equals(const FSGInterpolationSetImpl& Interpolatio FString FSGInterpolationSetImpl::ToString() const { - FString String(UTF8_TO_TCHAR(Pimpl->InterpolationSet.ToString().c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(Pimpl->InterpolationSet.ToString().c_str())); + return String; } FString FSGInterpolationSetImpl::ToString(const bool bLimits) const { - FString String(UTF8_TO_TCHAR(Pimpl->InterpolationSet.ToString(bLimits).c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(Pimpl->InterpolationSet.ToString(bLimits).c_str())); + return String; } FString FSGInterpolationSetImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->InterpolationSet.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized(UTF8_TO_TCHAR(Pimpl->InterpolationSet.Serialize().c_str())); + return Serialized; } FSGInterpolationSetImpl::FImpl::FImpl(FSGInterpolationSetImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp index fb6aaec9..77551559 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveImpl.cpp @@ -92,20 +92,21 @@ TSharedRef FSGNova2GloveImpl::Parse(const FString& ConstantsStrin std::string ConstantsStdString{TCHAR_TO_UTF8(*ConstantsString)}; FSGDevicePtrType SGDevicePtr{FNova2GloveType::Parse(MoveTemp(ConstantsStdString))}; ensureAlwaysMsgf(SGDevicePtr, TEXT("Invalid SGDevice!")); - TSharedRef Nova2GloveImpl{MakeShared( - std::dynamic_pointer_cast(MoveTemp(SGDevicePtr)))}; - return MoveTemp(Nova2GloveImpl); + const TSharedRef Nova2GloveImpl{ + MakeShared(std::dynamic_pointer_cast(MoveTemp(SGDevicePtr))) + }; + return Nova2GloveImpl; } TArray FSGNova2GloveImpl::GetNova2Gloves() { FNova2GloveVectorType Vector{FNova2GloveType::GetNova2Gloves()}; - TArray Array{ + const TArray Array{ FSGArrayUtils::FromStdVector(MoveTemp(Vector)) }; - return MoveTemp(Array); + return Array; } @@ -177,11 +178,11 @@ const TArray& FSGNova2GloveImpl::GetNova2SensorRanges() TArray FSGNova2GloveImpl::ToNormalizedValues(const FSGNova2GloveSensorDataImpl& SensorData) { - TArray NormalizedValues{ + const TArray NormalizedValues{ FSGArrayUtils::FromStdVector( FNova2GloveType::ToNormalizedValues(SensorData.ToNova2GloveSensorData())) }; - return MoveTemp(NormalizedValues); + return NormalizedValues; } TArray> FSGNova2GloveImpl::CalculateHandAngles( @@ -189,13 +190,13 @@ TArray> FSGNova2GloveImpl::CalculateHandAngles( { std::vector NormalizedValuesVector{FSGArrayUtils::ToStdVector(NormalizedValues)}; - TArray> Angles{ + const TArray> Angles{ FSGArrayUtils::FromSenseGloveAngles( FNova2GloveType::CalculateHandAngles( MoveTemp(NormalizedValuesVector), Interpolator.ToHandInterpolator(), bInfluenceIndex)) }; - return MoveTemp(Angles); + return Angles; } TArray> FSGNova2GloveImpl::ToNormalizedAngles( @@ -203,23 +204,23 @@ TArray> FSGNova2GloveImpl::ToNormalizedAngles( { std::vector NormalizedDataVector{FSGArrayUtils::ToStdVector(NormalizedData)}; - TArray> Angles{ + const TArray> Angles{ FSGArrayUtils::FromSenseGloveAngles( FNova2GloveType::ToNormalizedAngles(MoveTemp(NormalizedDataVector), GloveInfo.ToNovaGloveInfo())) }; - return MoveTemp(Angles); + return Angles; } TArray FSGNova2GloveImpl::ToNormalizedValues(const FSGNova2GloveSensorDataImpl& SensorData, FSGSensorNormalizationImpl& OutSensorNormalizer) { - TArray NormalizedValues{ + const TArray NormalizedValues{ FSGArrayUtils::FromStdVector( FNova2GloveType::ToNormalizedValues(SensorData.ToNova2GloveSensorData(), OutSensorNormalizer.ToSensorNormalization())) }; - return MoveTemp(NormalizedValues); + return NormalizedValues; } FSGNova2GloveImpl::FSGNova2GloveImpl() @@ -461,8 +462,8 @@ void FSGNova2GloveImpl::GetWristLocation(const FVector& ReferencePosition, const FSGNovaGloveInfoImpl FSGNova2GloveImpl::GetGloveInfo() const { - FSGNovaGloveInfoImpl GloveInfo{ToNova2GlovePtrChecked()->GetGloveInfo()}; - return MoveTemp(GloveInfo); + const FSGNovaGloveInfoImpl GloveInfo{ToNova2GlovePtrChecked()->GetGloveInfo()}; + return GloveInfo; } bool FSGNova2GloveImpl::DoesIndexInfluenceOthers() const @@ -532,8 +533,8 @@ bool FSGNova2GloveImpl::SendCustomWaveform_Nova2(FSGCustomWaveformImpl& OutWavef FString FSGNova2GloveImpl::ToString() const { - FString String{UTF8_TO_TCHAR(ToNova2GlovePtrChecked()->ToString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(ToNova2GlovePtrChecked()->ToString().c_str())}; + return String; } FSGNova2GloveImpl::FImpl::FImpl(FSGNova2GloveImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveSensorDataImpl.cpp index d45da6bc..06898770 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNova2GloveSensorDataImpl.cpp @@ -82,11 +82,10 @@ FSGNova2GloveSensorDataImpl FSGNova2GloveSensorDataImpl::Parse(const FString& Ra const FSGNovaGloveInfoImpl& GloveInfo) { std::string RawDataString(TCHAR_TO_UTF8(*RawData)); - FSGNova2GloveSensorDataImpl SensorData{ - FNova2GloveSensorDataType::Parse( - MoveTemp(RawDataString), GloveInfo.ToNovaGloveInfo()) + const FSGNova2GloveSensorDataImpl SensorData{ + FNova2GloveSensorDataType::Parse(MoveTemp(RawDataString), GloveInfo.ToNovaGloveInfo()) }; - return MoveTemp(SensorData); + return SensorData; } FSGNova2GloveSensorDataImpl::FSGNova2GloveSensorDataImpl() @@ -149,11 +148,11 @@ ESGNormalizationState FSGNova2GloveSensorDataImpl::GetSensorState() const TArray> FSGNova2GloveSensorDataImpl::GetSensorValues() const { - TArray> SensorValues{ + const TArray> SensorValues{ FSGArrayUtils::FromStdVector( Pimpl->Nova2GloveSensorData.GetSensorValues()) }; - return MoveTemp(SensorValues); + return SensorValues; } float FSGNova2GloveSensorDataImpl::GetSensorValue(const ESGFinger Finger, const ESGNova2SensorLocation Location) const @@ -194,8 +193,8 @@ bool FSGNova2GloveSensorDataImpl::Equals(const FSGNova2GloveSensorDataImpl& Nova FString FSGNova2GloveSensorDataImpl::ToString() const { - FString String(UTF8_TO_TCHAR(Pimpl->Nova2GloveSensorData.ToString().c_str())); - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->Nova2GloveSensorData.ToString().c_str())}; + return String; } FSGNova2GloveSensorDataImpl::FImpl::FImpl(FSGNova2GloveSensorDataImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp index 64023bfd..3b06e8cb 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp @@ -94,17 +94,17 @@ TSharedRef FSGNovaGloveImpl::Parse(const FString& ConstantsString std::string ConstantsStdString{TCHAR_TO_UTF8(*ConstantsString)}; FSGDevicePtrType SGDevicePtr{FNovaGloveType::Parse(MoveTemp(ConstantsStdString))}; ensureAlwaysMsgf(SGDevicePtr, TEXT("Invalid SGDevice!")); - TSharedRef NovaGloveImpl{MakeShared( + const TSharedRef NovaGloveImpl{MakeShared( std::dynamic_pointer_cast(MoveTemp(SGDevicePtr)))}; - return MoveTemp(NovaGloveImpl); + return NovaGloveImpl; } TArray FSGNovaGloveImpl::GetNovaGloves() { - TArray Gloves{ + const TArray Gloves{ FSGArrayUtils::FromStdVector(FNovaGloveType::GetNovaGloves()) }; - return MoveTemp(Gloves); + return Gloves; } bool FSGNovaGloveImpl::GetNovaGlove(FSGNovaGloveImpl& OutGlove) @@ -187,22 +187,22 @@ const TArray& FSGNovaGloveImpl::GetNovaSensorRanges() TArray FSGNovaGloveImpl::ToNormalizedValues(const FSGNovaGloveSensorDataImpl& SensorData) { - TArray NormalizedValues{ + const TArray NormalizedValues{ FSGArrayUtils::FromStdVector( FNovaGloveType::ToNormalizedValues(SensorData.ToNovaGloveSensorData())) }; - return MoveTemp(NormalizedValues); + return NormalizedValues; } TArray FSGNovaGloveImpl::ToNormalizedValues(const FSGNovaGloveSensorDataImpl& SensorData, FSGSensorNormalizationImpl& OutSensorNormalizer) { - TArray NormalizedValues{ + const TArray NormalizedValues{ FSGArrayUtils::FromStdVector( FNovaGloveType::ToNormalizedValues(SensorData.ToNovaGloveSensorData(), OutSensorNormalizer.ToSensorNormalization())) }; - return MoveTemp(NormalizedValues); + return NormalizedValues; } TArray> FSGNovaGloveImpl::CalculateHandAngles( @@ -210,30 +210,30 @@ TArray> FSGNovaGloveImpl::CalculateHandAngles( { std::vector NormalizedValuesVector{FSGArrayUtils::ToStdVector(NormalizedValues)}; - TArray> Angles{ + const TArray> Angles{ FSGArrayUtils::FromSenseGloveAngles( FNovaGloveType::CalculateHandAngles(MoveTemp(NormalizedValuesVector), Interpolator.ToHandInterpolator())) }; - return MoveTemp(Angles); + return Angles; } FString FSGNovaGloveImpl::ToNovaCommandAsFlexion(const FSGThresholdCommandImpl& Thresholds) { - FString Flexion{ + const FString Flexion{ UTF8_TO_TCHAR(FNovaGloveType::ToNovaCommandAsFlexion(Thresholds.ToThresholdCommand()).c_str()) }; - return MoveTemp(Flexion); + return Flexion; } FString FSGNovaGloveImpl::ToNovaCommandAsRaw( const FSGThresholdCommandImpl& Thresholds, const FSGSensorNormalizationImpl& Interpolator) { - FString Raw{ + const FString Raw{ UTF8_TO_TCHAR(FNovaGloveType::ToNovaCommandAsRaw(Thresholds.ToThresholdCommand(), Interpolator.ToSensorNormalization()).c_str()) }; - return MoveTemp(Raw); + return Raw; } FSGNovaGloveImpl::FSGNovaGloveImpl() @@ -305,14 +305,14 @@ ESGDeviceType FSGNovaGloveImpl::GetDeviceType() const FString FSGNovaGloveImpl::GetDeviceId() const { - FString Id{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->GetDeviceId().c_str())}; - return MoveTemp(Id); + const FString Id{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->GetDeviceId().c_str())}; + return Id; } FString FSGNovaGloveImpl::GetHardwareVersion() const { - FString Version{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->GetHardwareVersion().c_str())}; - return MoveTemp(Version); + const FString Version{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->GetHardwareVersion().c_str())}; + return Version; } int32 FSGNovaGloveImpl::GetFirmwareVersion() const @@ -464,8 +464,8 @@ void FSGNovaGloveImpl::GetWristLocation(const FVector& ReferencePosition, const FSGNovaGloveInfoImpl FSGNovaGloveImpl::GetGloveInfo() const { - FSGNovaGloveInfoImpl GloveInfo{ToNovaGlovePtrChecked()->GetGloveInfo()}; - return MoveTemp(GloveInfo); + const FSGNovaGloveInfoImpl GloveInfo{ToNovaGlovePtrChecked()->GetGloveInfo()}; + return GloveInfo; } bool FSGNovaGloveImpl::SupportsThresholds() const @@ -504,9 +504,11 @@ FString FSGNovaGloveImpl::ToNovaCommand( { std::vector ForceFeedbackLevelsVector{FSGArrayUtils::ToStdVector(ForceFeedbackLevels)}; std::vector BuzzLevelsVector{FSGArrayUtils::ToStdVector(BuzzLevels)}; - FString Command{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->ToNovaCommand( - MoveTemp(ForceFeedbackLevelsVector), MoveTemp(BuzzLevelsVector), WristLevel).c_str())}; - return MoveTemp(Command); + const FString Command{ + UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->ToNovaCommand( + MoveTemp(ForceFeedbackLevelsVector), MoveTemp(BuzzLevelsVector), WristLevel).c_str()) + }; + return Command; } bool FSGNovaGloveImpl::QueueVibroLevels(const TArray& Amplitudes) @@ -566,8 +568,8 @@ bool FSGNovaGloveImpl::QueueClearThreshold(const int32 Finger) FString FSGNovaGloveImpl::ToString() const { - FString String{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->ToString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(ToNovaGlovePtrChecked()->ToString().c_str())}; + return String; } FSGNovaGloveImpl::FImpl::FImpl(FSGNovaGloveImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp index 70927f3e..a5be4b0f 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp @@ -157,11 +157,11 @@ ESGNormalizationState FSGNovaGloveSensorDataImpl::GetSensorState() const TArray FSGNovaGloveSensorDataImpl::GetSensorValues() const { - TArray SensorValues{ + const TArray SensorValues{ FSGArrayUtils::FromStdVector( Pimpl->NovaGloveSensorData.GetSensorValues()) }; - return MoveTemp(SensorValues); + return SensorValues; } float FSGNovaGloveSensorDataImpl::GetSensorValue(const ESGFinger Finger, const ESGNovaSensorLocation Location) const @@ -202,14 +202,14 @@ bool FSGNovaGloveSensorDataImpl::Equals(const FSGNovaGloveSensorDataImpl& NovaGl FString FSGNovaGloveSensorDataImpl::ToString() const { - FString String(UTF8_TO_TCHAR(Pimpl->NovaGloveSensorData.ToString().c_str())); - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->NovaGloveSensorData.ToString().c_str())}; + return String; } FString FSGNovaGloveSensorDataImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->NovaGloveSensorData.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized{UTF8_TO_TCHAR(Pimpl->NovaGloveSensorData.Serialize().c_str())}; + return Serialized; } FSGNovaGloveSensorDataImpl::FImpl::FImpl(FSGNovaGloveSensorDataImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp index 734ea5b0..060d4483 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp @@ -92,20 +92,21 @@ TSharedRef FSGSenseGloveImpl::Parse(const FString& ConstantsStrin std::string ConstantsStdString{TCHAR_TO_UTF8(*ConstantsString)}; FSGDevicePtrType SGDevicePtr{FSenseGloveType::Parse(MoveTemp(ConstantsStdString))}; ensureAlwaysMsgf(SGDevicePtr, TEXT("Invalid SGDevice!")); - TSharedRef SenseGloveImpl{MakeShared( - std::dynamic_pointer_cast(MoveTemp(SGDevicePtr)))}; - return MoveTemp(SenseGloveImpl); + const TSharedRef SenseGloveImpl{ + MakeShared(std::dynamic_pointer_cast(MoveTemp(SGDevicePtr))) + }; + return SenseGloveImpl; } TArray FSGSenseGloveImpl::GetSenseGloves() { FSenseGloveVectorType Vector{FSenseGloveType::GetSenseGloves()}; - TArray Array{ + const TArray Array{ FSGArrayUtils::FromStdVector(MoveTemp(Vector)) }; - return MoveTemp(Array); + return Array; } bool FSGSenseGloveImpl::GetSenseGlove(FSGSenseGloveImpl& OutGlove) @@ -189,10 +190,10 @@ const FVector& FSGSenseGloveImpl::GetDefaultThimbleOffset() FSGSenseGlovePoseImpl FSGSenseGloveImpl::CalculateGlovePose(const FSGSenseGloveSensorDataImpl& SensorData, const FSGSenseGloveInfoImpl& GloveModel) { - FSGSenseGlovePoseImpl Pose{ + const FSGSenseGlovePoseImpl Pose{ FSenseGloveType::CalculateGlovePose(SensorData.ToSenseGloveSensorData(), GloveModel.ToSenseGloveInfo()) }; - return MoveTemp(Pose); + return Pose; } FSGSenseGlovePoseImpl FSGSenseGloveImpl::CalculateGlovePose(const TArray>& GloveAngles, @@ -202,11 +203,11 @@ FSGSenseGlovePoseImpl FSGSenseGloveImpl::CalculateGlovePose(const TArray(GloveAngles) }; - FSGSenseGlovePoseImpl Pose{ + const FSGSenseGlovePoseImpl Pose{ FSenseGloveType::CalculateGlovePose(MoveTemp(GloveAnglesVector), GloveModel.ToSenseGloveInfo()) }; - return MoveTemp(Pose); + return Pose; } void FSGSenseGloveImpl::NormalizeValues( @@ -326,14 +327,14 @@ ESGDeviceType FSGSenseGloveImpl::GetDeviceType() const FString FSGSenseGloveImpl::GetDeviceId() const { - FString Id{UTF8_TO_TCHAR(ToSenseGlovePtrChecked()->GetDeviceId().c_str())}; - return MoveTemp(Id); + const FString Id{UTF8_TO_TCHAR(ToSenseGlovePtrChecked()->GetDeviceId().c_str())}; + return Id; } FString FSGSenseGloveImpl::GetHardwareVersion() const { - FString Version{UTF8_TO_TCHAR(ToSenseGlovePtrChecked()->GetHardwareVersion().c_str())}; - return MoveTemp(Version); + const FString Version{UTF8_TO_TCHAR(ToSenseGlovePtrChecked()->GetHardwareVersion().c_str())}; + return Version; } int32 FSGSenseGloveImpl::GetFirmwareVersion() const @@ -509,16 +510,16 @@ void FSGSenseGloveImpl::GetWristLocation( FSGSenseGloveInfoImpl FSGSenseGloveImpl::GetGloveInfo() const { FSGSenseGloveInfoImpl GloveInfo{ToSenseGlovePtr()->GetGloveInfo()}; - return MoveTemp(GloveInfo); + return GloveInfo; } TArray FSGSenseGloveImpl::GetFingerThimbleOffsets() const { - TArray Offsets{ + const TArray Offsets{ FSGArrayUtils::FromStdVector( ToSenseGlovePtrChecked()->GetFingerThimbleOffsets()) }; - return MoveTemp(Offsets); + return Offsets; } void FSGSenseGloveImpl::SetFingerThimbleOffset(const int32 Finger, const FVector& Offset) @@ -568,8 +569,8 @@ bool FSGSenseGloveImpl::QueueThumperCommand(const ESGSenseGloveThumperCommand Co FString FSGSenseGloveImpl::ToString() const { - FString String{UTF8_TO_TCHAR(ToSenseGlovePtrChecked()->ToString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(ToSenseGlovePtrChecked()->ToString().c_str())}; + return String; } FSGSenseGloveImpl::FImpl::FImpl(FSGSenseGloveImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp index 9786ae6b..64b01558 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp @@ -170,14 +170,14 @@ const FSGSenseGloveInfoImpl::FSenseGloveInfoType& FSGSenseGloveInfoImpl::ToSense FString FSGSenseGloveInfoImpl::GetDeviceId() const { - FString DeviceId(UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.GetDeviceId().c_str())); - return MoveTemp(DeviceId); + const FString DeviceId{UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.GetDeviceId().c_str())}; + return DeviceId; } FString FSGSenseGloveInfoImpl::GetHardwareVersion() const { - FString HardwareVersion(UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.GetHardwareVersion().c_str())); - return MoveTemp(HardwareVersion); + const FString HardwareVersion{UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.GetHardwareVersion().c_str())}; + return HardwareVersion; } int32 FSGSenseGloveInfoImpl::GetFirmwareVersion() const @@ -202,54 +202,55 @@ int32 FSGSenseGloveInfoImpl::GetNumberOfSensors() const FQuat FSGSenseGloveInfoImpl::GetImuCorrection() const { - FQuat ImuCorrection(FSGQuatImpl(Pimpl->SenseGloveInfo.GetImuCorrection()).ToFQuat()); - return MoveTemp(ImuCorrection); + const FQuat ImuCorrection{FSGQuatImpl(Pimpl->SenseGloveInfo.GetImuCorrection()).ToFQuat()}; + return ImuCorrection; } TArray FSGSenseGloveInfoImpl::GetStartPositions() const { - TArray StartPositionsArray{ + const TArray StartPositionsArray{ FSGArrayUtils::FromMillimeters( Pimpl->SenseGloveInfo.GetStartPositions())}; - return MoveTemp(StartPositionsArray); + return StartPositionsArray; } TArray FSGSenseGloveInfoImpl::GetStartRotations() const { - TArray StartRotationsArray{ + const TArray StartRotationsArray{ FSGArrayUtils::FromStdVector( Pimpl->SenseGloveInfo.GetStartRotations())}; - return MoveTemp(StartRotationsArray); + return StartRotationsArray; } TArray> FSGSenseGloveInfoImpl::GetGloveLengths() const { - TArray> GloveLengths{ + const TArray> GloveLengths{ FSGArrayUtils::FromMillimeters( Pimpl->SenseGloveInfo.GetGloveLengths()) }; - return MoveTemp(GloveLengths); + return GloveLengths; } TArray FSGSenseGloveInfoImpl::GetFunctions() const { - TArray FunctionsArray{FSGArrayUtils::FromStdVector(Pimpl->SenseGloveInfo.GetFunctions())}; - return MoveTemp(FunctionsArray); + const TArray FunctionsArray{FSGArrayUtils::FromStdVector(Pimpl->SenseGloveInfo.GetFunctions())}; + return FunctionsArray; } FVector FSGSenseGloveInfoImpl::GetStartPosition(const ESGFinger Finger) const { - FVector StartPosition{FSGUnits::MillimetersToCentimeters( - Pimpl->SenseGloveInfo.GetStartPosition(FSGCoreEnumCast::ToEFinger(Finger))) + const FVector StartPosition{ + FSGUnits::MillimetersToCentimeters( + Pimpl->SenseGloveInfo.GetStartPosition(FSGCoreEnumCast::ToEFinger(Finger))) }; - return MoveTemp(StartPosition); + return StartPosition; } FQuat FSGSenseGloveInfoImpl::GetStartRotation(const ESGFinger Finger) const { - FQuat StartRotation(FSGQuatImpl(Pimpl->SenseGloveInfo.GetStartRotation( - FSGCoreEnumCast::ToEFinger(Finger))).ToFQuat()); - return MoveTemp(StartRotation); + const FQuat StartRotation( + FSGQuatImpl(Pimpl->SenseGloveInfo.GetStartRotation(FSGCoreEnumCast::ToEFinger(Finger))).ToFQuat()); + return StartRotation; } TArray FSGSenseGloveInfoImpl::GetGloveLengths(const ESGFinger Finger) const @@ -257,10 +258,10 @@ TArray FSGSenseGloveInfoImpl::GetGloveLengths(const ESGFinger Finger) c std::vector GloveLengthsVector{ Pimpl->SenseGloveInfo.GetGloveLengths(FSGCoreEnumCast::ToEFinger(Finger)) }; - TArray GloveLengthsArray{ + const TArray GloveLengthsArray{ FSGArrayUtils::FromMillimeters(MoveTemp(GloveLengthsVector)) }; - return MoveTemp(GloveLengthsArray); + return GloveLengthsArray; } TArray> FSGSenseGloveInfoImpl::ToGloveAngles(const TArray>& SensorAngles) const @@ -270,11 +271,11 @@ TArray> FSGSenseGloveInfoImpl::ToGloveAngles(const TArray> SensorAnglesVector{ FSGArrayUtils::ToStdVector(SensorAngles) }; - TArray> GloveAngles{ + const TArray> GloveAngles{ FSGArrayUtils::FromSenseGloveAngles( Pimpl->SenseGloveInfo.ToGloveAngles(MoveTemp((SensorAnglesVector)))) }; - return MoveTemp(GloveAngles); + return GloveAngles; } bool FSGSenseGloveInfoImpl::Equals(const FSGSenseGloveInfoImpl& SGSenseGloveInfo, const bool bGeometryOnly) const @@ -284,20 +285,20 @@ bool FSGSenseGloveInfoImpl::Equals(const FSGSenseGloveInfoImpl& SGSenseGloveInfo FString FSGSenseGloveInfoImpl::ToString(const bool bShortNotation) const { - FString String(UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.ToString(bShortNotation).c_str())); - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.ToString(bShortNotation).c_str())}; + return String; } FString FSGSenseGloveInfoImpl::ToString() const { - FString String(UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.ToString().c_str())); - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.ToString().c_str())}; + return String; } FString FSGSenseGloveInfoImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized{UTF8_TO_TCHAR(Pimpl->SenseGloveInfo.Serialize().c_str())}; + return Serialized; } FSGSenseGloveInfoImpl::FImpl::FImpl(FSGSenseGloveInfoImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp index b1891fd9..d6682487 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp @@ -79,15 +79,15 @@ struct FSGSenseGlovePoseImpl::FImpl FSGSenseGlovePoseImpl FSGSenseGlovePoseImpl::IdlePose(const FSGSenseGloveInfoImpl& GloveInfo) { - FSGSenseGlovePoseImpl GlovePoseImpl(FSenseGlovePoseType::IdlePose(GloveInfo.ToSenseGloveInfo())); - return MoveTemp(GlovePoseImpl); + const FSGSenseGlovePoseImpl GlovePoseImpl{FSenseGlovePoseType::IdlePose(GloveInfo.ToSenseGloveInfo())}; + return GlovePoseImpl; } FSGSenseGlovePoseImpl FSGSenseGlovePoseImpl::Deserialize(const FString& SerializedString) { - std::string Serialized(TCHAR_TO_UTF8(*SerializedString)); - FSGSenseGlovePoseImpl GlovePose(FSenseGlovePoseType::Deserialize(MoveTemp(Serialized))); - return MoveTemp(GlovePose); + std::string Serialized{TCHAR_TO_UTF8(*SerializedString)}; + const FSGSenseGlovePoseImpl GlovePose{FSenseGlovePoseType::Deserialize(MoveTemp(Serialized))}; + return GlovePose; } FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl() @@ -155,55 +155,55 @@ bool FSGSenseGlovePoseImpl::IsRight() const TArray> FSGSenseGlovePoseImpl::GetJointPositions() const { - TArray> JointPositions{ + const TArray> JointPositions{ FSGArrayUtils::FromMillimeters( Pimpl->SenseGlovePose.GetJointPositions()) }; - return MoveTemp(JointPositions); + return JointPositions; } TArray> FSGSenseGlovePoseImpl::GetJointRotations() const { - TArray> JointRotations{ + const TArray> JointRotations{ FSGArrayUtils::FromStdVector( Pimpl->SenseGlovePose.GetJointRotations()) }; - return MoveTemp(JointRotations); + return JointRotations; } TArray> FSGSenseGlovePoseImpl::GetGloveAngles() const { - TArray> GloveAngles{ + const TArray> GloveAngles{ FSGArrayUtils::FromSenseGloveAngles( Pimpl->SenseGlovePose.GetGloveAngles()) }; - return MoveTemp(GloveAngles); + return GloveAngles; } TArray FSGSenseGlovePoseImpl::GetThimblePositions() const { - TArray ThimblePositions{ + const TArray ThimblePositions{ FSGArrayUtils::FromMillimeters( Pimpl->SenseGlovePose.GetThimblePositions()) }; - return MoveTemp(ThimblePositions); + return ThimblePositions; } TArray FSGSenseGlovePoseImpl::GetThimbleRotations() const { - TArray ThimbleRotations{ + const TArray ThimbleRotations{ FSGArrayUtils::FromStdVector( Pimpl->SenseGlovePose.GetThimbleRotations()) }; - return MoveTemp(ThimbleRotations); + return ThimbleRotations; } TArray FSGSenseGlovePoseImpl::GetTotalGloveAngles() const { - TArray TotalGloveAngles{ + const TArray TotalGloveAngles{ FSGArrayUtils::FromSenseGloveAngles(Pimpl->SenseGlovePose.GetTotalGloveAngles()) }; - return MoveTemp(TotalGloveAngles); + return TotalGloveAngles; } TArray FSGSenseGlovePoseImpl::CalculateFingertips(const TArray& FingerOffsets) const @@ -211,11 +211,11 @@ TArray FSGSenseGlovePoseImpl::CalculateFingertips(const TArray std::vector FingerOffsetsVector{ FSGArrayUtils::ToMillimeters(FingerOffsets) }; - TArray Fingertips{ + const TArray Fingertips{ FSGArrayUtils::FromMillimeters( Pimpl->SenseGlovePose.CalculateFingertips(MoveTemp(FingerOffsetsVector))) }; - return MoveTemp(Fingertips); + return Fingertips; } bool FSGSenseGlovePoseImpl::Equals(const FSGSenseGlovePoseImpl& SenseGlovePoseImpl) const @@ -225,14 +225,14 @@ bool FSGSenseGlovePoseImpl::Equals(const FSGSenseGlovePoseImpl& SenseGlovePoseIm FString FSGSenseGlovePoseImpl::ToString(const bool bShortFormat) const { - FString String(UTF8_TO_TCHAR(Pimpl->SenseGlovePose.ToString(bShortFormat).c_str())); - return MoveTemp(String); + const FString String(UTF8_TO_TCHAR(Pimpl->SenseGlovePose.ToString(bShortFormat).c_str())); + return String; } FString FSGSenseGlovePoseImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->SenseGlovePose.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized(UTF8_TO_TCHAR(Pimpl->SenseGlovePose.Serialize().c_str())); + return Serialized; } FSGSenseGlovePoseImpl::FImpl::FImpl(FSGSenseGlovePoseImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp index a8cc45a5..6859b80c 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp @@ -78,7 +78,7 @@ struct FSGSenseGloveSensorDataImpl::FImpl const FSGSenseGloveSensorDataImpl& FSGSenseGloveSensorDataImpl::Empty() { - static const FSGSenseGloveSensorDataImpl EmptyData(FSenseGloveSensorDataType::Empty()); + static const FSGSenseGloveSensorDataImpl EmptyData{FSenseGloveSensorDataType::Empty()}; return EmptyData; } @@ -86,15 +86,16 @@ FSGSenseGloveSensorDataImpl FSGSenseGloveSensorDataImpl::Parse(const FString& Ra const FSGSenseGloveInfoImpl& GloveInfo) { std::string RawDataString(TCHAR_TO_UTF8(*RawData)); - const FSGSenseGloveSensorDataImpl SensorData(FSenseGloveSensorDataType::Parse( - MoveTemp(RawDataString), GloveInfo.ToSenseGloveInfo())); + const FSGSenseGloveSensorDataImpl SensorData{ + FSenseGloveSensorDataType::Parse(MoveTemp(RawDataString), GloveInfo.ToSenseGloveInfo()) + }; return SensorData; } FSGSenseGloveSensorDataImpl FSGSenseGloveSensorDataImpl::Deserialize(const FString& SerializedString) { - std::string Serialized(TCHAR_TO_UTF8(*SerializedString)); - const FSGSenseGloveSensorDataImpl SensorData(FSenseGloveSensorDataType::Deserialize(MoveTemp(Serialized))); + std::string Serialized{TCHAR_TO_UTF8(*SerializedString)}; + const FSGSenseGloveSensorDataImpl SensorData{FSenseGloveSensorDataType::Deserialize(MoveTemp(Serialized))}; return SensorData; } @@ -147,27 +148,27 @@ const FSGSenseGloveSensorDataImpl::FSenseGloveSensorDataType& FSGSenseGloveSenso TArray> FSGSenseGloveSensorDataImpl::GetSensorAngles() const { - TArray> SensorAngles{ + const TArray> SensorAngles{ FSGArrayUtils::FromSenseGloveAngles(Pimpl->SenseGloveSensorData.GetSensorAngles()) }; - return MoveTemp(SensorAngles); + return SensorAngles; } TArray FSGSenseGloveSensorDataImpl::GetSensorAngles(ESGFinger Finger) const { - TArray SensorAngles{ + const TArray SensorAngles{ FSGArrayUtils::FromStdVector( Pimpl->SenseGloveSensorData.GetSensorAngles(FSGCoreEnumCast::ToEFinger(Finger))) }; - return MoveTemp(SensorAngles); + return SensorAngles; } TArray FSGSenseGloveSensorDataImpl::GetAngleSequence() const { - TArray AngleSequence{ + const TArray AngleSequence{ FSGArrayUtils::FromStdVector(Pimpl->SenseGloveSensorData.GetAngleSequence()) }; - return MoveTemp(AngleSequence); + return AngleSequence; } FQuat FSGSenseGloveSensorDataImpl::GetImuRotation() const @@ -192,14 +193,14 @@ bool FSGSenseGloveSensorDataImpl::Equals(const FSGSenseGloveSensorDataImpl& Sens FString FSGSenseGloveSensorDataImpl::ToString() const { - FString String(UTF8_TO_TCHAR(Pimpl->SenseGloveSensorData.ToString().c_str())); - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->SenseGloveSensorData.ToString().c_str())}; + return String; } FString FSGSenseGloveSensorDataImpl::Serialize() const { - FString Serialized(UTF8_TO_TCHAR(Pimpl->SenseGloveSensorData.Serialize().c_str())); - return MoveTemp(Serialized); + const FString Serialized{UTF8_TO_TCHAR(Pimpl->SenseGloveSensorData.Serialize().c_str())}; + return Serialized; } FSGSenseGloveSensorDataImpl::FImpl::FImpl(FSGSenseGloveSensorDataImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp index 4c9700eb..efa1216b 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveVarsImpl.cpp @@ -50,60 +50,63 @@ FString FSGSenseGloveVarsImpl::GetStandardConstantsString(const FString& HardwareVersion, const float FirmwareVersion, const bool bRightHanded) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - FString String(UTF8_TO_TCHAR(FSenseGloveVarsType::GetStandardConstantsString(MoveTemp(HardwareVersionString), - FirmwareVersion, bRightHanded).c_str())); - return MoveTemp(String); + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + const FString String{ + UTF8_TO_TCHAR(FSenseGloveVarsType::GetStandardConstantsString( + MoveTemp(HardwareVersionString), FirmwareVersion, bRightHanded).c_str()) + }; + return String; } FString FSGSenseGloveVarsImpl::GetSensorString(const FString& HardwareVersion, const float FirmwareVersion) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - FString String(UTF8_TO_TCHAR(FSenseGloveVarsType::GetSensorString(MoveTemp(HardwareVersionString), - FirmwareVersion).c_str())); - return MoveTemp(String); + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + const FString String{ + UTF8_TO_TCHAR(FSenseGloveVarsType::GetSensorString(MoveTemp(HardwareVersionString),FirmwareVersion).c_str()) + }; + return String; } TArray FSGSenseGloveVarsImpl::GetStartPositions(const FString& HardwareVersion, const bool bRightHanded) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - TArray StartPositions{ + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + const TArray StartPositions{ FSGArrayUtils::FromMillimeters( FSenseGloveVarsType::GetStartPositions(MoveTemp(HardwareVersionString), bRightHanded)) }; - return MoveTemp(StartPositions); + return StartPositions; } TArray FSGSenseGloveVarsImpl::GetStartRotations(const FString& HardwareVersion, const bool bRightHanded) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - TArray StartRotations{ + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + const TArray StartRotations{ FSGArrayUtils::FromStdVector( FSenseGloveVarsType::GetStartRotations(MoveTemp(HardwareVersionString), bRightHanded)) }; - return MoveTemp(StartRotations); + return StartRotations; } TArray> FSGSenseGloveVarsImpl::GetGloveLengths(const FString& HardwareVersion) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - TArray> GloveLengths{ + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + const TArray> GloveLengths{ FSGArrayUtils::FromMillimeters( FSenseGloveVarsType::GetGloveLengths(MoveTemp(HardwareVersionString))) }; - return MoveTemp(GloveLengths); + return GloveLengths; } int32 FSGSenseGloveVarsImpl::GetSensors(const FString& HardwareVersion) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; return FSenseGloveVarsType::GetSensors(MoveTemp(HardwareVersionString)); } FQuat FSGSenseGloveVarsImpl::GetImuCorrection(const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; return FSGQuatImpl(FSenseGloveVarsType::GetImuCorrection( MoveTemp(HardwareVersionString), FirmwareVersion, SubFirmwareVersion)).ToFQuat(); } @@ -111,29 +114,33 @@ FQuat FSGSenseGloveVarsImpl::GetImuCorrection(const FString& HardwareVersion, co TArray FSGSenseGloveVarsImpl::GetFunctions(const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - TArray Functions{FSGArrayUtils::FromStdVector(FSenseGloveVarsType::GetFunctions( + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + const TArray Functions{FSGArrayUtils::FromStdVector(FSenseGloveVarsType::GetFunctions( MoveTemp(HardwareVersionString), FirmwareVersion, SubFirmwareVersion)) }; - return MoveTemp(Functions); + return Functions; } -FSGSenseGloveInfoImpl FSGSenseGloveVarsImpl::GenerateGloveModel(const FString& HardwareVersion, - const int32 FirmwareVersion, - const int32 SubFirmwareVersion, const bool bRightHanded) +FSGSenseGloveInfoImpl FSGSenseGloveVarsImpl::GenerateGloveModel( + const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion, + const bool bRightHanded) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - return FSGSenseGloveInfoImpl(FSenseGloveVarsType::GenerateGloveModel( - MoveTemp(HardwareVersionString), FirmwareVersion, SubFirmwareVersion, bRightHanded)); + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + return FSGSenseGloveInfoImpl{ + FSenseGloveVarsType::GenerateGloveModel( + MoveTemp(HardwareVersionString), FirmwareVersion, SubFirmwareVersion, bRightHanded) + }; } -FSGSenseGloveInfoImpl FSGSenseGloveVarsImpl::GenerateGloveModel(const FString& HardwareVersion, - const int32 FirmwareVersion, - const int32 SubFirmwareVersion, const bool bRightHanded, - const FString& CustomId) +FSGSenseGloveInfoImpl FSGSenseGloveVarsImpl::GenerateGloveModel( + const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion, + const bool bRightHanded, const FString& CustomId) { - std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); - std::string CustomIdString(TCHAR_TO_UTF8(*CustomId)); - return FSGSenseGloveInfoImpl(FSenseGloveVarsType::GenerateGloveModel( - MoveTemp(HardwareVersionString), FirmwareVersion, SubFirmwareVersion, bRightHanded, MoveTemp(CustomIdString))); + std::string HardwareVersionString{TCHAR_TO_UTF8(*HardwareVersion)}; + std::string CustomIdString{TCHAR_TO_UTF8(*CustomId)}; + return FSGSenseGloveInfoImpl{ + FSenseGloveVarsType::GenerateGloveModel( + MoveTemp(HardwareVersionString), FirmwareVersion, SubFirmwareVersion, + bRightHanded, MoveTemp(CustomIdString)) + }; } \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorNormalizationImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorNormalizationImpl.cpp index 008bc539..59a4bb9b 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorNormalizationImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorNormalizationImpl.cpp @@ -161,10 +161,10 @@ float FSGSensorNormalizationImpl::NormalizeValue(const float Value, const int32 TArray FSGSensorNormalizationImpl::NormalizeValues(const TArray& Values) { std::vector ValuesVector{FSGArrayUtils::ToStdVector(Values)}; - TArray NormalizedValues{ + const TArray NormalizedValues{ FSGArrayUtils::FromStdVector(Pimpl->SensorNormalization.NormalizeValues(MoveTemp(ValuesVector))) }; - return MoveTemp(NormalizedValues); + return NormalizedValues; } bool FSGSensorNormalizationImpl::MovedEnough(const int32 Index) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThresholdCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThresholdCommandImpl.cpp index 4fd14f1b..1bb555f2 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThresholdCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThresholdCommandImpl.cpp @@ -131,8 +131,8 @@ void FSGThresholdCommandImpl::SetThreshold(const int32 Finger, const float Thres TArray FSGThresholdCommandImpl::GetThresholds() const { - TArray Thresholds{FSGArrayUtils::FromStdVector(Pimpl->ThresholdCommand.GetThresholds())}; - return MoveTemp(Thresholds); + const TArray Thresholds{FSGArrayUtils::FromStdVector(Pimpl->ThresholdCommand.GetThresholds())}; + return Thresholds; } void FSGThresholdCommandImpl::SetThresholds(const TArray& AffectedFingers, const TArray& ThresholdValues) @@ -150,8 +150,8 @@ bool FSGThresholdCommandImpl::GetFingerActive(const int32 Finger) const TArray FSGThresholdCommandImpl::GetActiveFingers() const { - TArray ActiveFingers{FSGArrayUtils::FromStdVector(Pimpl->ThresholdCommand.GetActiveFingers())}; - return MoveTemp(ActiveFingers); + const TArray ActiveFingers{FSGArrayUtils::FromStdVector(Pimpl->ThresholdCommand.GetActiveFingers())}; + return ActiveFingers; } void FSGThresholdCommandImpl::ClearThreshold(const int32 Finger) @@ -171,8 +171,8 @@ bool FSGThresholdCommandImpl::Equals(const FSGThresholdCommandImpl& ThresholdCom FString FSGThresholdCommandImpl::ToString() const { - FString String{UTF8_TO_TCHAR(Pimpl->ThresholdCommand.ToString().c_str())}; - return MoveTemp(String); + const FString String{UTF8_TO_TCHAR(Pimpl->ThresholdCommand.ToString().c_str())}; + return String; } FSGThresholdCommandImpl::FImpl::FImpl(FSGThresholdCommandImpl* InOwner) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp index bf2d9298..b0ff50e0 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp @@ -153,7 +153,7 @@ FVector FSGVect3DImpl::ToFVector() const /// Up Z FVector Vector(Pimpl->Vect3D.GetX(), -Pimpl->Vect3D.GetY(), Pimpl->Vect3D.GetZ()); - return MoveTemp(Vector); + return Vector; } FSGVect3DImpl FSGVect3DImpl::operator+(const FSGVect3DImpl& Vect3DImpl) const diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHandInterpolatorKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHandInterpolatorKismetLibrary.cpp index 309422ed..0bd24b2c 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHandInterpolatorKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGHandInterpolatorKismetLibrary.cpp @@ -78,12 +78,12 @@ TArray USGHandInterpolatorKismetLibrary::InterpolateHandAngles( float, FSGFloatArray, &FSGFloatArray::FloatArray>(Flexions) }; - TArray Angles{ + const TArray Angles{ FSGArrayUtils::ToNestedBPArray( - HandInterpolator->InterpolateHandAngles(FlexionsNestedArray, Abductions, CmcTwist)) + HandInterpolator->InterpolateHandAngles(MoveTemp(FlexionsNestedArray), Abductions, CmcTwist)) }; - return MoveTemp(Angles); + return Angles; } bool USGHandInterpolatorKismetLibrary::Equals(const USGHandInterpolator* A, const USGHandInterpolator* B) diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNova2GloveKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNova2GloveKismetLibrary.cpp index 008251ef..74830a55 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNova2GloveKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNova2GloveKismetLibrary.cpp @@ -126,9 +126,11 @@ TArray USGNova2GloveKismetLibrary::ToNormalizedValues_SD_OutSN( TArray USGNova2GloveKismetLibrary::CalculateHandAngles( const TArray& NormalizedValues, const USGHandInterpolator* Interpolator, const bool bInfluenceIndex) { - TArray HandAngles = FSGArrayUtils::ToNestedBPArray( - USGNova2Glove::CalculateHandAngles(NormalizedValues, Interpolator, bInfluenceIndex)); - return MoveTemp(HandAngles); + const TArray HandAngles{ + FSGArrayUtils::ToNestedBPArray( + USGNova2Glove::CalculateHandAngles(NormalizedValues, Interpolator, bInfluenceIndex)) + }; + return HandAngles; } TArray USGNova2GloveKismetLibrary::ToNormalizedAngles( diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNovaGloveKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNovaGloveKismetLibrary.cpp index 3e562a38..9f6f980c 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNovaGloveKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGNovaGloveKismetLibrary.cpp @@ -136,9 +136,11 @@ TArray USGNovaGloveKismetLibrary::ToNormalizedValues_SD_OutSN( TArray USGNovaGloveKismetLibrary::CalculateHandAngles( const TArray& NormalizedValues, const USGHandInterpolator* Interpolator) { - TArray HandAngles = FSGArrayUtils::ToNestedBPArray( - USGNovaGlove::CalculateHandAngles(NormalizedValues, Interpolator)); - return MoveTemp(HandAngles); + const TArray HandAngles{ + FSGArrayUtils::ToNestedBPArray( + USGNovaGlove::CalculateHandAngles(NormalizedValues, Interpolator)) + }; + return HandAngles; } FString USGNovaGloveKismetLibrary::ToNovaCommandAsFlexion(const USGThresholdCommand* Thresholds) @@ -286,7 +288,7 @@ bool USGNovaGloveKismetLibrary::QueueVibroLevels(USGNovaGlove* NovaGlove, const } bool USGNovaGloveKismetLibrary::QueueVibroLevel_L_L(USGNovaGlove* NovaGlove, - const ESGHapticLocation Location, const float Level01) + const ESGHapticLocation Location, const float Level01) { return NovaGlove->QueueVibroLevel(Location, Level01); } diff --git a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGSenseGloveInfoKismetLibrary.cpp b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGSenseGloveInfoKismetLibrary.cpp index 42c5cd55..2653c968 100644 --- a/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGSenseGloveInfoKismetLibrary.cpp +++ b/Source/SenseGloveCoreKismet/Private/SGCoreKismet/SGSenseGloveInfoKismetLibrary.cpp @@ -183,11 +183,11 @@ TArray USGSenseGloveInfoKismetLibrary::ToGloveAngles(const USGSe FSGArrayUtils::FromNestedBPArray< float, FSGFloatArray, &FSGFloatArray::FloatArray>(SensorAngles) }; - TArray GloveAngles{ + const TArray GloveAngles{ FSGArrayUtils::ToNestedBPArray( SenseGloveInfo->ToGloveAngles(MoveTemp(SensorAnglesNestedArray))) }; - return MoveTemp(GloveAngles); + return GloveAngles; } bool USGSenseGloveInfoKismetLibrary::Equals(const USGSenseGloveInfo* A, const USGSenseGloveInfo* B) diff --git a/Source/SenseGloveUtils/Private/SGUtils/SGArrayUtils.cpp b/Source/SenseGloveUtils/Private/SGUtils/SGArrayUtils.cpp index cc43604b..65628633 100644 --- a/Source/SenseGloveUtils/Private/SGUtils/SGArrayUtils.cpp +++ b/Source/SenseGloveUtils/Private/SGUtils/SGArrayUtils.cpp @@ -47,7 +47,7 @@ TArray FSGArrayUtils::QuatsToRotators(const TArray& QuatsArray) RotatorsArray.Add(MoveTemp(Rotator)); } - return MoveTemp(RotatorsArray); + return RotatorsArray; } TArray> FSGArrayUtils::QuatsToRotators(const TArray>& QuatsNestedArray) @@ -60,7 +60,7 @@ TArray> FSGArrayUtils::QuatsToRotators(const TArray FSGArrayUtils::RotatorsToQuats(const TArray& RotatorsArray) @@ -73,7 +73,7 @@ TArray FSGArrayUtils::RotatorsToQuats(const TArray& RotatorsArr QuatsArray.Add(MoveTemp(Quat)); } - return MoveTemp(QuatsArray); + return QuatsArray; } TArray> FSGArrayUtils::RotatorsToQuats(const TArray>& RotatorsNestedArray) @@ -86,7 +86,7 @@ TArray> FSGArrayUtils::RotatorsToQuats(const TArray FSGArrayUtils::FromMillimeters(const std::vector& Vector) @@ -98,7 +98,7 @@ TArray FSGArrayUtils::FromMillimeters(const std::vector& Vector) Array.Add(FSGUnits::MillimetersToCentimeters(Value)); } - return MoveTemp(Array); + return Array; } TArray> FSGArrayUtils::FromMillimeters(const std::vector>& NestedVector) @@ -111,7 +111,7 @@ TArray> FSGArrayUtils::FromMillimeters(const std::vector FSGArrayUtils::ToMillimeters(const TArray& Array) @@ -123,7 +123,7 @@ std::vector FSGArrayUtils::ToMillimeters(const TArray& Array) Vector.emplace_back(FSGUnits::CentimetersToMillimeters(Value)); } - return MoveTemp(Vector); + return Vector; } std::vector> FSGArrayUtils::ToMillimeters(const TArray>& NestedArray) @@ -136,5 +136,5 @@ std::vector> FSGArrayUtils::ToMillimeters(const TArray static FORCEINLINE TArray FromStdVector(const std::vector& Vector) { - TArray Array(&Vector[0], Vector.size()); - return MoveTemp(Array); + const TArray Array{&Vector[0], Vector.size()}; + return Array; } /// NOTE @@ -67,7 +67,7 @@ public: Array.Add(bValue); } - return MoveTemp(Array); + return Array; } static TArray FromStdVector(const std::vector& Vector) @@ -80,7 +80,7 @@ public: Array.Add(MoveTemp(String)); } - return MoveTemp(Array); + return Array; } template @@ -94,7 +94,7 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } template @@ -108,7 +108,7 @@ public: Array.Add(MoveTemp(T2Element)); } - return MoveTemp(Array); + return Array; } template @@ -122,7 +122,7 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } template @@ -137,7 +137,7 @@ public: Array.Add(MoveTemp(T2Element)); } - return MoveTemp(Array); + return Array; } template @@ -151,14 +151,14 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } template static FORCEINLINE std::vector ToStdVector(const TArray& Array) { std::vector Vector(&Array[0], &Array[0] + Array.Num()); - return MoveTemp(Vector); + return Vector; } static std::vector ToStdVector(const TArray& Array) @@ -171,7 +171,7 @@ public: Vector.emplace_back(MoveTemp(StdString)); } - return MoveTemp(Vector); + return Vector; } template @@ -185,7 +185,7 @@ public: NestedVector.emplace_back(MoveTemp(InnerVector)); } - return MoveTemp(NestedVector); + return NestedVector; } template @@ -199,7 +199,7 @@ public: Vector.emplace_back(MoveTemp(T2Element)); } - return MoveTemp(Vector); + return Vector; } template @@ -213,7 +213,7 @@ public: NestedVector.emplace_back(MoveTemp(InnerVector)); } - return MoveTemp(NestedVector); + return NestedVector; } template @@ -258,7 +258,7 @@ public: Array.Add(MoveTemp(T2Element)); } - return MoveTemp(Array); + return Array; } template @@ -272,7 +272,7 @@ public: Array.Add(MoveTemp(T2Element)); } - return MoveTemp(Array); + return Array; } template @@ -286,7 +286,7 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } template @@ -300,7 +300,7 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } template @@ -315,7 +315,7 @@ public: NestedBPArray.Add(MoveTemp(InnerArrayContainer)); } - return MoveTemp(NestedBPArray); + return NestedBPArray; } template @@ -330,7 +330,7 @@ public: Array.Add(MoveTemp(InnerArrayContainer)); } - return MoveTemp(Array); + return Array; } template @@ -345,7 +345,7 @@ public: Array.Add(MoveTemp(InnerArrayContainer)); } - return MoveTemp(Array); + return Array; } template @@ -359,7 +359,7 @@ public: ImplArray.Add(MoveTemp(T2Element)); } - return MoveTemp(ImplArray); + return ImplArray; } template @@ -373,7 +373,7 @@ public: ImplArray.Add(MoveTemp(T2Element)); } - return MoveTemp(ImplArray); + return ImplArray; } template @@ -387,7 +387,7 @@ public: ImplArray.Add(MoveTemp(InnerImplArray)); } - return MoveTemp(ImplArray); + return ImplArray; } template @@ -401,7 +401,7 @@ public: ImplArray.Add(MoveTemp(InnerImplArray)); } - return MoveTemp(ImplArray); + return ImplArray; } template S::* @@ -416,7 +416,7 @@ public: ImplArray.Add(MoveTemp(InnerImplArray)); } - return MoveTemp(ImplArray); + return ImplArray; } template S::* @@ -431,7 +431,7 @@ public: ImplArray.Add(MoveTemp(InnerImplArray)); } - return MoveTemp(ImplArray); + return ImplArray; } template S::*InnerArray> @@ -444,7 +444,7 @@ public: NestedArray.Add(InnerBPArrayContainer.*InnerArray); } - return MoveTemp(NestedArray); + return NestedArray; } template @@ -458,7 +458,7 @@ public: NestedBPArray.Add(MoveTemp(InnerBPArrayContainer)); } - return MoveTemp(NestedBPArray); + return NestedBPArray; } template @@ -472,7 +472,7 @@ public: NestedBPArray.Add(MoveTemp(InnerBPArrayContainer)); } - return MoveTemp(NestedBPArray); + return NestedBPArray; } static TArray QuatsToRotators(const TArray& QuatsArray); @@ -488,7 +488,7 @@ public: RotatorsArray.Add(QuatsToRotators(QuatsInnerBPArrayContainer.*InnerArray)); } - return MoveTemp(RotatorsArray); + return RotatorsArray; } template @@ -502,7 +502,7 @@ public: RotatorsNestedBPArray.Add(MoveTemp(RotatorsInnerBPArrayContainer)); } - return MoveTemp(RotatorsNestedBPArray); + return RotatorsNestedBPArray; } template Q::*InnerArray> @@ -516,7 +516,7 @@ public: RotatorsNestedBPArray.Add(MoveTemp(RotatorsInnerBPArrayContainer)); } - return MoveTemp(RotatorsNestedBPArray); + return RotatorsNestedBPArray; } static TArray RotatorsToQuats(const TArray& RotatorsNestedArray); @@ -532,7 +532,7 @@ public: QuatsArray.Add(RotatorsToQuats(RotatorsInnerBPArrayContainer.*InnerArray)); } - return MoveTemp(QuatsArray); + return QuatsArray; } template @@ -546,7 +546,7 @@ public: QuatsNestedBPArray.Add(MoveTemp(QuatsInnerBPArrayContainer)); } - return MoveTemp(QuatsNestedBPArray); + return QuatsNestedBPArray; } template Q::*InnerArray> @@ -560,7 +560,7 @@ public: QuatsNestedBPArray.Add(MoveTemp(QuatsInnerBPArrayContainer)); } - return MoveTemp(QuatsNestedBPArray); + return QuatsNestedBPArray; } static TArray FromMillimeters(const std::vector& Vector); @@ -576,7 +576,7 @@ public: Array.Add(FSGUnits::MillimetersToCentimeters(Value)); } - return MoveTemp(Array); + return Array; } template @@ -590,7 +590,7 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } static std::vector ToMillimeters(const TArray& Array); @@ -607,7 +607,7 @@ public: NestedVector.emplace_back(MoveTemp(InnerVector)); } - return MoveTemp(NestedVector); + return NestedVector; } template @@ -620,7 +620,7 @@ public: Vector.emplace_back(FSGUnits::CentimetersToMillimeters(Value)); } - return MoveTemp(Vector); + return Vector; } template @@ -634,7 +634,7 @@ public: NestedVector.emplace_back(MoveTemp(InnerVector)); } - return MoveTemp(NestedVector); + return NestedVector; } static std::vector ToSenseGloveAngles(const TArray& Array) @@ -646,7 +646,7 @@ public: Vector.emplace_back(FSGAngles::TransformToSenseGlove(Value)); } - return MoveTemp(Vector); + return Vector; } static std::vector> ToSenseGloveAngles(const TArray>& NestedArray) @@ -659,7 +659,7 @@ public: NestedVector.emplace_back(MoveTemp(InnerVector)); } - return MoveTemp(NestedVector); + return NestedVector; } template @@ -672,7 +672,7 @@ public: Vector.emplace_back(FSGAngles::TransformToSenseGlove(Value)); } - return MoveTemp(Vector); + return Vector; } template @@ -686,7 +686,7 @@ public: NestedVector.emplace_back(MoveTemp(InnerVector)); } - return MoveTemp(NestedVector); + return NestedVector; } static TArray FromSenseGloveAngles(const std::vector& Vector) @@ -698,7 +698,7 @@ public: Array.Add(FSGAngles::TransformToUnreal(Value)); } - return MoveTemp(Array); + return Array; } static TArray> FromSenseGloveAngles(const std::vector>& NestedVector) @@ -711,7 +711,7 @@ public: Array.Add(MoveTemp(InnerArray)); } - return MoveTemp(Array); + return Array; } template @@ -724,7 +724,7 @@ public: Array.Add(FSGAngles::TransformToUnreal(Value)); } - return MoveTemp(Array); + return Array; } template @@ -738,7 +738,7 @@ public: NestedArray.Add(MoveTemp(InnerArray)); } - return MoveTemp(NestedArray); + return NestedArray; } public: